Skip to content

Commit

Permalink
Revert "feat(sdk-trace-node): support xray propagator (#4602)" (#4727)
Browse files Browse the repository at this point in the history
* Revert "feat(sdk-trace-node): support xray propagator (#4602)"

This reverts commit 75d88f7.

* chore: sync package-lock.json
  • Loading branch information
pichlermarc authored May 23, 2024
1 parent 4e778b1 commit c97f21f
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 12 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 1 addition & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion packages/opentelemetry-sdk-trace-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -51,7 +50,6 @@ export class NodeTracerProvider extends BasicTracerProvider {
() => new B3Propagator({ injectEncoding: B3InjectEncoding.MULTI_HEADER }),
],
['jaeger', () => new JaegerPropagator()],
['xray', () => new AWSXRayPropagator()],
]);

constructor(config: NodeTracerConfig = {}) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -249,7 +249,6 @@ describe('NodeTracerProvider', () => {
'x-b3-sampled',
'x-b3-parentspanid',
'uber-trace-id',
'x-amzn-trace-id',
]);
});
});
Expand Down
3 changes: 0 additions & 3 deletions packages/opentelemetry-sdk-trace-node/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@
},
{
"path": "../opentelemetry-semantic-conventions"
},
{
"path": "../propagator-aws-xray"
}
]
}

0 comments on commit c97f21f

Please sign in to comment.