Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "feat(sdk-trace-node): support xray propagator (#4602)" #4727

Merged
merged 5 commits into from
May 23, 2024
Merged

Revert "feat(sdk-trace-node): support xray propagator (#4602)" #4727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a0f9841
Revert "feat(sdk-trace-node): support xray propagator (#4602)"
pichlermarc May 21, 2024
813e130
Merge remote-tracking branch 'upstream' into revert-4602
pichlermarc May 22, 2024
dc003e2
chore: sync package-lock.json
pichlermarc May 22, 2024
4752ff5
Merge branch 'main' into revert-4602
pichlermarc May 22, 2024
c8107bb
Merge branch 'main' into revert-4602
pichlermarc May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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
2 changes: 0 additions & 2 deletions packages/opentelemetry-sdk-trace-node/src/NodeTracerProvider.ts
View file
Open in desktop
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
3 changes: 1 addition & 2 deletions packages/opentelemetry-sdk-trace-node/test/NodeTracerProvider.test.ts
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@
},
{
"path": "../opentelemetry-semantic-conventions"
},
{
"path": "../propagator-aws-xray"
}
]
}
Loading