Skip to content

Commit 2f3f77e

Browse files
frzifusfrzifus
authored
avoid sidecar usage on e2e-multi-instrumentation tests (#4311)
Signed-off-by: Benedikt Bongartz <[email protected]>
1 parent 1038693 commit 2f3f77e

File tree

16 files changed

+178
-155
lines changed

16 files changed

+178
-155
lines changed

‎tests/e2e-multi-instrumentation/instrumentation-multi-multicontainer-go/00-install-collector.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: opentelemetry.io/v1alpha1
22
kind: OpenTelemetryCollector
33
metadata:
4-
name: sidecar
4+
name: deployment
55
spec:
6-
mode: sidecar
6+
mode: deployment
77
config: |
88
receivers:
99
otlp:

‎tests/e2e-multi-instrumentation/instrumentation-multi-multicontainer-go/00-install-instrumentation.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ spec:
77
- name: OTEL_TRACES_EXPORTER
88
value: otlp
99
- name: OTEL_EXPORTER_OTLP_ENDPOINT
10-
value: http://localhost:4317
10+
value: http://deployment-collector:4317
1111
- name: OTEL_EXPORTER_OTLP_TIMEOUT
1212
value: "20"
1313
- name: OTEL_TRACES_SAMPLER
@@ -17,7 +17,7 @@ spec:
1717
- name: SPLUNK_TRACE_RESPONSE_HEADER_ENABLED
1818
value: "true"
1919
exporter:
20-
endpoint: http://localhost:4317
20+
endpoint: http://deployment-collector:4317
2121
propagators:
2222
- jaeger
2323
- b3
@@ -29,7 +29,7 @@ spec:
2929
- name: OTEL_SERVICE_NAME
3030
value: "pythonapp"
3131
- name: OTEL_EXPORTER_OTLP_ENDPOINT
32-
value: http://localhost:4318
32+
value: http://deployment-collector:4318
3333
go:
3434
env:
3535
- name: OTEL_SERVICE_NAME

‎tests/e2e-multi-instrumentation/instrumentation-multi-multicontainer-go/02-assert.yaml‎

Lines changed: 38 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
- name: OTEL_SERVICE_NAME
3535
value: pythonapp
3636
- name: OTEL_EXPORTER_OTLP_ENDPOINT
37-
value: http://localhost:4318
37+
value: http://deployment-collector:4318
3838
- name: PYTHONPATH
3939
value: /otel-auto-instrumentation-python/opentelemetry/instrumentation/auto_instrumentation:/otel-auto-instrumentation-python
4040
- name: OTEL_EXPORTER_OTLP_PROTOCOL
@@ -72,60 +72,6 @@ spec:
7272
readOnly: true
7373
- mountPath: /otel-auto-instrumentation-python
7474
name: opentelemetry-auto-instrumentation-python
75-
- args:
76-
- --config=env:OTEL_CONFIG
77-
env:
78-
- name: POD_NAME
79-
valueFrom:
80-
fieldRef:
81-
apiVersion: v1
82-
fieldPath: metadata.name
83-
- name: OTEL_CONFIG
84-
value: |
85-
receivers:
86-
otlp:
87-
protocols:
88-
grpc:
89-
endpoint: 0.0.0.0:4317
90-
http:
91-
endpoint: 0.0.0.0:4318
92-
exporters:
93-
debug: null
94-
service:
95-
telemetry:
96-
metrics:
97-
readers:
98-
- pull:
99-
exporter:
100-
prometheus:
101-
host: 0.0.0.0
102-
port: 8888
103-
pipelines:
104-
traces:
105-
exporters:
106-
- debug
107-
receivers:
108-
- otlp
109-
- name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME
110-
valueFrom:
111-
fieldRef:
112-
apiVersion: v1
113-
fieldPath: metadata.name
114-
- name: OTEL_RESOURCE_ATTRIBUTES_POD_UID
115-
valueFrom:
116-
fieldRef:
117-
apiVersion: v1
118-
fieldPath: metadata.uid
119-
- name: OTEL_RESOURCE_ATTRIBUTES_NODE_NAME
120-
valueFrom:
121-
fieldRef:
122-
apiVersion: v1
123-
fieldPath: spec.nodeName
124-
- name: OTEL_RESOURCE_ATTRIBUTES
125-
name: otc-container
126-
volumeMounts:
127-
- mountPath: /var/run/secrets/kubernetes.io/serviceaccount
128-
readOnly: true
12975
- env:
13076
- name: OTEL_NODE_IP
13177
valueFrom:
@@ -144,7 +90,7 @@ spec:
14490
- name: OTEL_TRACES_EXPORTER
14591
value: otlp
14692
- name: OTEL_EXPORTER_OTLP_ENDPOINT
147-
value: http://localhost:4317
93+
value: http://deployment-collector:4317
14894
- name: OTEL_EXPORTER_OTLP_TIMEOUT
14995
value: "20"
15096
- name: OTEL_TRACES_SAMPLER
@@ -192,9 +138,6 @@ status:
192138
- name: opentelemetry-auto-instrumentation
193139
ready: true
194140
started: true
195-
- name: otc-container
196-
ready: true
197-
started: true
198141
- name: pythonapp
199142
ready: true
200143
started: true
@@ -205,3 +148,39 @@ status:
205148
terminated:
206149
reason: Completed
207150
phase: Running
151+
---
152+
apiVersion: apps/v1
153+
kind: Deployment
154+
metadata:
155+
labels:
156+
app.kubernetes.io/component: opentelemetry-collector
157+
app.kubernetes.io/managed-by: opentelemetry-operator
158+
app.kubernetes.io/name: deployment-collector
159+
app.kubernetes.io/part-of: opentelemetry
160+
name: deployment-collector
161+
status:
162+
availableReplicas: 1
163+
readyReplicas: 1
164+
replicas: 1
165+
---
166+
apiVersion: v1
167+
kind: Service
168+
metadata:
169+
labels:
170+
app.kubernetes.io/component: opentelemetry-collector
171+
app.kubernetes.io/managed-by: opentelemetry-operator
172+
app.kubernetes.io/name: deployment-collector
173+
app.kubernetes.io/part-of: opentelemetry
174+
name: deployment-collector
175+
spec:
176+
ports:
177+
- appProtocol: grpc
178+
name: otlp-grpc
179+
port: 4317
180+
protocol: TCP
181+
targetPort: 4317
182+
- appProtocol: http
183+
name: otlp-http
184+
port: 4318
185+
protocol: TCP
186+
targetPort: 4318

‎tests/e2e-multi-instrumentation/instrumentation-multi-multicontainer-go/chainsaw-test.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,5 @@ spec:
4444
catch:
4545
- podLogs:
4646
selector: app=my-golang
47+
- podLogs:
48+
selector: app.kubernetes.io/name=deployment-collector

‎tests/e2e-multi-instrumentation/instrumentation-multi-multicontainer/00-install-collector.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: opentelemetry.io/v1alpha1
22
kind: OpenTelemetryCollector
33
metadata:
4-
name: sidecar
4+
name: deployment
55
spec:
6-
mode: sidecar
6+
mode: deployment
77
config: |
88
receivers:
99
otlp:

‎tests/e2e-multi-instrumentation/instrumentation-multi-multicontainer/00-install-instrumentation.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ spec:
99
- name: OTEL_TRACES_SAMPLER_ARG
1010
value: "0.85"
1111
exporter:
12-
endpoint: http://localhost:4317
12+
endpoint: http://deployment-collector:4317
1313
propagators:
1414
- jaeger
1515
- b3
@@ -25,7 +25,7 @@ spec:
2525
- name: OTEL_SERVICE_NAME
2626
value: "pythonapp"
2727
- name: OTEL_EXPORTER_OTLP_ENDPOINT
28-
value: http://localhost:4318
28+
value: http://deployment-collector:4318
2929
nodejs:
3030
env:
3131
- name: OTEL_SERVICE_NAME

‎tests/e2e-multi-instrumentation/instrumentation-multi-multicontainer/01-assert.yaml‎

Lines changed: 42 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ metadata:
1414
instrumentation.opentelemetry.io/nodejs-container-names: nodejsapp
1515
instrumentation.opentelemetry.io/python-container-names: pythonapp
1616
instrumentation.opentelemetry.io/sdk-container-names: sdkapp
17-
sidecar.opentelemetry.io/inject: "true"
1817
labels:
1918
app: pod-with-multi-instrumentation
2019
spec:
@@ -53,7 +52,7 @@ spec:
5352
- name: OTEL_TRACES_SAMPLER_ARG
5453
value: "0.85"
5554
- name: OTEL_EXPORTER_OTLP_ENDPOINT
56-
value: http://localhost:4317
55+
value: http://deployment-collector:4317
5756
- name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME
5857
valueFrom:
5958
fieldRef:
@@ -95,7 +94,7 @@ spec:
9594
- name: OTEL_TRACES_SAMPLER_ARG
9695
value: "0.85"
9796
- name: OTEL_EXPORTER_OTLP_ENDPOINT
98-
value: http://localhost:4317
97+
value: http://deployment-collector:4317
9998
- name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME
10099
valueFrom:
101100
fieldRef:
@@ -137,7 +136,7 @@ spec:
137136
- name: OTEL_TRACES_SAMPLER_ARG
138137
value: "0.85"
139138
- name: OTEL_EXPORTER_OTLP_ENDPOINT
140-
value: http://localhost:4317
139+
value: http://deployment-collector:4317
141140
- name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME
142141
valueFrom:
143142
fieldRef:
@@ -176,7 +175,7 @@ spec:
176175
- name: OTEL_SERVICE_NAME
177176
value: pythonapp
178177
- name: OTEL_EXPORTER_OTLP_ENDPOINT
179-
value: http://localhost:4318
178+
value: http://deployment-collector:4318
180179
- name: PYTHONPATH
181180
value: /otel-auto-instrumentation-python/opentelemetry/instrumentation/auto_instrumentation:/otel-auto-instrumentation-python
182181
- name: OTEL_EXPORTER_OTLP_PROTOCOL
@@ -233,7 +232,7 @@ spec:
233232
- name: OTEL_SERVICE_NAME
234233
value: deployment-with-multi-instrumentation
235234
- name: OTEL_EXPORTER_OTLP_ENDPOINT
236-
value: http://localhost:4317
235+
value: http://deployment-collector:4317
237236
- name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME
238237
valueFrom:
239238
fieldRef:
@@ -269,7 +268,7 @@ spec:
269268
- name: OTEL_TRACES_SAMPLER_ARG
270269
value: "0.85"
271270
- name: OTEL_EXPORTER_OTLP_ENDPOINT
272-
value: http://localhost:4317
271+
value: http://deployment-collector:4317
273272
- name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME
274273
valueFrom:
275274
fieldRef:
@@ -311,60 +310,6 @@ spec:
311310
subPath: default.conf
312311
- mountPath: /var/run/secrets/kubernetes.io/serviceaccount
313312
readOnly: true
314-
- args:
315-
- --config=env:OTEL_CONFIG
316-
env:
317-
- name: POD_NAME
318-
valueFrom:
319-
fieldRef:
320-
apiVersion: v1
321-
fieldPath: metadata.name
322-
- name: OTEL_CONFIG
323-
value: |
324-
receivers:
325-
otlp:
326-
protocols:
327-
grpc:
328-
endpoint: 0.0.0.0:4317
329-
http:
330-
endpoint: 0.0.0.0:4318
331-
exporters:
332-
debug: null
333-
service:
334-
telemetry:
335-
metrics:
336-
readers:
337-
- pull:
338-
exporter:
339-
prometheus:
340-
host: 0.0.0.0
341-
port: 8888
342-
pipelines:
343-
traces:
344-
exporters:
345-
- debug
346-
receivers:
347-
- otlp
348-
- name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME
349-
valueFrom:
350-
fieldRef:
351-
apiVersion: v1
352-
fieldPath: metadata.name
353-
- name: OTEL_RESOURCE_ATTRIBUTES_POD_UID
354-
valueFrom:
355-
fieldRef:
356-
apiVersion: v1
357-
fieldPath: metadata.uid
358-
- name: OTEL_RESOURCE_ATTRIBUTES_NODE_NAME
359-
valueFrom:
360-
fieldRef:
361-
apiVersion: v1
362-
fieldPath: spec.nodeName
363-
- name: OTEL_RESOURCE_ATTRIBUTES
364-
name: otc-container
365-
volumeMounts:
366-
- mountPath: /var/run/secrets/kubernetes.io/serviceaccount
367-
readOnly: true
368313
initContainers:
369314
- command:
370315
- cp
@@ -458,9 +403,6 @@ status:
458403
- name: nodejsapp
459404
ready: true
460405
started: true
461-
- name: otc-container
462-
ready: true
463-
started: true
464406
- name: pythonapp
465407
ready: true
466408
started: true
@@ -499,3 +441,39 @@ status:
499441
terminated:
500442
reason: Completed
501443
phase: Running
444+
---
445+
apiVersion: apps/v1
446+
kind: Deployment
447+
metadata:
448+
labels:
449+
app.kubernetes.io/component: opentelemetry-collector
450+
app.kubernetes.io/managed-by: opentelemetry-operator
451+
app.kubernetes.io/name: deployment-collector
452+
app.kubernetes.io/part-of: opentelemetry
453+
name: deployment-collector
454+
status:
455+
availableReplicas: 1
456+
readyReplicas: 1
457+
replicas: 1
458+
---
459+
apiVersion: v1
460+
kind: Service
461+
metadata:
462+
labels:
463+
app.kubernetes.io/component: opentelemetry-collector
464+
app.kubernetes.io/managed-by: opentelemetry-operator
465+
app.kubernetes.io/name: deployment-collector
466+
app.kubernetes.io/part-of: opentelemetry
467+
name: deployment-collector
468+
spec:
469+
ports:
470+
- appProtocol: grpc
471+
name: otlp-grpc
472+
port: 4317
473+
protocol: TCP
474+
targetPort: 4317
475+
- appProtocol: http
476+
name: otlp-http
477+
port: 4318
478+
protocol: TCP
479+
targetPort: 4318

‎tests/e2e-multi-instrumentation/instrumentation-multi-multicontainer/chainsaw-test.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,5 @@ spec:
4040
catch:
4141
- podLogs:
4242
selector: app=pod-with-multi-instrumentation
43+
- podLogs:
44+
selector: app.kubernetes.io/name=deployment-collector

‎tests/e2e-multi-instrumentation/instrumentation-multi-no-containers/00-install-collector.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: opentelemetry.io/v1alpha1
22
kind: OpenTelemetryCollector
33
metadata:
4-
name: sidecar
4+
name: deployment
55
spec:
6-
mode: sidecar
6+
mode: deployment
77
config: |
88
receivers:
99
otlp:

0 commit comments

Comments
 (0)