Skip to content

Commit c9a1d33

Browse files
ElfoLiNkElfoLiNk
committed
revert path nodejs instrumentation
1 parent 4b9aef7 commit c9a1d33

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

‎pkg/instrumentation/nodejs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
const (
1313
envNodeOptions = "NODE_OPTIONS"
14-
nodeRequireArgument = " --require /otel-auto-instrumentation-nodejs/node_modules/@opentelemetry/auto-instrumentations-node/build/src/register.js"
14+
nodeRequireArgument = " --require /otel-auto-instrumentation-nodejs/autoinstrumentation.js"
1515
nodejsInitContainerName = initContainerName + "-nodejs"
1616
nodejsVolumeName = volumeName + "-nodejs"
1717
nodejsInstrMountPath = "/otel-auto-instrumentation-nodejs"

‎pkg/instrumentation/nodejs_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func TestInjectNodeJSSDK(t *testing.T) {
6565
Env: []corev1.EnvVar{
6666
{
6767
Name: "NODE_OPTIONS",
68-
Value: " --require /otel-auto-instrumentation-nodejs/node_modules/@opentelemetry/auto-instrumentations-node/build/src/register.js",
68+
Value: " --require /otel-auto-instrumentation-nodejs/autoinstrumentation.js",
6969
},
7070
},
7171
},
@@ -126,7 +126,7 @@ func TestInjectNodeJSSDK(t *testing.T) {
126126
Env: []corev1.EnvVar{
127127
{
128128
Name: "NODE_OPTIONS",
129-
Value: "-Dbaz=bar" + " --require /otel-auto-instrumentation-nodejs/node_modules/@opentelemetry/auto-instrumentations-node/build/src/register.js",
129+
Value: "-Dbaz=bar" + " --require /otel-auto-instrumentation-nodejs/autoinstrumentation.js",
130130
},
131131
},
132132
},

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
- name: NODE_PATH
2222
value: /usr/local/lib/node_modules
2323
- name: NODE_OPTIONS
24-
value: ' --require /otel-auto-instrumentation-nodejs/node_modules/@opentelemetry/auto-instrumentations-node/build/src/register.js'
24+
value: ' --require /otel-auto-instrumentation-nodejs/autoinstrumentation.js'
2525
- name: OTEL_TRACES_EXPORTER
2626
value: otlp
2727
- name: OTEL_EXPORTER_OTLP_ENDPOINT
@@ -65,7 +65,7 @@ spec:
6565
fieldRef:
6666
fieldPath: status.podIP
6767
- name: NODE_OPTIONS
68-
value: ' --require /otel-auto-instrumentation-nodejs/node_modules/@opentelemetry/auto-instrumentations-node/build/src/register.js'
68+
value: ' --require /otel-auto-instrumentation-nodejs/autoinstrumentation.js'
6969
- name: OTEL_TRACES_EXPORTER
7070
value: otlp
7171
- name: OTEL_EXPORTER_OTLP_ENDPOINT

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
- name: NODE_PATH
3333
value: /usr/local/lib/node_modules
3434
- name: NODE_OPTIONS
35-
value: ' --require /otel-auto-instrumentation-nodejs/node_modules/@opentelemetry/auto-instrumentations-node/build/src/register.js'
35+
value: ' --require /otel-auto-instrumentation-nodejs/autoinstrumentation.js'
3636
- name: OTEL_TRACES_EXPORTER
3737
value: otlp
3838
- name: OTEL_EXPORTER_OTLP_ENDPOINT

‎tests/e2e-instrumentation/instrumentation-nodejs-volume/01-assert.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
- name: OTEL_NODEJS_DEBUG
2323
value: "true"
2424
- name: NODE_OPTIONS
25-
value: " --require /otel-auto-instrumentation-nodejs/node_modules/@opentelemetry/auto-instrumentations-node/build/src/register.js"
25+
value: " --require /otel-auto-instrumentation-nodejs/autoinstrumentation.js"
2626
- name: OTEL_TRACES_EXPORTER
2727
value: otlp
2828
- name: OTEL_EXPORTER_OTLP_ENDPOINT

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
- name: OTEL_NODEJS_DEBUG
2323
value: "true"
2424
- name: NODE_OPTIONS
25-
value: ' --require /otel-auto-instrumentation-nodejs/node_modules/@opentelemetry/auto-instrumentations-node/build/src/register.js'
25+
value: ' --require /otel-auto-instrumentation-nodejs/autoinstrumentation.js'
2626
- name: OTEL_TRACES_EXPORTER
2727
value: otlp
2828
- name: OTEL_EXPORTER_OTLP_ENDPOINT

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ spec:
131131
- name: OTEL_SERVICE_NAME
132132
value: nodejsapp
133133
- name: NODE_OPTIONS
134-
value: ' --require /otel-auto-instrumentation-nodejs/node_modules/@opentelemetry/auto-instrumentations-node/build/src/register.js'
134+
value: ' --require /otel-auto-instrumentation-nodejs/autoinstrumentation.js'
135135
- name: OTEL_TRACES_SAMPLER
136136
value: parentbased_traceidratio
137137
- name: OTEL_TRACES_SAMPLER_ARG

‎tests/e2e-multi-instrumentation/instrumentation-single-instr-first-container/01-assert.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
- name: OTEL_SERVICE_NAME
2323
value: nodejsapp
2424
- name: NODE_OPTIONS
25-
value: ' --require /otel-auto-instrumentation-nodejs/node_modules/@opentelemetry/auto-instrumentations-node/build/src/register.js'
25+
value: ' --require /otel-auto-instrumentation-nodejs/autoinstrumentation.js'
2626
- name: OTEL_TRACES_SAMPLER
2727
value: parentbased_traceidratio
2828
- name: OTEL_TRACES_SAMPLER_ARG

‎tests/e2e-openshift/must-gather/assert-install-app.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
- name: OTEL_NODEJS_DEBUG
2323
value: "true"
2424
- name: NODE_OPTIONS
25-
value: ' --require /otel-auto-instrumentation-nodejs/node_modules/@opentelemetry/auto-instrumentations-node/build/src/register.js'
25+
value: ' --require /otel-auto-instrumentation-nodejs/autoinstrumentation.js'
2626
- name: OTEL_TRACES_EXPORTER
2727
value: otlp
2828
- name: OTEL_EXPORTER_OTLP_ENDPOINT

0 commit comments

Comments
 (0)