Skip to content

Commit 199fd8d

Browse files
authored
feat(sdk-trace-web): do not throw when passing extra options (open-telemetry#5357)
1 parent 321c31f commit 199fd8d

File tree

8 files changed

+2
-55
lines changed

8 files changed

+2
-55
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ For semantic convention package changes, see the [semconv CHANGELOG](packages/se
5555

5656
### :rocket: (Enhancement)
5757

58+
* feat(sdk-trace-web): do not throw when passing extra options [#5357](https://github.com/open-telemetry/opentelemetry-js/pull/5357) @pichlermarc
59+
* `WebTracerProvider` constructor now does not throw anymore when `contextManager` or `propagator` are passed as extra options to the constructor
5860
* feat(sdk-trace-base): add stack trace warning to debug instrumentation [#5363](https://github.com/open-telemetry/opentelemetry-js/pull/5363) @neilfordyce
5961

6062
### :bug: (Bug Fix)

package-lock.json

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/opentelemetry-sdk-trace-web/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
"@babel/preset-env": "7.26.7",
5959
"@opentelemetry/api": ">=1.0.0 <1.10.0",
6060
"@opentelemetry/context-zone": "1.30.0",
61-
"@opentelemetry/propagator-b3": "1.30.0",
6261
"@opentelemetry/resources": "1.30.0",
6362
"@types/jquery": "3.5.32",
6463
"@types/mocha": "10.0.10",

packages/opentelemetry-sdk-trace-web/src/WebTracerProvider.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,6 @@ export class WebTracerProvider extends BasicTracerProvider {
3636
*/
3737
constructor(config: WebTracerConfig = {}) {
3838
super(config);
39-
40-
if ((config as SDKRegistrationConfig).contextManager) {
41-
throw (
42-
'contextManager should be defined in register method not in' +
43-
' constructor'
44-
);
45-
}
46-
if ((config as SDKRegistrationConfig).propagator) {
47-
throw 'propagator should be defined in register method not in constructor';
48-
}
4939
}
5040

5141
/**

packages/opentelemetry-sdk-trace-web/test/WebTracerProvider.test.ts

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
import { context, ContextManager, trace } from '@opentelemetry/api';
1818
import { ZoneContextManager } from '@opentelemetry/context-zone';
19-
import { B3Propagator } from '@opentelemetry/propagator-b3';
2019
import { Resource } from '@opentelemetry/resources';
2120
import { SEMRESATTRS_TELEMETRY_SDK_LANGUAGE } from '@opentelemetry/semantic-conventions';
2221
import { Span, Tracer } from '@opentelemetry/sdk-trace-base';
@@ -53,38 +52,6 @@ describe('WebTracerProvider', () => {
5352
});
5453
});
5554

56-
it('should throw error when context manager is passed in constructor', () => {
57-
let error = '';
58-
try {
59-
new WebTracerProvider({
60-
contextManager: new ZoneContextManager(),
61-
} as any);
62-
} catch (e) {
63-
error = e;
64-
}
65-
assert.strictEqual(
66-
error,
67-
'contextManager should be defined in' +
68-
' register method not in constructor'
69-
);
70-
});
71-
72-
it('should throw error when propagator is passed in constructor', () => {
73-
let error = '';
74-
try {
75-
new WebTracerProvider({
76-
propagator: new B3Propagator(),
77-
} as any);
78-
} catch (e) {
79-
error = e;
80-
}
81-
assert.strictEqual(
82-
error,
83-
'propagator should be defined in register' +
84-
' method not in constructor'
85-
);
86-
});
87-
8855
describe('when contextManager is "ZoneContextManager"', () => {
8956
it('should correctly return the contexts for 2 parallel actions', done => {
9057
const webTracerWithZone = new WebTracerProvider().getTracer('default');

packages/opentelemetry-sdk-trace-web/tsconfig.esm.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
{
2222
"path": "../opentelemetry-core"
2323
},
24-
{
25-
"path": "../opentelemetry-propagator-b3"
26-
},
2724
{
2825
"path": "../opentelemetry-resources"
2926
},

packages/opentelemetry-sdk-trace-web/tsconfig.esnext.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
{
2222
"path": "../opentelemetry-core"
2323
},
24-
{
25-
"path": "../opentelemetry-propagator-b3"
26-
},
2724
{
2825
"path": "../opentelemetry-resources"
2926
},

packages/opentelemetry-sdk-trace-web/tsconfig.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
{
2323
"path": "../opentelemetry-core"
2424
},
25-
{
26-
"path": "../opentelemetry-propagator-b3"
27-
},
2825
{
2926
"path": "../opentelemetry-resources"
3027
},

0 commit comments

Comments
 (0)