Skip to content

Commit 478b1d8

Browse files
committed
Merge branch 'aws_resource_support' of https://github.com/liustve/aws-otel-js-instrumentation into aws_resource_support
2 parents 4687a2a + a17cd30 commit 478b1d8

File tree

3 files changed

+3
-132
lines changed

3 files changed

+3
-132
lines changed

aws-distro-opentelemetry-node-autoinstrumentation/src/register.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,11 @@ diag.setLogger(new DiagConsoleLogger(), opentelemetry.core.getEnv().OTEL_LOG_LEV
2525
/*
2626
Sets up default environment variables and apply patches
2727
28-
Set default OTEL_EXPORTER_OTLP_PROTOCOL to be `http/protobuf`. This must be run before `configurator.configure()`, which will use this value to
29-
create an OTel Metric Exporter that is used for the customized AWS Span Procesors. The default value of OTEL_EXPORTER_OTLP_PROTOCOL should be `http/protobuf`:
28+
Set default OTEL_EXPORTER_OTLP_PROTOCOL to be `http/protobuf` to remain consistent with other ADOT languages. This must be run before
29+
`configurator.configure()`, which will use this value to create an OTel Metric Exporter that is used for the customized AWS Span Procesors.
30+
The default value of OTEL_EXPORTER_OTLP_PROTOCOL should be `http/protobuf`:
3031
https://github.com/open-telemetry/opentelemetry-js/blob/34003c9b7ef7e7e95e86986550d1c7fb6c1c56c6/packages/opentelemetry-core/src/utils/environment.ts#L233
3132
32-
We are setting OTEL_EXPORTER_OTLP_PROTOCOL to HTTP to avoid any potential issues with gRPC. In the ADOT Python SDKs, gRPC did not not work out of the box for
33-
the vended docker image, due to gRPC having a strict dependency on the Python version the artifact was built for (OTEL observed this:
34-
https://github.com/open-telemetry/opentelemetry-operator/blob/461ba68e80e8ac6bf2603eb353547cd026119ed2/autoinstrumentation/python/requirements.txt#L2-L3)
35-
3633
Also sets default OTEL_PROPAGATORS to ensure good compatibility with X-Ray and Application Signals.
3734
3835
This file may also be used to apply patches to upstream instrumentation - usually these are stopgap measures until we can contribute

aws-distro-opentelemetry-node-autoinstrumentation/test/register.patch.test.ts

Lines changed: 0 additions & 88 deletions
This file was deleted.

aws-distro-opentelemetry-node-autoinstrumentation/test/test-app/app-aws-sdk-client-calls.js

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)