Merge branch 'main' into kafkajs-instrumentation

open-telemetry · Apr 23, 2024 · f4ff11c · f4ff11c
2 parents aa8a27e + a5bee9f
commit f4ff11c
Show file tree

Hide file tree

Showing 138 changed files with 1,214 additions and 2,189 deletions.
diff --git a/.github/component-label-map.yml b/.github/component-label-map.yml
@@ -61,7 +61,6 @@ pkg:instrumentation-aws-lambda:
   - changed-files:
       - any-glob-to-any-file:
           - plugins/node/opentelemetry-instrumentation-aws-lambda/**
-          - propagators/opentelemetry-propagator-aws-xray/**
 pkg:instrumentation-aws-sdk:
   - changed-files:
       - any-glob-to-any-file:
@@ -225,6 +224,10 @@ pkg:instrumentation-tedious:
       - any-glob-to-any-file:
           - plugins/node/instrumentation-tedious/**
           - packages/opentelemetry-test-utils/**
+pkg:instrumentation-undici:
+  - changed-files:
+      - any-glob-to-any-file:
+          - plugins/node/instrumentation-undici/**
 pkg:instrumentation-user-interaction:
   - changed-files:
       - any-glob-to-any-file:
@@ -242,10 +245,6 @@ pkg:propagation-utils:
       - any-glob-to-any-file:
           - packages/opentelemetry-propagation-utils/**
           - packages/opentelemetry-test-utils/**
-pkg:propagator-aws-xray:
-  - changed-files:
-      - any-glob-to-any-file:
-          - propagators/opentelemetry-propagator-aws-xray/**
 pkg:propagator-grpc-census-binary:
   - changed-files:
       - any-glob-to-any-file:

diff --git a/.github/component_owners.yml b/.github/component_owners.yml
@@ -138,8 +138,6 @@ components:
     - obecny
   plugins/web/opentelemetry-plugin-react-load:
     - martinkuba
-  propagators/opentelemetry-propagator-aws-xray:
-    - carolabadeer
   propagators/opentelemetry-propagator-grpc-census-binary: []
     # Unmaintained?
   propagators/opentelemetry-propagator-instana:

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -54,11 +54,15 @@ jobs:
 
       # get main again
       - name: Checkout Repository
+        # only checkout if a release has been created
+        if: ${{ steps.release.outputs.release_created }}
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Rebuild Packages
+        # only rebuild if a release has been created
+        if: ${{ steps.release.outputs.release_created }}
         run: |
           npm ci
           npm run compile
@@ -67,6 +71,8 @@ jobs:
       # need to publish all unpublished versions to npm here
       # See: https://github.com/lerna/lerna/tree/main/commands/publish#bump-from-package
       - name: Publish to npm
+        # only publish if a release has been created
+        if: ${{ steps.release.outputs.release_created }}
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
         run: npx lerna publish from-package --no-push --no-private --no-git-tag-version --no-verify-access --yes
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -57,7 +57,6 @@
   "plugins/web/opentelemetry-instrumentation-long-task": "0.37.0",
   "plugins/web/opentelemetry-instrumentation-user-interaction": "0.37.0",
   "plugins/web/opentelemetry-plugin-react-load": "0.30.0",
-  "propagators/opentelemetry-propagator-aws-xray": "1.3.1",
   "propagators/opentelemetry-propagator-grpc-census-binary": "0.27.1",
   "propagators/opentelemetry-propagator-instana": "0.3.1",
   "propagators/opentelemetry-propagator-ot-trace": "0.27.1"

diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2022] OpenTelemetry Authors
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/archive/opentelemetry-browser-extension-autoinjection/LICENSE b/archive/opentelemetry-browser-extension-autoinjection/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2022] OpenTelemetry Authors
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/LICENSE b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2021] OpenTelemetry Authors
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/detectors/node/opentelemetry-resource-detector-aws/LICENSE b/detectors/node/opentelemetry-resource-detector-aws/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2020] OpenTelemetry Authors
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/detectors/node/opentelemetry-resource-detector-azure/LICENSE b/detectors/node/opentelemetry-resource-detector-azure/LICENSE
@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
     same "printed page" as the copyright notice for easier
     identification within third-party archives.
 
-Copyright [2020] OpenTelemetry Authors
+Copyright [yyyy] [name of copyright owner]
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/detectors/node/opentelemetry-resource-detector-container/LICENSE b/detectors/node/opentelemetry-resource-detector-container/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2021] OpenTelemetry Authors
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/detectors/node/opentelemetry-resource-detector-gcp/LICENSE b/detectors/node/opentelemetry-resource-detector-gcp/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2020] OpenTelemetry Authors
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/detectors/node/opentelemetry-resource-detector-github/LICENSE b/detectors/node/opentelemetry-resource-detector-github/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2022] OpenTelemetry Authors
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/detectors/node/opentelemetry-resource-detector-instana/LICENSE b/detectors/node/opentelemetry-resource-detector-instana/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2020] OpenTelemetry Authors
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/incubator/opentelemetry-sampler-aws-xray/LICENSE b/incubator/opentelemetry-sampler-aws-xray/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2022] OpenTelemetry Authors
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/metapackages/auto-instrumentations-node/LICENSE b/metapackages/auto-instrumentations-node/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2022] OpenTelemetry Authors
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/metapackages/auto-instrumentations-web/LICENSE b/metapackages/auto-instrumentations-web/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2022] OpenTelemetry Authors
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.