feat: add support for API 1.1.x (#2737)

open-telemetry · Jan 31, 2022 · ee2342b · ee2342b
1 parent ce5f7f7
commit ee2342b
Show file tree

Hide file tree

Showing 19 changed files with 37 additions and 36 deletions.
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -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: |
@@ -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

diff --git a/integration-tests/propagation-validation-server/package.json b/integration-tests/propagation-validation-server/package.json
@@ -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",

diff --git a/packages/exporter-trace-otlp-grpc/package.json b/packages/exporter-trace-otlp-grpc/package.json
@@ -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",

diff --git a/packages/exporter-trace-otlp-http/package.json b/packages/exporter-trace-otlp-http/package.json
@@ -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",

diff --git a/packages/exporter-trace-otlp-proto/package.json b/packages/exporter-trace-otlp-proto/package.json
@@ -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",

diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json
@@ -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",
@@ -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"
   }
 }
diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json
@@ -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",
@@ -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

diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json
@@ -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",
@@ -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"

diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json
@@ -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",

diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json
@@ -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",

diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json
@@ -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",

diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json
@@ -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",
@@ -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"

diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json
@@ -57,7 +57,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",
@@ -82,7 +82,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",

diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json
@@ -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",
@@ -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",

diff --git a/packages/opentelemetry-sdk-trace-base/src/BasicTracerProvider.ts b/packages/opentelemetry-sdk-trace-base/src/BasicTracerProvider.ts
@@ -15,12 +15,13 @@
  */
 
 import {
-  TracerProvider,
-  trace,
   context,
+  diag,
   propagation,
   TextMapPropagator,
-  diag,
+  trace,
+  TracerOptions,
+  TracerProvider,
 } from '@opentelemetry/api';
 import {
   CompositePropagator,
@@ -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));
     }
 
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

diff --git a/packages/opentelemetry-sdk-trace-node/package.json b/packages/opentelemetry-sdk-trace-node/package.json
@@ -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",
@@ -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"
   },
   "dependencies": {
     "@opentelemetry/context-async-hooks": "1.0.1",

diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json
@@ -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",
@@ -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",

diff --git a/packages/opentelemetry-shim-opentracing/package.json b/packages/opentelemetry-shim-opentracing/package.json
@@ -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",
@@ -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",

diff --git a/selenium-tests/package.json b/selenium-tests/package.json
@@ -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",
@@ -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",