Merge branch 'main' into http-debug-enrich-logger

.github/CODEOWNERS

@@ -12,4 +12,4 @@
 #  https://help.github.com/en/articles/about-code-owners
 #
 
-* @dyladan @mayurkale22 @OlivierAlbertini @vmarchaud @markwolff @obecny @mwear @naseemkullah @legendecas @Flarna @johnbley @MSNev @Rauno56
+* @open-telemetry/javascript-approvers

.github/workflows/canary.yaml

@@ -42,14 +42,14 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
           npm install --ignore-scripts
-          npx lerna bootstrap --no-ci
+          npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
           npm run compile
 
       - name: Install and Build (cache hit) 🔧
         if: steps.cache.outputs.cache-hit == 'true'
         run: |
           npm ci --ignore-scripts
-          npx lerna bootstrap
+          npx lerna bootstrap --hoist --nohoist='zone.js'
           npm run compile
 
       - name: Publish

.github/workflows/docs.yaml

@@ -33,14 +33,14 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
           npm install --ignore-scripts
-          npx lerna bootstrap --no-ci
+          npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
           npm run compile
 
       - name: Install and Build (cache hit) 🔧
         if: steps.cache.outputs.cache-hit == 'true'
         run: |
           npm ci --ignore-scripts
-          npx lerna bootstrap
+          npx lerna bootstrap --hoist --nohoist='zone.js'
           npm run compile
 
       - name: Build Docs

.github/workflows/lint.yml

@@ -28,35 +28,21 @@ jobs:
         with:
           args: "./**/*.md -i ./CHANGELOG.md"
 
-      - name: restore lock files
-        uses: actions/cache@master # must use unreleased master to cache multiple paths
+      - name: restore lerna
         id: cache
+        uses: actions/cache@v2
         with:
-          # must be done before bootstrap to not include node_modules files in the cache paths
           path: |
-            package-lock.json
-            packages/*/package-lock.json
-            benchmark/*/package-lock.json
-            backwards-compatability/*/package-lock.json
-            metapackages/*/package-lock.json
-            packages/*/package-lock.json
-            integration-tests/*/package-lock.json
-          # increment the trailing number to break the cache manually
-          key: ${{ runner.os }}-lint-${{ hashFiles('**/package.json') }}-0
+            node_modules
+            */*/node_modules
+          key: lint-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package.json') }}
 
-      # On a cache hit, use ci to speed up the install process
-      - name: Bootstrap (cache hit)
-        if: steps.cache.outputs.cache-hit == 'true'
-        run: |
-          npm ci --ignore-scripts
-          npx lerna bootstrap --ignore-scripts
-
-      # On a cache miss, fall back to a regular install
-      - name: Bootstrap (cache miss)
+      # On a cache miss, install dependencies
+      - name: Bootstrap
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
           npm install --ignore-scripts
-          npx lerna bootstrap --no-ci --ignore-scripts -- --only=dev
+          npx lerna bootstrap --no-ci --ignore-scripts --hoist --nohoist='zone.js' -- --only=dev
 
       - name: Lint
         run: |

.github/workflows/release-please.yml

@@ -0,0 +1,14 @@
+on:
+  push:
+    branches:
+      - main
+name: release-please
+jobs:
+  release-please:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: google-github-actions/release-please-action@v2
+        with:
+          command: manifest
+          token: ${{secrets.RELEASE_PR_TOKEN}}
+          default-branch: main

.github/workflows/unit-test.yml

@@ -22,33 +22,23 @@ jobs:
         with:
           node-version: ${{ matrix.node_version }}
 
-      - name: restore lock files
-        uses: actions/cache@master # must use unreleased master to cache multiple paths
+      - name: restore lerna
         id: cache
+        uses: actions/cache@v2
         with:
-          # must be done before bootstrap to not include node_modules files in the cache paths
           path: |
-            package-lock.json
-            packages/*/package-lock.json
-            benchmark/*/package-lock.json
-            backwards-compatability/*/package-lock.json
-            metapackages/*/package-lock.json
-            packages/*/package-lock.json
-            integration-tests/*/package-lock.json
-          key: ${{ runner.os }}-unit_test-${{ matrix.node_version }}-${{ hashFiles('**/package.json') }}
-      - name: Install and Build (cache miss) 🔧
+            node_modules
+            */*/node_modules
+          key: unittest-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package.json') }}
+
+      - name: Bootstrap
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
           npm install --ignore-scripts
-          npx lerna bootstrap --no-ci
-          npm run compile
+          npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
 
-      - name: Install and Build (cache hit) 🔧
-        if: steps.cache.outputs.cache-hit == 'true'
-        run: |
-          npm ci --ignore-scripts
-          npx lerna bootstrap
-          npm run compile
+      - name: Build 🔧
+        run: npm run compile
 
       - name: Unit tests
         run: npm run test
@@ -66,35 +56,24 @@ jobs:
         uses: actions/checkout@v1
       - name: Permission Setup
         run: sudo chmod -R 777 /github /__w
-      - name: restore lock files
-        uses: actions/cache@master # must use unreleased master to cache multiple paths
+
+      - name: restore lerna
+        uses: actions/cache@v2
         id: cache
         with:
-          # must be done before bootstrap to not include node_modules files in the cache paths
           path: |
-            package-lock.json
-            packages/*/package-lock.json
-            benchmark/*/package-lock.json
-            backwards-compatability/*/package-lock.json
-            metapackages/*/package-lock.json
-            packages/*/package-lock.json
-            integration-tests/*/package-lock.json
-          key: ${{ runner.os }}-unit_test-${{ matrix.container }}-${{ hashFiles('**/package.json') }}
+            node_modules
+            */*/node_modules
+          key: unittest-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package.json') }}
 
-      - name: Install and Build (cache miss) 🔧
+      - name: Bootstrap
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
           npm install --ignore-scripts
-          npx lerna bootstrap --no-ci
-          npm run compile
-
-      - name: Install and Build (cache hit) 🔧
-        if: steps.cache.outputs.cache-hit == 'true'
-        run: |
-          npm ci --ignore-scripts
-          npx lerna bootstrap
-          npm run compile
+          npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
 
+      - name: Build 🔧
+        run: npm run compile
       - name: Unit tests
         run: npm run test:browser
       - name: Report Coverage

.github/workflows/w3c-integration-test.yml

@@ -28,18 +28,21 @@ jobs:
             integration-tests/*/package-lock.json
           key: ${{ runner.os }}-w3c_integration-${{ hashFiles('**/package.json') }}
 
-      - name: Install and Build (cache miss) 🔧
+      - name: Install and Bootstrap (cache miss) 🔧
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
           npm install --ignore-scripts
           npx lerna bootstrap --no-ci --scope=propagation-validation-server --include-dependencies
 
-      - name: Install and Build (cache hit) 🔧
+      - name: Install and Bootstrap (cache hit) 🔧
         if: steps.cache.outputs.cache-hit == 'true'
         run: |
           npm ci --ignore-scripts
           npx lerna bootstrap --scope=propagation-validation-server --include-dependencies
 
+      - name: Generate version.ts files
+        run: lerna run version
+
       - name: Build 🔧
         run: npm run compile
         working-directory: ./integration-tests/propagation-validation-server

.gitignore

@@ -1,3 +1,7 @@
+# version.ts file is automatically generated at compile time
+
+version.ts
+
 # Logs
 logs
 *.log

.release-please-manifest.json

@@ -0,0 +1,28 @@
+{
+  "packages/opentelemetry-api-metrics": "0.25.0",
+  "packages/opentelemetry-context-async-hooks": "0.25.0",
+  "packages/opentelemetry-context-zone-peer-dep": "0.25.0",
+  "packages/opentelemetry-context-zone": "0.25.0",
+  "packages/opentelemetry-core": "0.25.0",
+  "packages/opentelemetry-exporter-collector-grpc": "0.25.0",
+  "packages/opentelemetry-exporter-collector-proto": "0.25.0",
+  "packages/opentelemetry-exporter-collector": "0.25.0",
+  "packages/opentelemetry-exporter-jaeger": "0.25.0",
+  "packages/opentelemetry-exporter-prometheus": "0.25.0",
+  "packages/opentelemetry-exporter-zipkin": "0.25.0",
+  "packages/opentelemetry-instrumentation-fetch": "0.25.0",
+  "packages/opentelemetry-instrumentation-grpc": "0.25.0",
+  "packages/opentelemetry-instrumentation-http": "0.25.0",
+  "packages/opentelemetry-instrumentation-xml-http-request": "0.25.0",
+  "packages/opentelemetry-instrumentation": "0.25.0",
+  "packages/opentelemetry-propagator-b3": "0.25.0",
+  "packages/opentelemetry-propagator-jaeger": "0.25.0",
+  "packages/opentelemetry-resources": "0.25.0",
+  "packages/opentelemetry-sdk-metrics-base": "0.25.0",
+  "packages/opentelemetry-sdk-node": "0.25.0",
+  "packages/opentelemetry-sdk-trace-base": "0.25.0",
+  "packages/opentelemetry-sdk-trace-node": "0.25.0",
+  "packages/opentelemetry-sdk-trace-web": "0.25.0",
+  "packages/opentelemetry-semantic-conventions": "0.25.0",
+  "packages/opentelemetry-shim-opentracing": "0.25.0"
+}

CHANGELOG.md

@@ -4,6 +4,67 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## 0.25.0
+
+### :boom: Breaking Change
+
+* `opentelemetry-api-metrics`, `opentelemetry-context-zone-peer-dep`, `opentelemetry-context-zone`, `opentelemetry-core`, `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-collector-proto`, `opentelemetry-exporter-collector`, `opentelemetry-exporter-jaeger`, `opentelemetry-exporter-prometheus`, `opentelemetry-exporter-zipkin`, `opentelemetry-instrumentation-fetch`, `opentelemetry-instrumentation-grpc`, `opentelemetry-instrumentation-http`, `opentelemetry-instrumentation-xml-http-request`, `opentelemetry-instrumentation`, `opentelemetry-propagator-jaeger`, `opentelemetry-sdk-metrics-base`, `opentelemetry-sdk-node`, `opentelemetry-sdk-trace-base`, `opentelemetry-sdk-trace-node`, `opentelemetry-sdk-trace-web`, `opentelemetry-shim-opentracing`
+  * [#2340](https://github.com/open-telemetry/opentelemetry-js/pull/2340) chore: rename sdks to better represent what they are [#2146] ([@vmarchaud](https://github.com/vmarchaud))
+
+### :rocket: (Enhancement)
+
+* `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-collector-proto`, `opentelemetry-exporter-collector`, `opentelemetry-exporter-zipkin`
+  * [#1775](https://github.com/open-telemetry/opentelemetry-js/pull/1775) fix(@opentelemetry/exporter-collector): remove fulfilled promises cor… ([@aabmass](https://github.com/aabmass))
+* `opentelemetry-exporter-collector`
+  * [#2336](https://github.com/open-telemetry/opentelemetry-js/pull/2336) feat: use Blob in sendBeacon to add application/json type ([@jufab](https://github.com/jufab))
+
+### :bug: (Bug Fix)
+
+* `opentelemetry-instrumentation-fetch`
+  * [#2411](https://github.com/open-telemetry/opentelemetry-js/pull/2411) fix(instrumentation-fetch): `fetch(string, Request)` silently drops request body ([@t2t2](https://github.com/t2t2))
+* `opentelemetry-sdk-trace-base`
+  * [#2396](https://github.com/open-telemetry/opentelemetry-js/pull/2396) fix: respect sampled flag in Span Processors, fix associated tests ([@quickgiant](https://github.com/quickgiant))
+
+### :books: (Refine Doc)
+
+* Other
+  * [#2412](https://github.com/open-telemetry/opentelemetry-js/pull/2412) docs: fix examples in website_docs/instrumentation.md ([@svrnm](https://github.com/svrnm))
+  * [#2400](https://github.com/open-telemetry/opentelemetry-js/pull/2400) Website docs update 0821 ([@svrnm](https://github.com/svrnm))
+* `opentelemetry-resources`, `opentelemetry-semantic-conventions`
+  * [#2399](https://github.com/open-telemetry/opentelemetry-js/pull/2399) chore: update doc identifier names in readme ([@lonewolf3739](https://github.com/lonewolf3739))
+
+### :house: (Internal)
+
+* `opentelemetry-core`, `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-collector-proto`, `opentelemetry-instrumentation-http`, `opentelemetry-sdk-trace-node`
+  * [#2416](https://github.com/open-telemetry/opentelemetry-js/pull/2416) chore: hoist dependencies to speed up ci ([@dyladan](https://github.com/dyladan))
+* `opentelemetry-propagator-b3`, `opentelemetry-propagator-jaeger`, `opentelemetry-resources`, `opentelemetry-sdk-metrics-base`
+  * [#2406](https://github.com/open-telemetry/opentelemetry-js/pull/2406) chore: Fix lint warnings in propagator-jaeger, propagator-b3, resources, and sdk-metrics-base packages ([@alisabzevari](https://github.com/alisabzevari))
+* `opentelemetry-core`
+  * [#2405](https://github.com/open-telemetry/opentelemetry-js/pull/2405) chore: Fix lint warnings in core package ([@alisabzevari](https://github.com/alisabzevari))
+* `opentelemetry-resource-detector-aws`, `opentelemetry-resource-detector-gcp`, `opentelemetry-sdk-node`
+  * [#2392](https://github.com/open-telemetry/opentelemetry-js/pull/2392) refactor: move detectors to opentelemetry-js-contrib repo ([@legendecas](https://github.com/legendecas))
+* `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-collector-proto`, `opentelemetry-exporter-collector`, `opentelemetry-exporter-jaeger`, `opentelemetry-exporter-zipkin`, `opentelemetry-instrumentation-fetch`, `opentelemetry-instrumentation-grpc`, `opentelemetry-instrumentation-http`, `opentelemetry-instrumentation-xml-http-request`, `opentelemetry-sdk-node`, `opentelemetry-sdk-trace-node`, `opentelemetry-sdk-trace-web`, `opentelemetry-shim-opentracing`
+  * [#2402](https://github.com/open-telemetry/opentelemetry-js/pull/2402) chore: sort entries in tsconfig ([@Flarna](https://github.com/Flarna))
+* `opentelemetry-api-metrics`, `opentelemetry-context-zone-peer-dep`
+  * [#2390](https://github.com/open-telemetry/opentelemetry-js/pull/2390) chore: fix Lint warnings in api-metrics and context-zone-peer-dep ([@alisabzevari](https://github.com/alisabzevari))
+* Other
+  * [#2397](https://github.com/open-telemetry/opentelemetry-js/pull/2397) chore: change codeowners to point to team ([@dyladan](https://github.com/dyladan))
+  * [#2385](https://github.com/open-telemetry/opentelemetry-js/pull/2385) chore: move api into dependencies in integration tests ([@Flarna](https://github.com/Flarna))
+
+### Committers: 11
+
+* Aaron Abbott ([@aabmass](https://github.com/aabmass))
+* Ali Sabzevari ([@alisabzevari](https://github.com/alisabzevari))
+* Clark Jacobsohn ([@quickgiant](https://github.com/quickgiant))
+* Daniel Dyla ([@dyladan](https://github.com/dyladan))
+* Gerhard Stöbich ([@Flarna](https://github.com/Flarna))
+* Julien Fabre ([@jufab](https://github.com/jufab))
+* Severin Neumann ([@svrnm](https://github.com/svrnm))
+* Srikanth Chekuri ([@lonewolf3739](https://github.com/lonewolf3739))
+* Valentin Marchaud ([@vmarchaud](https://github.com/vmarchaud))
+* legendecas ([@legendecas](https://github.com/legendecas))
+* t2t2 ([@t2t2](https://github.com/t2t2))
+
 ## 0.24.0
 
 ### :boom: Breaking Change