Skip to content

Commit 94cea06

Browse files
authored
Update Nodejs instrumenation tests to assert telemetry data (#3959)
1 parent 0c8773b commit 94cea06

17 files changed

+521
-117
lines changed
Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,27 @@
1-
apiVersion: opentelemetry.io/v1alpha1
1+
apiVersion: opentelemetry.io/v1beta1
22
kind: OpenTelemetryCollector
33
metadata:
44
name: sidecar
55
spec:
66
mode: sidecar
7-
config: |
7+
config:
88
receivers:
99
otlp:
1010
protocols:
11-
grpc:
12-
http:
13-
processors:
11+
grpc: {}
12+
http: {}
13+
14+
processors: {}
1415

1516
exporters:
1617
debug:
18+
verbosity: detailed
1719

1820
service:
1921
pipelines:
2022
traces:
2123
receivers: [otlp]
2224
exporters: [debug]
25+
metrics:
26+
receivers: [otlp]
27+
exporters: [debug]

tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/00-install-instrumentation.yaml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,20 @@ spec:
77
- name: OTEL_TRACES_EXPORTER
88
value: otlp
99
- name: OTEL_EXPORTER_OTLP_ENDPOINT
10-
value: http://localhost:4317
10+
value: http://localhost:4318
1111
- name: OTEL_EXPORTER_OTLP_TIMEOUT
12-
value: "20"
12+
value: "20000"
1313
- name: OTEL_TRACES_SAMPLER
14-
value: parentbased_traceidratio
15-
- name: OTEL_TRACES_SAMPLER_ARG
16-
value: "0.85"
14+
value: always_on
1715
- name: SPLUNK_TRACE_RESPONSE_HEADER_ENABLED
1816
value: "true"
17+
- name: OTEL_METRICS_EXPORTER
18+
value: otlp
1919
exporter:
20-
endpoint: http://localhost:4317
20+
endpoint: http://localhost:4318
2121
propagators:
2222
- jaeger
2323
- b3
24-
sampler:
25-
type: parentbased_traceidratio
26-
argument: "0.25"
2724
java:
2825
env:
2926
- name: OTEL_JAVAAGENT_DEBUG

tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/01-assert.yaml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@ spec:
1313
- name: OTEL_NODE_IP
1414
valueFrom:
1515
fieldRef:
16+
apiVersion: v1
1617
fieldPath: status.hostIP
1718
- name: OTEL_POD_IP
1819
valueFrom:
1920
fieldRef:
21+
apiVersion: v1
2022
fieldPath: status.podIP
2123
- name: NODE_PATH
2224
value: /usr/local/lib/node_modules
@@ -25,15 +27,15 @@ spec:
2527
- name: OTEL_TRACES_EXPORTER
2628
value: otlp
2729
- name: OTEL_EXPORTER_OTLP_ENDPOINT
28-
value: http://localhost:4317
30+
value: http://localhost:4318
2931
- name: OTEL_EXPORTER_OTLP_TIMEOUT
30-
value: "20"
32+
value: "20000"
3133
- name: OTEL_TRACES_SAMPLER
32-
value: parentbased_traceidratio
33-
- name: OTEL_TRACES_SAMPLER_ARG
34-
value: "0.85"
34+
value: always_on
3535
- name: SPLUNK_TRACE_RESPONSE_HEADER_ENABLED
3636
value: "true"
37+
- name: OTEL_METRICS_EXPORTER
38+
value: otlp
3739
- name: OTEL_SERVICE_NAME
3840
value: my-nodejs-multi
3941
- name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME
@@ -50,6 +52,9 @@ spec:
5052
value: jaeger,b3
5153
- name: OTEL_RESOURCE_ATTRIBUTES
5254
name: myapp
55+
ports:
56+
- containerPort: 3000
57+
protocol: TCP
5358
volumeMounts:
5459
- mountPath: /var/run/secrets/kubernetes.io/serviceaccount
5560
readOnly: true
@@ -59,25 +64,27 @@ spec:
5964
- name: OTEL_NODE_IP
6065
valueFrom:
6166
fieldRef:
67+
apiVersion: v1
6268
fieldPath: status.hostIP
6369
- name: OTEL_POD_IP
6470
valueFrom:
6571
fieldRef:
72+
apiVersion: v1
6673
fieldPath: status.podIP
6774
- name: NODE_OPTIONS
6875
value: ' --require /otel-auto-instrumentation-nodejs/autoinstrumentation.js'
6976
- name: OTEL_TRACES_EXPORTER
7077
value: otlp
7178
- name: OTEL_EXPORTER_OTLP_ENDPOINT
72-
value: http://localhost:4317
79+
value: http://localhost:4318
7380
- name: OTEL_EXPORTER_OTLP_TIMEOUT
74-
value: "20"
81+
value: "20000"
7582
- name: OTEL_TRACES_SAMPLER
76-
value: parentbased_traceidratio
77-
- name: OTEL_TRACES_SAMPLER_ARG
78-
value: "0.85"
83+
value: always_on
7984
- name: SPLUNK_TRACE_RESPONSE_HEADER_ENABLED
8085
value: "true"
86+
- name: OTEL_METRICS_EXPORTER
87+
value: otlp
8188
- name: OTEL_SERVICE_NAME
8289
value: my-nodejs-multi
8390
- name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME

tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/01-install-app.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ spec:
2222
fsGroup: 3000
2323
containers:
2424
- name: myapp
25+
ports:
26+
- containerPort: 3000
2527
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-nodejs:main
2628
securityContext:
2729
allowPrivilegeEscalation: false
@@ -30,6 +32,15 @@ spec:
3032
env:
3133
- name: NODE_PATH
3234
value: /usr/local/lib/node_modules
35+
readinessProbe:
36+
httpGet:
37+
path: /rolldice
38+
port: 3000
39+
scheme: HTTP
40+
initialDelaySeconds: 5
41+
periodSeconds: 15
42+
timeoutSeconds: 2
43+
failureThreshold: 3
3344
- name: myrabbit
3445
image: rabbitmq:3
3546
securityContext:

tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/02-assert.yaml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ spec:
2424
- name: OTEL_NODE_IP
2525
valueFrom:
2626
fieldRef:
27+
apiVersion: v1
2728
fieldPath: status.hostIP
2829
- name: OTEL_POD_IP
2930
valueFrom:
3031
fieldRef:
32+
apiVersion: v1
3133
fieldPath: status.podIP
3234
- name: NODE_PATH
3335
value: /usr/local/lib/node_modules
@@ -36,15 +38,15 @@ spec:
3638
- name: OTEL_TRACES_EXPORTER
3739
value: otlp
3840
- name: OTEL_EXPORTER_OTLP_ENDPOINT
39-
value: http://localhost:4317
41+
value: http://localhost:4318
4042
- name: OTEL_EXPORTER_OTLP_TIMEOUT
41-
value: "20"
43+
value: "20000"
4244
- name: OTEL_TRACES_SAMPLER
43-
value: parentbased_traceidratio
44-
- name: OTEL_TRACES_SAMPLER_ARG
45-
value: "0.85"
45+
value: always_on
4646
- name: SPLUNK_TRACE_RESPONSE_HEADER_ENABLED
4747
value: "true"
48+
- name: OTEL_METRICS_EXPORTER
49+
value: otlp
4850
- name: OTEL_SERVICE_NAME
4951
value: my-nodejs-multi
5052
- name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME
@@ -61,6 +63,9 @@ spec:
6163
value: jaeger,b3
6264
- name: OTEL_RESOURCE_ATTRIBUTES
6365
name: myapp
66+
ports:
67+
- containerPort: 3000
68+
protocol: TCP
6469
volumeMounts:
6570
- mountPath: /var/run/secrets/kubernetes.io/serviceaccount
6671
readOnly: true

tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/02-install-app.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ spec:
2222
fsGroup: 3000
2323
containers:
2424
- name: myapp
25+
ports:
26+
- containerPort: 3000
2527
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-nodejs:main
2628
securityContext:
2729
allowPrivilegeEscalation: false
@@ -30,6 +32,15 @@ spec:
3032
env:
3133
- name: NODE_PATH
3234
value: /usr/local/lib/node_modules
35+
readinessProbe:
36+
httpGet:
37+
path: /rolldice
38+
port: 3000
39+
scheme: HTTP
40+
initialDelaySeconds: 5
41+
periodSeconds: 15
42+
timeoutSeconds: 2
43+
failureThreshold: 3
3344
- name: myrabbit
3445
image: rabbitmq:3
3546
securityContext:

0 commit comments

Comments
 (0)