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

feat: add support for API 1.1.x #2737

Merged
merged 11 commits into from
Jan 31, 2022
Merged

feat: add support for API 1.1.x #2737

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c9903bc
feat: add tracer options to getTracer
dyladan Jan 24, 2022
9261958
Merge remote-tracking branch 'origin/main' into prepare-for-api
dyladan Jan 26, 2022
a760cf6
deps: update API
dyladan Jan 27, 2022
ad31ccb
chore: revert API for experimental
dyladan Jan 27, 2022
044fe31
chore: skip selenium
dyladan Jan 27, 2022
d7de2a1
Merge branch 'main' into prepare-for-api
dyladan Jan 27, 2022
d5b2091
deps: use more permissive range for api in exporters
dyladan Jan 27, 2022
30cc71f
chore: use schemaUrl in tracer key
dyladan Jan 27, 2022
b38d855
Merge branch 'prepare-for-api' of github.com:dyladan/opentelemetry-js…
dyladan Jan 27, 2022
56b936f
deps(gprc): use more permissive range for API
dyladan Jan 27, 2022
d20010d
Merge remote-tracking branch 'origin/main' into prepare-for-api
dyladan Jan 31, 2022
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
4 changes: 2 additions & 2 deletions .github/workflows/unit-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
if: steps.cache.outputs.cache-hit != 'true'
run: |
npm install --ignore-scripts
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
- name: Build 🔧
run: |
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
working-directory: experimental
run: |
npm install --ignore-scripts
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
- name: Build 🔧
working-directory: experimental
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/propagation-validation-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"compile": "tsc --build"
},
"dependencies": {
"@opentelemetry/api": "^1.0.3",
"@opentelemetry/api": "^1.1.0",
"@opentelemetry/context-async-hooks": "1.0.1",
"@opentelemetry/core": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/exporter-trace-otlp-grpc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
},
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "^1.0.3",
"@opentelemetry/api": "^1.1.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"@types/sinon": "10.0.6",
Expand All @@ -63,7 +63,7 @@
"typescript": "4.4.4"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.3"
"@opentelemetry/api": "^1.1.0"
},
"dependencies": {
"@grpc/grpc-js": "^1.3.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/exporter-trace-otlp-http/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
},
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "^1.0.3",
"@opentelemetry/api": "^1.1.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"@types/sinon": "10.0.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/exporter-trace-otlp-proto/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
},
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "^1.0.3",
"@opentelemetry/api": "^1.1.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"@types/sinon": "10.0.6",
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-context-async-hooks/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/api": "~1.0.3",
"@opentelemetry/api": "~1.1.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"codecov": "3.8.3",
Expand All @@ -53,6 +53,6 @@
"typescript": "4.4.4"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.1.0"
"@opentelemetry/api": ">=1.0.0 <1.2.0"
}
}
4 changes: 2 additions & 2 deletions packages/opentelemetry-context-zone-peer-dep/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
},
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "~1.0.3",
"@opentelemetry/api": "~1.1.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"@types/sinon": "10.0.6",
Expand All @@ -79,7 +79,7 @@
"zone.js": "0.11.4"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.1.0",
"@opentelemetry/api": ">=1.0.0 <1.2.0",
"zone.js": "^0.10.2 || ^0.11.0"
},
"sideEffects": false
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/api": "~1.0.3",
"@opentelemetry/api": "~1.1.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"@types/sinon": "10.0.6",
Expand All @@ -86,7 +86,7 @@
"webpack": "4.46.0"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.1.0"
"@opentelemetry/api": ">=1.0.0 <1.2.0"
},
"dependencies": {
"@opentelemetry/semantic-conventions": "1.0.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-jaeger/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/api": "^1.0.3",
"@opentelemetry/api": "^1.1.0",
"@opentelemetry/resources": "1.0.1",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-zipkin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
},
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "^1.0.3",
"@opentelemetry/api": "^1.1.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"@types/sinon": "10.0.6",
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-propagator-b3/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@
"@opentelemetry/core": "1.0.1"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.1.0"
"@opentelemetry/api": ">=1.0.0 <1.2.0"
},
"devDependencies": {
"@opentelemetry/api": "~1.0.3",
"@opentelemetry/api": "~1.1.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"codecov": "3.8.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-propagator-jaeger/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/api": "~1.0.3",
"@opentelemetry/api": "~1.1.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"@types/sinon": "10.0.6",
Expand All @@ -72,7 +72,7 @@
"webpack": "4.46.0"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.1.0"
"@opentelemetry/api": ">=1.0.0 <1.2.0"
},
"dependencies": {
"@opentelemetry/core": "1.0.1"
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-resources/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/api": "~1.0.3",
"@opentelemetry/api": "~1.1.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"@types/sinon": "10.0.6",
Expand All @@ -69,7 +69,7 @@
"typescript": "4.4.4"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.1.0"
"@opentelemetry/api": ">=1.0.0 <1.2.0"
},
"dependencies": {
"@opentelemetry/core": "1.0.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-sdk-trace-base/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/api": "~1.0.3",
"@opentelemetry/api": "~1.1.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.33",
"@types/sinon": "10.0.6",
Expand All @@ -83,7 +83,7 @@
"webpack": "4.46.0"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.1.0"
"@opentelemetry/api": ">=1.0.0 <1.2.0"
},
"dependencies": {
"@opentelemetry/core": "1.0.1",
Expand Down
13 changes: 7 additions & 6 deletions packages/opentelemetry-sdk-trace-base/src/BasicTracerProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
*/

import {
TracerProvider,
trace,
context,
diag,
propagation,
TextMapPropagator,
diag,
trace,
TracerOptions,
TracerProvider,
} from '@opentelemetry/api';
import {
CompositePropagator,
Expand Down Expand Up @@ -90,10 +91,10 @@ export class BasicTracerProvider implements TracerProvider {
}
}

getTracer(name: string, version?: string): Tracer {
const key = `${name}@${version || ''}`;
getTracer(name: string, version?: string, options?: TracerOptions): Tracer {
const key = `${name}@${version || ''}:${options?.schemaUrl || ''}`;
if (!this._tracers.has(key)) {
this._tracers.set(key, new Tracer({ name, version }, this._config, this));
this._tracers.set(key, new Tracer({ name, version, schemaUrl: options?.schemaUrl }, this._config, this));
Flarna marked this conversation as resolved.
Show resolved Hide resolved
}

// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-sdk-trace-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/api": "~1.0.3",
"@opentelemetry/api": "~1.1.0",
"@opentelemetry/resources": "1.0.1",
"@opentelemetry/semantic-conventions": "1.0.1",
"@types/mocha": "8.2.3",
Expand All @@ -59,7 +59,7 @@
"typescript": "4.4.4"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.1.0"
"@opentelemetry/api": ">=1.0.0 <1.2.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thinking one more about this now with #2755 (comment) in mind it seems to be not that good to allow more then one minor in SDK.

If SDK ends up in using 1.0.x because the de-duplication of package manager decide so but other components use 1.1.x these other components will have issues as the version check in API signals incompatibility.

I guess the SDK must use the highest minor.

},
"dependencies": {
"@opentelemetry/context-async-hooks": "1.0.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-sdk-trace-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
},
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": "~1.0.3",
"@opentelemetry/api": "~1.1.0",
"@opentelemetry/context-zone": "1.0.1",
"@opentelemetry/propagator-b3": "1.0.1",
"@opentelemetry/resources": "1.0.1",
Expand Down Expand Up @@ -86,7 +86,7 @@
"webpack-merge": "5.8.0"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.1.0"
"@opentelemetry/api": ">=1.0.0 <1.2.0"
},
"dependencies": {
"@opentelemetry/core": "1.0.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-shim-opentracing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/api": "~1.0.3",
"@opentelemetry/api": "~1.1.0",
"@opentelemetry/propagator-b3": "1.0.1",
"@opentelemetry/propagator-jaeger": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
Expand All @@ -54,7 +54,7 @@
"typescript": "4.4.4"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.1.0"
"@opentelemetry/api": ">=1.0.0 <1.2.0"
},
"dependencies": {
"@opentelemetry/core": "1.0.1",
Expand Down
4 changes: 2 additions & 2 deletions selenium-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@babel/plugin-proposal-decorators": "7.16.4",
"@babel/plugin-transform-runtime": "7.16.4",
"@babel/preset-env": "7.16.4",
"@opentelemetry/api": "^1.0.3",
"@opentelemetry/api": "^1.1.0",
"babel-loader": "8.2.3",
"babel-polyfill": "6.26.0",
"browserstack-local": "1.4.8",
Expand All @@ -53,7 +53,7 @@
"webpack-merge": "5.8.0"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.3"
"@opentelemetry/api": "^1.1.0"
},
"dependencies": {
"@opentelemetry/context-zone-peer-dep": "1.0.1",
Expand Down