Merge branch 'main' into request-body-size

.github/workflows/publish-to-npm.yml

@@ -0,0 +1,31 @@
+name: Publish packages to NPM
+
+on:
+  workflow_dispatch:
+
+jobs:
+  release-to-npm:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          registry-url: 'https://registry.npmjs.org'
+
+      - run: npm ci
+
+      - run: npm run compile
+
+      - name: Publish to npm
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+          NPM_CONFIG_PROVENANCE: true
+        run: npx lerna publish --concurrency 1 from-package --no-push --no-private --no-git-tag-version --no-verify-access --yes

.github/workflows/unit-test.yml

@@ -16,7 +16,7 @@ jobs:
           - "16"
           - "18"
           - "20"
-          - "22.6" # temp until 22.8 is released (bug in 22.7)
+          - "22"
     runs-on: ubuntu-latest
     env:
       NPM_CONFIG_UNSAFE_PERM: true
@@ -45,15 +45,13 @@ jobs:
         run: npm run compile
 
       - name: Unit tests
-        run: |
-          # TODO(legendecas): webpack https://stackoverflow.com/questions/69692842/error-message-error0308010cdigital-envelope-routinesunsupported
-          if [ "${{ matrix.node_version }}" = "18" ] || [ "${{ matrix.node_version }}" == "20" ] || [ "${{ matrix.node_version }}" == "22" ]; then
-            export NODE_OPTIONS=--openssl-legacy-provider
-          fi
-          npm run test
+        run: npm run test
       - name: Report Coverage
-        run: npm run codecov
-        if: ${{ matrix.node_version == '14' }}
+        uses: codecov/codecov-action@v4
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        with:
+          verbose: true
   node-windows-tests:
     runs-on: windows-latest
     env:
@@ -80,8 +78,6 @@ jobs:
           npm run compile
 
       - name: Unit tests
-        env:
-         NODE_OPTIONS: --openssl-legacy-provider
         run: npm run test
   browser-tests:
     runs-on: ubuntu-latest
@@ -107,7 +103,11 @@ jobs:
       - name: Unit tests
         run: npm run test:browser
       - name: Report Coverage
-        run: npm run codecov:browser
+        uses: codecov/codecov-action@v4
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        with:
+          verbose: true
   webworker-tests:
     runs-on: ubuntu-latest
     env:
@@ -131,7 +131,11 @@ jobs:
       - name: Unit tests
         run: npm run test:webworker
       - name: Report Coverage
-        run: npm run codecov:webworker
+        uses: codecov/codecov-action@v4
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        with:
+          verbose: true
   api-eol-node-test:
     strategy:
       fail-fast: false

.nycrc

@@ -3,6 +3,7 @@
   "extension": [
     ".ts"
   ],
+  "reporter": ["text", "json"],
   "exclude": [
     "**/*.d.ts",
     "build/**/*.*",

CHANGELOG.md

@@ -13,6 +13,29 @@ For semantic convention package changes, see the [semconv CHANGELOG](packages/se
 
 ### :rocket: (Enhancement)
 
+* feat: add processors for adding session.id attribute to spans and logs [#4972](https://github.com/open-telemetry/opentelemetry-js/pull/4972)
+
+### :bug: (Bug Fix)
+
+* fix(sdk-trace-base): avoid keeping non-string `status.message` on `Span#setStatus()` [#4999](https://github.com/open-telemetry/opentelemetry-js/pull/4999) @pichlermarc
+* fix(sdk-metrics): Add missing catch and handle error in promise of `PeriodicExportingMetricReader` [#5006](https://github.com/open-telemetry/opentelemetry-js/pull/5006) @jj22ee
+* fix(opentelemetry-core): confusing log extract of composite propagator [#5017](https://github.com/open-telemetry/opentelemetry-js/pull/5017) @rv2673
+
+### :books: (Refine Doc)
+
+### :house: (Internal)
+
+* deps: set `@opentelemetry/api` dependency min version to 1.3.0 in `examples`, `experimental/packages`, `integration-tests` and `selenium-tests`
+  [#4992](https://github.com/open-telemetry/opentelemetry-js/pull/4992)
+* refactor(sdk-metrics): replace `MetricsAttributes` with `Attributes` [#5021](https://github.com/open-telemetry/opentelemetry-js/pull/5021) @david-luna
+* refactor(instrumentation-http): replace `SpanAttributes` and `MetricsAttributes` with `Attributes` [#5023](https://github.com/open-telemetry/opentelemetry-js/pull/5023) @david-luna
+* chore(exporter-zipkin): remove usages of Span constructor [#5030](https://github.com/open-telemetry/opentelemetry-js/pull/5030) @david-luna
+* test(instrumentation-http): remove usages of `new Span` in tests [#5035](https://github.com/open-telemetry/opentelemetry-js/pull/5035) @david-luna
+
+## 1.26.0
+
+### :rocket: (Enhancement)
+
 * feat: include instrumentation scope info in console span and log record exporters [#4848](https://github.com/open-telemetry/opentelemetry-js/pull/4848) @blumamir
 * feat(semconv): update semantic conventions to 1.27 (from 1.7.0) [#4690](https://github.com/open-telemetry/opentelemetry-js/pull/4690) @dyladan
   * Exported names have changed to `ATTR_{name}` for attributes (e.g. `ATTR_HTTP_REQUEST_METHOD`), `{name}_VALUE_{value}` for enumeration values (e.g. `HTTP_REQUEST_METHOD_VALUE_POST`), and `METRIC_{name}` for metrics. Exported names from previous versions are deprecated.
@@ -26,8 +49,6 @@ For semantic convention package changes, see the [semconv CHANGELOG](packages/se
 * fix(instrumentation): Fix optional property types [#4833](https://github.com/open-telemetry/opentelemetry-js/pull/4833) @alecmev
 * fix(sdk-metrics): fix(sdk-metrics): use inclusive upper bounds in histogram [#4829](https://github.com/open-telemetry/opentelemetry-js/pull/4829)
 
-### :books: (Refine Doc)
-
 ### :house: (Internal)
 
 * refactor: Simplify the code for the `getEnv` function [#4799](https://github.com/open-telemetry/opentelemetry-js/pull/4799) @danstarns
@@ -89,6 +110,7 @@ For semantic convention package changes, see the [semconv CHANGELOG](packages/se
 * fix(resources): prevent circular import (resource -> detector -> resource -> ...) [#4653](https://github.com/open-telemetry/opentelemetry-js/pull/4653) @pichlermarc
   * fixes a circular import warning which would appear in rollup when bundling `@opentelemetry/resources`
 * fix(exporter-metrics-otlp-grpc): add explicit otlp-exporter-base dependency to exporter-metrics-otlp-grpc [#4678](https://github.com/open-telemetry/opentelemetry-js/pull/4678) @AkselAllas
+* fix(resources) wait for async attributes for detecting resources [#4687](https://github.com/open-telemetry/opentelemetry-js/pull/4687) @ziolekjj
 
 ## 1.24.0
 

CONTRIBUTING.md

@@ -29,9 +29,9 @@ detailed instructions, see [development](#development) below.
 ```sh
 git clone https://github.com/open-telemetry/opentelemetry-js.git
 cd opentelemetry-js
-npm install
+npm ci
 npm run compile
-npm test
+npm run test
 ```
 
 ## Pull Request Merge Guidelines
@@ -164,7 +164,7 @@ Most of the commands needed for development are accessed as [npm scripts](https:
 This will install all dependencies for the root project and all modules managed by `npm workspaces`.
 
 ```sh
-npm install
+npm ci
 ```
 
 ### Compile modules
@@ -223,6 +223,16 @@ To run the unit tests continuously in watch mode while developing, use:
 npm run tdd
 ```
 
+Packages that are expected to run in the browser have browser specific tests:
+
+```sh
+# Run browser-specific test
+npm run test:browser
+
+# Run web worker test
+npm run test:webworker
+```
+
 ### Linting
 
 This project uses `eslint` to lint source code. Just like tests and compilation, linting can be done for all packages or only a single package.
@@ -293,10 +303,10 @@ export const _globalThis = typeof globalThis === 'object' ? globalThis : global;
 /// packages/opentelemetry-core/src/platform/browser/globalThis.ts
 export const _globalThis: typeof globalThis =
   typeof globalThis === 'object' ? globalThis :
-  typeof self === 'object' ? self :
-  typeof window === 'object' ? window :
-  typeof global === 'object' ? global :
-  {} as typeof globalThis;
+    typeof self === 'object' ? self :
+      typeof window === 'object' ? window :
+        typeof global === 'object' ? global :
+          {} as typeof globalThis;
 ```
 
 Even though the implementation may differ, the exported names must be aligned.

api/package.json

@@ -29,9 +29,6 @@
   "repository": "open-telemetry/opentelemetry-js",
   "scripts": {
     "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
-    "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../",
-    "codecov:webworker": "nyc report --reporter=json && codecov -f coverage/*.json -p ../",
-    "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../",
     "precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies",
     "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
     "docs": "typedoc",
@@ -80,13 +77,12 @@
     "access": "public"
   },
   "devDependencies": {
-    "@types/mocha": "10.0.7",
+    "@types/mocha": "10.0.8",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "@types/webpack": "5.28.5",
     "@types/webpack-env": "1.16.3",
     "babel-plugin-istanbul": "7.0.0",
-    "codecov": "3.8.3",
     "cross-var": "1.1.0",
     "dpdm": "3.13.1",
     "karma": "6.4.4",
@@ -104,7 +100,7 @@
     "ts-loader": "9.5.1",
     "typescript": "4.4.4",
     "unionfs": "4.5.4",
-    "webpack": "5.89.0"
+    "webpack": "5.94.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/api",
   "sideEffects": false

api/test/tree-shaking/tree-shaking.test.ts

@@ -88,9 +88,10 @@ describe('tree-shaking', () => {
       const fs = new Union();
       fs.use(mfs as any).use(realFs);
 
-      //direct webpack to use unionfs for file input
-      compiler.inputFileSystem = fs;
-      //direct webpack to output to memoryfs rather than to disk
+      // direct webpack to use unionfs for file input
+      // needs workaround from https://github.com/webpack/webpack/issues/18242#issuecomment-2018116985 since webpack 5.91.0
+      compiler.inputFileSystem = fs as any as typeof compiler.inputFileSystem;
+      // direct webpack to output to memoryfs rather than to disk
       compiler.outputFileSystem = {
         ...mfs,
         join: path.join,

examples/basic-tracer-node/package.json

@@ -24,7 +24,7 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.0.2",
+    "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/exporter-jaeger": "0.25.0",
     "@opentelemetry/resources": "0.25.0",
     "@opentelemetry/semantic-conventions": "^1.22.0",

examples/esm-http-ts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "esm-http-ts",
   "private": true,
-  "version": "0.52.1",
+  "version": "0.53.0",
   "description": "Example of HTTP integration with OpenTelemetry using ESM and TypeScript",
   "main": "build/index.js",
   "type": "module",
@@ -32,12 +32,12 @@
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/",
   "dependencies": {
     "@opentelemetry/api": "1.9.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.52.1",
-    "@opentelemetry/instrumentation": "0.52.1",
-    "@opentelemetry/instrumentation-http": "0.52.1",
-    "@opentelemetry/resources": "1.25.1",
-    "@opentelemetry/sdk-trace-base": "1.25.1",
-    "@opentelemetry/sdk-trace-node": "1.25.1",
-    "@opentelemetry/semantic-conventions": "1.26.0"
+    "@opentelemetry/exporter-trace-otlp-proto": "0.53.0",
+    "@opentelemetry/instrumentation": "0.53.0",
+    "@opentelemetry/instrumentation-http": "0.53.0",
+    "@opentelemetry/resources": "1.26.0",
+    "@opentelemetry/sdk-trace-base": "1.26.0",
+    "@opentelemetry/sdk-trace-node": "1.26.0",
+    "@opentelemetry/semantic-conventions": "1.27.0"
   }
 }

examples/grpc-js/package.json

@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.3.7",
-    "@opentelemetry/api": "^1.0.2",
+    "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/exporter-jaeger": "^1.0.1",
     "@opentelemetry/exporter-zipkin": "^1.0.1",
     "@opentelemetry/instrumentation": "^0.27.0",

examples/http/package.json

@@ -1,7 +1,7 @@
 {
   "name": "http-example",
   "private": true,
-  "version": "0.52.1",
+  "version": "0.53.0",
   "description": "Example of HTTP integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -30,14 +30,14 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/exporter-jaeger": "1.25.1",
-    "@opentelemetry/exporter-zipkin": "1.25.1",
-    "@opentelemetry/instrumentation": "0.52.1",
-    "@opentelemetry/instrumentation-http": "0.52.1",
-    "@opentelemetry/resources": "1.25.1",
-    "@opentelemetry/sdk-trace-base": "1.25.1",
-    "@opentelemetry/sdk-trace-node": "1.25.1",
-    "@opentelemetry/semantic-conventions": "1.26.0"
+    "@opentelemetry/exporter-jaeger": "1.26.0",
+    "@opentelemetry/exporter-zipkin": "1.26.0",
+    "@opentelemetry/instrumentation": "0.53.0",
+    "@opentelemetry/instrumentation-http": "0.53.0",
+    "@opentelemetry/resources": "1.26.0",
+    "@opentelemetry/sdk-trace-base": "1.26.0",
+    "@opentelemetry/sdk-trace-node": "1.26.0",
+    "@opentelemetry/semantic-conventions": "1.27.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http",
   "devDependencies": {

examples/https/package.json

@@ -1,7 +1,7 @@
 {
   "name": "https-example",
   "private": true,
-  "version": "0.52.1",
+  "version": "0.53.0",
   "description": "Example of HTTPs integration with OpenTelemetry",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -33,15 +33,15 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/exporter-jaeger": "1.25.1",
-    "@opentelemetry/exporter-zipkin": "1.25.1",
-    "@opentelemetry/instrumentation": "0.52.1",
-    "@opentelemetry/instrumentation-http": "0.52.1",
-    "@opentelemetry/resources": "1.25.1",
-    "@opentelemetry/sdk-trace-base": "1.25.1",
-    "@opentelemetry/sdk-trace-node": "1.25.1",
-    "@opentelemetry/semantic-conventions": "1.26.0"
+    "@opentelemetry/api": "^1.3.0",
+    "@opentelemetry/exporter-jaeger": "1.26.0",
+    "@opentelemetry/exporter-zipkin": "1.26.0",
+    "@opentelemetry/instrumentation": "0.53.0",
+    "@opentelemetry/instrumentation-http": "0.53.0",
+    "@opentelemetry/resources": "1.26.0",
+    "@opentelemetry/sdk-trace-base": "1.26.0",
+    "@opentelemetry/sdk-trace-node": "1.26.0",
+    "@opentelemetry/semantic-conventions": "1.27.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https",
   "devDependencies": {