Merge remote-tracking branch 'upstream/main' into supported-versions

open-telemetry · May 16, 2024 · aaca52d · aaca52d
2 parents ea5718a + 0948b9f
commit aaca52d
Show file tree

Hide file tree

Showing 62 changed files with 495 additions and 229 deletions.
diff --git a/.github/markdown-lint.yml b/.github/markdown-lint.yml
@@ -0,0 +1,5 @@
+# MD004 - Unordered list style
+# This rule is triggered when the symbols used in the document for unordered list items do not match the configured unordered list style
+# * Item 1 // Error: Unordered list style [Expected: dash; Actual: asterisk]
+MD004:
+  style: dash
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -19,6 +19,7 @@ jobs:
       - name: Lint markdown files
         uses: avto-dev/markdown-lint@v1
         with:
+          config: '.github/markdown-lint.yml'
           ignore: "./**/CHANGELOG.md"
           args: "./**/*.md"
 

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -24,7 +24,7 @@ jobs:
         run: |
           npm ci
 
-      - uses: google-github-actions/release-please-action@v4
+      - uses: googleapis/release-please-action@f3969c04a4ec81d7a9aa4010d84ae6a7602f86a7 # v4.1.1
         id: release
         with:
           token: ${{secrets.RELEASE_PR_TOKEN}}

diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ["14", "16", "18"]
+        node: ["14", "16", "18", "20"]
     runs-on: ubuntu-latest
     services:
       mongo:

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ["14", "16", "18"]
+        node: ["14", "16", "18", "20"]
         include:
             - node: 18
               code-coverage: true

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,14 +1,14 @@
 {
   "detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.28.9",
-  "detectors/node/opentelemetry-resource-detector-aws": "1.4.2",
+  "detectors/node/opentelemetry-resource-detector-aws": "1.5.0",
   "detectors/node/opentelemetry-resource-detector-azure": "0.2.7",
   "detectors/node/opentelemetry-resource-detector-container": "0.3.9",
   "detectors/node/opentelemetry-resource-detector-gcp": "0.29.9",
   "detectors/node/opentelemetry-resource-detector-github": "0.28.2",
   "detectors/node/opentelemetry-resource-detector-instana": "0.9.0",
-  "metapackages/auto-instrumentations-node": "0.46.0",
+  "metapackages/auto-instrumentations-node": "0.46.1",
   "metapackages/auto-instrumentations-web": "0.39.0",
-  "packages/baggage-span-processor": "0.1.0",
+  "packages/baggage-span-processor": "0.2.0",
   "packages/opentelemetry-host-metrics": "0.35.1",
   "packages/opentelemetry-id-generator-aws-xray": "1.2.2",
   "packages/opentelemetry-propagation-utils": "0.30.9",
@@ -26,13 +26,13 @@
   "plugins/node/instrumentation-socket.io": "0.39.0",
   "plugins/node/instrumentation-tedious": "0.10.1",
   "plugins/node/instrumentation-undici": "0.2.0",
-  "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.41.0",
+  "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.41.1",
   "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.41.0",
   "plugins/node/opentelemetry-instrumentation-bunyan": "0.38.0",
   "plugins/node/opentelemetry-instrumentation-cassandra": "0.38.0",
-  "plugins/node/opentelemetry-instrumentation-connect": "0.36.0",
+  "plugins/node/opentelemetry-instrumentation-connect": "0.36.1",
   "plugins/node/opentelemetry-instrumentation-dns": "0.36.1",
-  "plugins/node/opentelemetry-instrumentation-express": "0.38.0",
+  "plugins/node/opentelemetry-instrumentation-express": "0.39.0",
   "plugins/node/opentelemetry-instrumentation-fastify": "0.36.1",
   "plugins/node/opentelemetry-instrumentation-generic-pool": "0.36.0",
   "plugins/node/opentelemetry-instrumentation-graphql": "0.40.0",

diff --git a/RELEASING.md b/RELEASING.md
@@ -9,15 +9,15 @@ For posterity, or in the event of any failures with release-please, the process
 
 Manual Release Process Steps:
 
-* [Update to latest locally](#update-to-latest-locally)
-* [Create a new branch](#create-a-new-branch)
-* [Prepare each package for release](#prepare-each-package-for-release)
-* [Use the Changelog to create a GitHub Release](#use-the-changelog-to-create-a-github-release)
-* [Create a new PR](#create-a-new-pr)
-* [Merge and pull](#merge-and-pull)
-* [Publish all packages](#publish-all-packages)
-* [Publish the GitHub Release](#publish-the-github-release)
-* [Update CHANGELOG](#update-changelog)
+- [Update to latest locally](#update-to-latest-locally)
+- [Create a new branch](#create-a-new-branch)
+- [Prepare each package for release](#prepare-each-package-for-release)
+- [Use the Changelog to create a GitHub Release](#use-the-changelog-to-create-a-github-release)
+- [Create a new PR](#create-a-new-pr)
+- [Merge and pull](#merge-and-pull)
+- [Publish all packages](#publish-all-packages)
+- [Publish the GitHub Release](#publish-the-github-release)
+- [Update CHANGELOG](#update-changelog)
 
 ## Update to latest locally
 
@@ -31,9 +31,9 @@ Create a new branch called `x.y.z-proposal` from the current commit.
 
 Decide on the next `major.minor.patch` release number based on [semver](http://semver.org/) guidelines.
 
-* Use `npm install` command to initialize all package directories
-* Use `lerna publish --skip-npm --no-git-tag-version --no-push` to bump the version in all `package.json`
-* Use `npm run bootstrap` to generate latest `version.ts` files
+- Use `npm install` command to initialize all package directories
+- Use `lerna publish --skip-npm --no-git-tag-version --no-push` to bump the version in all `package.json`
+- Use `npm run bootstrap` to generate latest `version.ts` files
 
 ## Use the Changelog to create a GitHub Release
 
@@ -58,10 +58,10 @@ It will print something like:
 ## Unreleased (2018-05-24)
 
 #### :bug: Bug Fix
-* [#198](https://github.com/my-org/my-repo/pull/198) Avoid an infinite loop ([@helpful-hacker](https://github.com/helpful-hacker))
+- [#198](https://github.com/my-org/my-repo/pull/198) Avoid an infinite loop ([@helpful-hacker](https://github.com/helpful-hacker))
 
 #### :house: Internal
-* [#183](https://github.com/my-org/my-repo/pull/183) Standardize error messages ([@careful-coder](https://github.com/careful-coder))
+- [#183](https://github.com/my-org/my-repo/pull/183) Standardize error messages ([@careful-coder](https://github.com/careful-coder))
 
 #### Commiters: 2
 - Helpful Hacker ([@helpful-hacker](https://github.com/helpful-hacker))
@@ -112,10 +112,10 @@ Publish the GitHub release, ensuring that the tag points to the newly landed com
 
 ## Update CHANGELOG
 
-* After releasing is done, update the [CHANGELOG.md](https://github.com/open-telemetry/opentelemetry-js/blob/main/CHANGELOG.md) and start new Unreleased label.
-* Create a new commit with the exact title: `Post Release: update CHANGELOG.md`.
-* Go through PR review and merge it to GitHub main branch.
+- After releasing is done, update the [CHANGELOG.md](https://github.com/open-telemetry/opentelemetry-js/blob/main/CHANGELOG.md) and start new Unreleased label.
+- Create a new commit with the exact title: `Post Release: update CHANGELOG.md`.
+- Go through PR review and merge it to GitHub main branch.
 
 ## Known Issues
 
-* The `examples/` and `getting-started/` folders are not part of lerna packages, we need to manually bump the version in `package.json`.
+- The `examples/` and `getting-started/` folders are not part of lerna packages, we need to manually bump the version in `package.json`.
diff --git a/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md
@@ -66,6 +66,13 @@
   * devDependencies
     * @opentelemetry/contrib-test-utils bumped from ^0.35.1 to ^0.36.0
 
+## [1.5.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.4.2...resource-detector-aws-v1.5.0) (2024-05-15)
+
+
+### Features
+
+* add support for cloud.resource_id to AWS ECS detector ([#1936](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1936)) ([cc71492](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/cc714922b931ce39595ef0b257114b4e797ba6a9))
+
 ## [1.4.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.4.1...resource-detector-aws-v1.4.2) (2024-04-25)
 
 

diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-aws",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "description": "OpenTelemetry SDK resource detector for AWS",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",

diff --git a/incubator/opentelemetry-sampler-aws-xray/README.md b/incubator/opentelemetry-sampler-aws-xray/README.md
@@ -52,6 +52,10 @@ For more details on setting up the global tracer provider to send traces to AWS
 
 Please note that AWS Lambda does not support X-Ray remote sampling.
 
+## Semantic Conventions
+
+This package does not currently generate any attributes from semantic conventions.
+
 ## Useful links
 
 - [More information on OpenTelemetry](https://opentelemetry.io/)

diff --git a/incubator/opentelemetry-sampler-aws-xray/package.json b/incubator/opentelemetry-sampler-aws-xray/package.json
@@ -46,7 +46,6 @@
   "dependencies": {
     "@opentelemetry/core": "^1.8.0",
     "@opentelemetry/sdk-trace-base": "^1.8.0",
-    "@opentelemetry/semantic-conventions": "^1.0.0",
     "axios": "^1.3.5"
   },
   "devDependencies": {
@@ -55,16 +54,16 @@
     "@types/mocha": "8.2.3",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.18",
+    "@typescript-eslint/eslint-plugin": "5.8.1",
+    "@typescript-eslint/parser": "5.8.1",
     "eslint": "8.7.0",
     "expect": "29.2.0",
     "mocha": "7.2.0",
     "nock": "13.3.3",
+    "nyc": "15.1.0",
     "sinon": "15.2.0",
     "ts-mocha": "10.0.0",
-    "nyc": "15.1.0",
-    "typescript": "4.4.4",
-    "@typescript-eslint/eslint-plugin": "5.8.1",
-    "@typescript-eslint/parser": "5.8.1"
+    "typescript": "4.4.4"
   },
   "engines": {
     "node": ">=14"

diff --git a/metapackages/auto-instrumentations-node/CHANGELOG.md b/metapackages/auto-instrumentations-node/CHANGELOG.md
@@ -152,6 +152,18 @@
   * dependencies
     * @opentelemetry/instrumentation-aws-sdk bumped from ^0.38.0 to ^0.38.1
 
+## [0.46.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.46.0...auto-instrumentations-node-v0.46.1) (2024-05-15)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @opentelemetry/instrumentation-aws-lambda bumped from ^0.41.0 to ^0.41.1
+    * @opentelemetry/instrumentation-connect bumped from ^0.36.0 to ^0.36.1
+    * @opentelemetry/instrumentation-express bumped from ^0.38.0 to ^0.39.0
+    * @opentelemetry/resource-detector-aws bumped from ^1.4.2 to ^1.5.0
+
 ## [0.46.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.45.0...auto-instrumentations-node-v0.46.0) (2024-05-02)
 
 

diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/auto-instrumentations-node",
-  "version": "0.46.0",
+  "version": "0.46.1",
   "description": "Metapackage which bundles opentelemetry node core and contrib instrumentations",
   "author": "OpenTelemetry Authors",
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/auto-instrumentations-node#readme",
@@ -51,15 +51,15 @@
   "dependencies": {
     "@opentelemetry/instrumentation": "^0.51.0",
     "@opentelemetry/instrumentation-amqplib": "^0.37.0",
-    "@opentelemetry/instrumentation-aws-lambda": "^0.41.0",
+    "@opentelemetry/instrumentation-aws-lambda": "^0.41.1",
     "@opentelemetry/instrumentation-aws-sdk": "^0.41.0",
     "@opentelemetry/instrumentation-bunyan": "^0.38.0",
     "@opentelemetry/instrumentation-cassandra-driver": "^0.38.0",
-    "@opentelemetry/instrumentation-connect": "^0.36.0",
+    "@opentelemetry/instrumentation-connect": "^0.36.1",
     "@opentelemetry/instrumentation-cucumber": "^0.6.0",
     "@opentelemetry/instrumentation-dataloader": "^0.9.0",
     "@opentelemetry/instrumentation-dns": "^0.36.1",
-    "@opentelemetry/instrumentation-express": "^0.38.0",
+    "@opentelemetry/instrumentation-express": "^0.39.0",
     "@opentelemetry/instrumentation-fastify": "^0.36.1",
     "@opentelemetry/instrumentation-fs": "^0.12.0",
     "@opentelemetry/instrumentation-generic-pool": "^0.36.0",
@@ -89,7 +89,7 @@
     "@opentelemetry/instrumentation-undici": "^0.2.0",
     "@opentelemetry/instrumentation-winston": "^0.37.0",
     "@opentelemetry/resource-detector-alibaba-cloud": "^0.28.9",
-    "@opentelemetry/resource-detector-aws": "^1.4.2",
+    "@opentelemetry/resource-detector-aws": "^1.5.0",
     "@opentelemetry/resource-detector-azure": "^0.2.6",
     "@opentelemetry/resource-detector-container": "^0.3.9",
     "@opentelemetry/resource-detector-gcp": "^0.29.9",