From c97f21f221831e01ae906dd9b05ac59feffdac7b Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Thu, 23 May 2024 10:33:35 +0200 Subject: [PATCH] Revert "feat(sdk-trace-node): support xray propagator (#4602)" (#4727) * Revert "feat(sdk-trace-node): support xray propagator (#4602)" This reverts commit 75d88f71269b430afbed85999881785ee565ad35. * chore: sync package-lock.json --- CHANGELOG.md | 1 - package-lock.json | 4 +--- packages/opentelemetry-sdk-trace-node/package.json | 1 - .../opentelemetry-sdk-trace-node/src/NodeTracerProvider.ts | 2 -- .../test/NodeTracerProvider.test.ts | 3 +-- packages/opentelemetry-sdk-trace-node/tsconfig.json | 3 --- 6 files changed, 2 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2571a53dc..3cbe7d9a00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,6 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/ ### :rocket: (Enhancement) * feat: support node 22 [#4666](https://github.com/open-telemetry/opentelemetry-js/pull/4666) @dyladan -* feat(sdk-trace-node): support `xray` Propagator via `OTEL_PROPAGATORS` environment variable [#4602](https://github.com/open-telemetry/opentelemetry-js/pull/4602) @anuraags ### :bug: (Bug Fix) diff --git a/package-lock.json b/package-lock.json index a6f9896996..d71f14811a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,7 +43,7 @@ "karma-webpack": "5.0.1", "lerna": "6.6.2", "linkinator": "6.0.2", - "markdownlint-cli2": "^0.13.0", + "markdownlint-cli2": "0.13.0", "prettier": "3.0.3", "process": "0.11.10", "semver": "7.5.4", @@ -35013,7 +35013,6 @@ "dependencies": { "@opentelemetry/context-async-hooks": "1.24.1", "@opentelemetry/core": "1.24.1", - "@opentelemetry/propagator-aws-xray": "1.24.1", "@opentelemetry/propagator-b3": "1.24.1", "@opentelemetry/propagator-jaeger": "1.24.1", "@opentelemetry/sdk-trace-base": "1.24.1", @@ -44929,7 +44928,6 @@ "@opentelemetry/api": ">=1.0.0 <1.9.0", "@opentelemetry/context-async-hooks": "1.24.1", "@opentelemetry/core": "1.24.1", - "@opentelemetry/propagator-aws-xray": "1.24.1", "@opentelemetry/propagator-b3": "1.24.1", "@opentelemetry/propagator-jaeger": "1.24.1", "@opentelemetry/resources": "1.24.1", diff --git a/packages/opentelemetry-sdk-trace-node/package.json b/packages/opentelemetry-sdk-trace-node/package.json index 9b96ef3e5f..f353f7d6ea 100644 --- a/packages/opentelemetry-sdk-trace-node/package.json +++ b/packages/opentelemetry-sdk-trace-node/package.json @@ -69,7 +69,6 @@ "@opentelemetry/context-async-hooks": "1.24.1", "@opentelemetry/core": "1.24.1", "@opentelemetry/propagator-b3": "1.24.1", - "@opentelemetry/propagator-aws-xray": "1.24.1", "@opentelemetry/propagator-jaeger": "1.24.1", "@opentelemetry/sdk-trace-base": "1.24.1", "semver": "^7.5.2" diff --git a/packages/opentelemetry-sdk-trace-node/src/NodeTracerProvider.ts b/packages/opentelemetry-sdk-trace-node/src/NodeTracerProvider.ts index c82b600d93..9d552162f6 100644 --- a/packages/opentelemetry-sdk-trace-node/src/NodeTracerProvider.ts +++ b/packages/opentelemetry-sdk-trace-node/src/NodeTracerProvider.ts @@ -26,7 +26,6 @@ import { import * as semver from 'semver'; import { NodeTracerConfig } from './config'; import { JaegerPropagator } from '@opentelemetry/propagator-jaeger'; -import { AWSXRayPropagator } from '@opentelemetry/propagator-aws-xray'; /** * Register this TracerProvider for use with the OpenTelemetry API. @@ -51,7 +50,6 @@ export class NodeTracerProvider extends BasicTracerProvider { () => new B3Propagator({ injectEncoding: B3InjectEncoding.MULTI_HEADER }), ], ['jaeger', () => new JaegerPropagator()], - ['xray', () => new AWSXRayPropagator()], ]); constructor(config: NodeTracerConfig = {}) { diff --git a/packages/opentelemetry-sdk-trace-node/test/NodeTracerProvider.test.ts b/packages/opentelemetry-sdk-trace-node/test/NodeTracerProvider.test.ts index a0acf0d0d0..1b1dbbd6d8 100644 --- a/packages/opentelemetry-sdk-trace-node/test/NodeTracerProvider.test.ts +++ b/packages/opentelemetry-sdk-trace-node/test/NodeTracerProvider.test.ts @@ -236,7 +236,7 @@ describe('NodeTracerProvider', () => { }); it('should allow propagators as per the specification', () => { - (process.env as any).OTEL_PROPAGATORS = 'b3,b3multi,jaeger,xray'; + (process.env as any).OTEL_PROPAGATORS = 'b3,b3multi,jaeger'; const provider = new NodeTracerProvider(); provider.register(); @@ -249,7 +249,6 @@ describe('NodeTracerProvider', () => { 'x-b3-sampled', 'x-b3-parentspanid', 'uber-trace-id', - 'x-amzn-trace-id', ]); }); }); diff --git a/packages/opentelemetry-sdk-trace-node/tsconfig.json b/packages/opentelemetry-sdk-trace-node/tsconfig.json index a40ddeff36..31559ba9b3 100644 --- a/packages/opentelemetry-sdk-trace-node/tsconfig.json +++ b/packages/opentelemetry-sdk-trace-node/tsconfig.json @@ -32,9 +32,6 @@ }, { "path": "../opentelemetry-semantic-conventions" - }, - { - "path": "../propagator-aws-xray" } ] }