Skip to content

Commit

Permalink
feat(otel-bridge): Update OpenTelemetry bridge to support @openteleme…
Browse files Browse the repository at this point in the history
…try/api@1.8.0 (#3900)
  • Loading branch information
trentm authored Mar 5, 2024
1 parent c1bcc97 commit ec41c97
Show file tree
Hide file tree
Showing 8 changed files with 112 additions and 108 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ See the <<upgrade-to-v4>> guide.
[float]
===== Features
* Update <<opentelemetry-bridge>> support to `@opentelemetry/api` version 1.8.0.
[float]
===== Bug fixes
Expand Down
2 changes: 1 addition & 1 deletion docs/supported-technologies.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ Metrics API and Metrics SDK to allow
[options="header"]
|=======================================================================
| Framework | Version
| <<opentelemetry-bridge,@opentelemetry/api>> | >=1.0.0 <1.8.0
| <<opentelemetry-bridge,@opentelemetry/api>> | >=1.0.0 <1.9.0
| https://www.npmjs.com/package/@opentelemetry/sdk-metrics[@opentelemetry/sdk-metrics] | >=1.11.0 <2
|=======================================================================

Expand Down
86 changes: 43 additions & 43 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion test/opentelemetry-bridge/.tav.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"@opentelemetry/api":
versions: '>=1.0.0 <1.8.0'
versions: '>=1.0.0 <1.9.0'
node: '>=8.0.0'
commands:
- node OTelBridgeNonRecordingSpan.test.js
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ const otel = require('@opentelemetry/api');
const semver = require('semver');
const tape = require('tape');

const { safeGetPackageVersion } = require('../_utils');

const supportsGetActiveSpan = semver.satisfies(
require('@opentelemetry/api/package.json').version,
safeGetPackageVersion('@opentelemetry/api').version,
'>=1.2.0',
);

Expand Down
12 changes: 6 additions & 6 deletions test/opentelemetry-bridge/package-lock.json

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

2 changes: 1 addition & 1 deletion test/opentelemetry-metrics/fixtures/.tav.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"@opentelemetry/api":
versions: '>=1.3.0 <1.8.0'
versions: '>=1.3.0 <1.9.0'
node: '>=14.0.0'
commands:
- node ../fixtures.test.js
Loading

0 comments on commit ec41c97

Please sign in to comment.