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

fix: fixing compatibility versions for detectors #2584

Merged
merged 6 commits into from
Nov 5, 2021
+11 −11
Merged

fix: fixing compatibility versions for detectors #2584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4d68eab
fix: fixing compatibility versions for detectors
obecny Nov 2, 2021
b0c92ed
chore: trying to fix tests
obecny Nov 2, 2021
1229207
Merge branch 'main' into sdk-node
obecny Nov 2, 2021
eca0498
Merge branch 'main' into sdk-node
dyladan Nov 5, 2021
240f77b
Merge branch 'main' into sdk-node
dyladan Nov 5, 2021
ee10a94
Merge branch 'main' into sdk-node
dyladan Nov 5, 2021
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
18 changes: 9 additions & 9 deletions experimental/packages/opentelemetry-sdk-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@
"access": "public"
},
"dependencies": {
"@opentelemetry/api-metrics": "0.26.0",
"@opentelemetry/core": "1.0.0",
"@opentelemetry/instrumentation": "0.26.0",
"@opentelemetry/resource-detector-aws": "1.0.1",
"@opentelemetry/resource-detector-gcp": "0.24.0",
"@opentelemetry/resources": "1.0.0",
"@opentelemetry/sdk-metrics-base": "0.26.0",
"@opentelemetry/sdk-trace-base": "1.0.0",
"@opentelemetry/sdk-trace-node": "1.0.0"
"@opentelemetry/api-metrics": "~0.26.0",
"@opentelemetry/core": "~1.0.0",
"@opentelemetry/instrumentation": "~0.26.0",
"@opentelemetry/resource-detector-aws": "~1.0.0",
"@opentelemetry/resource-detector-gcp": "~0.26.0",
"@opentelemetry/resources": "~1.0.0",
"@opentelemetry/sdk-metrics-base": "~0.26.0",
dyladan marked this conversation as resolved.
Show resolved Hide resolved
"@opentelemetry/sdk-trace-base": "~1.0.0",
"@opentelemetry/sdk-trace-node": "~1.0.0"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.1.0"
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-sdk-node/test/sdk.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ describe('Node SDK', () => {
assert.ok(metrics.getMeterProvider() instanceof NoopMeterProvider);

assert.ok(
context['_getContextManager']() instanceof DefaultContextManager
context['_getContextManager']().constructor.name === DefaultContextManager.name
);
assert.ok(
propagation['_getGlobalPropagator']() instanceof CompositePropagator
Expand All @@ -154,7 +154,7 @@ describe('Node SDK', () => {
assert.ok(metrics.getMeterProvider() instanceof NoopMeterProvider);

assert.ok(
context['_getContextManager']() instanceof DefaultContextManager
context['_getContextManager']().constructor.name === DefaultContextManager.name
);
assert.ok(
propagation['_getGlobalPropagator']() instanceof CompositePropagator
Expand Down