Merge branch 'main' into chore/adopt-jaeger-propagator

.github/workflows/lint.yml

@@ -59,19 +59,3 @@ jobs:
         run: |
           npm run lint
           npm run lint:examples
-
-      - name: Install API Dependencies (cache hit)
-        if: steps.cache.outputs.cache-hit == 'true'
-        run: npx lerna bootstrap --scope @opentelemetry/api --include-dependencies
-
-      - name: Install API Dependencies (cache miss)
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: npx lerna bootstrap --no-ci --scope @opentelemetry/api --include-dependencies
-
-      - name: Build 🔧
-        run: |
-          npx lerna run compile --scope @opentelemetry/api
-          npx lerna run docs
-
-      - name: Test Docs
-        run: npm run docs-test

README.md

@@ -48,7 +48,8 @@ This is the JavaScript version of [OpenTelemetry](https://opentelemetry.io/), a
 
 | Core version | Contrib Version         |
 |--------------|-------------------------|
-| 0.16.x       | 0.14.x not released yet |
+| 0.17.x       | 0.14.x not released yet |
+| 0.16.x       | ------                  |
 | 0.15.x       | 0.13.x                  |
 | 0.14.x       | 0.12.x                  |
 | 0.13.x       | ------                  |
@@ -203,7 +204,7 @@ OpenTelemetry can collect tracing data automatically using instrumentations. Ven
 
 - [@opentelemetry/instrumentation-grpc][otel-instrumentation-grpc] previous [@opentelemetry/plugin-grpc][otel-plugin-grpc]
 - [@opentelemetry/plugin-grpc-js][otel-plugin-grpc-js]
-- [@opentelemetry/instrumentation-http][otel-plugin-http] previous [@opentelemetry/plugin-http][otel-plugin-http] and [@opentelemetry/plugin-https][otel-plugin-https]
+- [@opentelemetry/instrumentation-http][otel-instrumentation-http] previous [@opentelemetry/plugin-http][otel-plugin-http] and [@opentelemetry/plugin-https][otel-plugin-https]
 
 ##### Contrib
 
@@ -410,7 +411,6 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
 [otel-instrumentation-fetch]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-instrumentation-fetch
 [otel-instrumentation-grpc]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-instrumentation-grpc
 [otel-instrumentation-http]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-instrumentation-http
-[otel-instrumentation-https]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-instrumentation-https
 [otel-instrumentation-xml-http-request]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-instrumentation-xml-http-request
 
 [otel-shim-opentracing]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-shim-opentracing

integration-tests/propagation-validation-server/package.json

@@ -11,7 +11,7 @@
     "compile": "tsc --build"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.17.0",
+    "@opentelemetry/api": "^0.18.0",
     "@opentelemetry/context-async-hooks": "^0.17.0",
     "@opentelemetry/core": "^0.17.0",
     "@opentelemetry/tracing": "^0.17.0",

integration-tests/propagation-validation-server/tsconfig.json

@@ -6,9 +6,6 @@
   },
   "include": [],
   "references": [
-    {
-      "path": "../../packages/opentelemetry-api"
-    },
     {
       "path": "../../packages/opentelemetry-context-async-hooks"
     },

packages/opentelemetry-api-metrics/package.json

@@ -48,7 +48,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.17.0"
+    "@opentelemetry/api": "^0.18.0"
   },
   "devDependencies": {
     "@types/mocha": "8.2.0",

packages/opentelemetry-api-metrics/tsconfig.json

@@ -7,10 +7,5 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts"
-  ],
-  "references": [
-    {
-      "path": "../opentelemetry-api"
-    }
   ]
 }