Merge branch 'main' into feat/add-transformer-entrypoints

Author: pichlermarc

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -68,14 +68,14 @@ body:
         const { getNodeAutoInstrumentations } = require('@opentelemetry/auto-instrumentations-node');
         const { ConsoleSpanExporter } = require('@opentelemetry/sdk-trace-base');
         const { resourceFromAttributes } = require('@opentelemetry/resources');
-        const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
+        const { ATTR_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
 
         // configure the SDK to export telemetry data to the console
         // enable all auto-instrumentations from the meta package
         const traceExporter = new ConsoleSpanExporter();
         const sdk = new opentelemetry.NodeSDK({
           resource: resourceFromAttributes({
-            [SEMRESATTRS_SERVICE_NAME]: 'my-service',
+            [ATTR_SERVICE_NAME]: 'my-service',
           }),
           traceExporter,
           instrumentations: [getNodeAutoInstrumentations()]

.github/workflows/docs.yaml

@@ -1,11 +1,8 @@
 name: Deploy API Documentation
 
-# Disable API doc updates from "main" while "main" is frozen for https://github.com/open-telemetry/opentelemetry-js/milestone/17
-# TODO: renable this once ready for releases from "main" again.
-# on:
-#   release:
-#     types: [published]
-on: []
+on:
+  release:
+    types: [published]
 
 jobs:
   build-and-deploy:
@@ -19,7 +16,7 @@ jobs:
           cache: 'npm'
           cache-dependency-path: |
             package-lock.json
-          node-version: '20'
+          node-version: '22'
 
       - name: Install and Build 🔧
         run: |

.github/workflows/lint.yml

@@ -19,7 +19,7 @@ jobs:
           cache: 'npm'
           cache-dependency-path: |
             package-lock.json
-          node-version: '20'
+          node-version: '22'
 
       - name: Bootstrap
         run: npm ci

.github/workflows/ossf-scorecard.yml

@@ -0,0 +1,47 @@
+name: OSSF Scorecard
+
+on:
+  push:
+    branches:
+      - main
+  schedule:
+    - cron: "44 18 * * 6" # once a week
+  workflow_dispatch:
+
+permissions: read-all
+
+jobs:
+  analysis:
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed for Code scanning upload
+      security-events: write
+      # Needed for GitHub OIDC token if publish_results is true
+      id-token: write
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+
+      - uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable
+      # uploads of run results in SARIF format to the repository Actions tab.
+      # https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard (optional).
+      # Commenting out will disable upload of results to your repo's Code Scanning dashboard
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
+        with:
+          sarif_file: results.sarif

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

@@ -38,4 +38,4 @@ jobs:
         # (packages are in-fact published in the correct order), but the race on the registry still applies.
         # If this happens, run the workflow again - there should be enough time for everything to settle until this workflow
         # attempts to publish again.
-        run: npx lerna publish --concurrency 1 from-package --no-push --no-private --no-git-tag-version --no-verify-access --dist-tag=canary --yes
+        run: npx lerna publish --concurrency 1 from-package --no-push --no-private --no-git-tag-version --no-verify-access --dist-tag=latest --yes

.github/workflows/unit-test.yml

@@ -82,7 +82,7 @@ jobs:
           cache: 'npm'
           cache-dependency-path: |
             package-lock.json
-          node-version: '20'
+          node-version: '22'
 
       - run: npm install -g npm@latest
 

CHANGELOG.md

@@ -10,6 +10,39 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2
 
 ## Unreleased
 
+### :boom: Breaking Changes
+
+### :rocket: Features
+
+### :bug: Bug Fixes
+
+* fix(resources): guard asynchronous resource attribute rejections from causing unhandled promise rejection [#5544](https://github.com/open-telemetry/opentelemetry-js/pull/5544) @dyladan
+* fix(resource): do not trigger `Accessing resource attributes before async attributes settled` warning when detecting resources [#5546](https://github.com/open-telemetry/opentelemetry-js/pull/5546) @dyladan
+  * verbose logging of detected resource removed
+* fix(resource): use dynamic import over require to improve ESM compliance [#5298](https://github.com/open-telemetry/opentelemetry-js/pull/5298) @xiaoxiangmoe
+* fix(sdk-metrics): improve PeriodicExportingMetricReader() constructor input validation [#5621](https://github.com/open-telemetry/opentelemetry-js/pull/5621) @cjihrig
+
+### :books: Documentation
+
+* refactor(metrics): Updated metrics samples to no longer treat `sdk.start()` as async [#5617](https://github.com/open-telemetry/opentelemetry-js/pull/5617) @JacksonWeber
+
+### :house: Internal
+
+* test(sdk-metrics): fix multiple problematic assertRejects() calls [#5611](https://github.com/open-telemetry/opentelemetry-js/pull/5611) @cjihrig
+* refactor: replace assertRejects() with assert.rejects() [#5614](https://github.com/open-telemetry/opentelemetry-js/pull/5614) @cjihrig
+* refactor(core): migrate from deprecated semconv constants [#5575](https://github.com/open-telemetry/opentelemetry-js/pull/5575) @alumni55748
+
+## 2.0.0
+
+### Summary
+
+- The **minimum supported Node.js has been raised to `^18.19.0 || >=20.6.0`**. This means that support for Node.js 14 and 16 has been dropped.
+- The **minimum supported TypeScript version has been raised to 5.0.4**.
+- The **compilation target for transpiled TypeScript has been raised to ES2022** (from ES2017).
+- The **public interface has changed**
+  - for notes on migrating to 2.x / 0.200.x see [the upgrade guide](https://github.com/open-telemetry/opentelemetry-js/tree/main/doc/upgrade-to-2.x.md)
+- Only experimental versions `0.200.0` are compatible with this release
+
 ### :boom: Breaking Change
 
 * feat(sdk-trace-base)!: Add `parentSpanContext` and remove `parentSpanId` from `Span` and `ReadableSpan` [#5450](https://github.com/open-telemetry/opentelemetry-js/pull/5450) @JacksonWeber
@@ -151,8 +184,7 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2
 * fix(exporter-zipkin): remove usages of deprecated `url.parse` from `node:url` [#5390](https://github.com/open-telemetry/opentelemetry-js/pull/5390) @chancancode
 * fix(sdk-metrics): do not export from `PeriodicExportingMetricReader` when there are no metrics to export. [#5288](https://github.com/open-telemetry/opentelemetry-js/pull/5288) @jacksonweber
 * fix(sdk-trace-base): always wait on pending export in SimpleSpanProcessor. [#5303](https://github.com/open-telemetry/opentelemetry-js/pull/5303) @anuraaga
-
-### :books: (Refine Doc)
+* fix(core): avoid using util in configuration.ts for browser compatibility [#5524](https://github.com/open-telemetry/opentelemetry-js/pull/5524) @sriraamas
 
 ### :house: (Internal)
 

README.md

@@ -35,10 +35,6 @@
 
 ---
 
-> [!WARNING]
-> This is the working branch for the work in progress 2.0 SDK, see [this tracking issue](https://github.com/open-telemetry/opentelemetry-js/issues/5148) for details.
-> If you are a user looking for the current released state, you are probably looking for the [1.x SDK](https://github.com/open-telemetry/opentelemetry-js/tree/v1.x) on the v1.x branch.
-
 ## About this project
 
 This is the JavaScript version of [OpenTelemetry](https://opentelemetry.io/), a framework for collecting traces, metrics, and logs from applications.
@@ -76,14 +72,14 @@ const opentelemetry = require('@opentelemetry/sdk-node');
 const { getNodeAutoInstrumentations } = require('@opentelemetry/auto-instrumentations-node');
 const { ConsoleSpanExporter } = require('@opentelemetry/sdk-trace-base');
 const { resourceFromAttributes } = require('@opentelemetry/resources');
-const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
+const { ATTR_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
 
 // configure the SDK to export telemetry data to the console
 // enable all auto-instrumentations from the meta package
 const traceExporter = new ConsoleSpanExporter();
 const sdk = new opentelemetry.NodeSDK({
   resource: resourceFromAttributes({
-    [SEMRESATTRS_SERVICE_NAME]: 'my-service',
+    [ATTR_SERVICE_NAME]: 'my-service',
   }),
   traceExporter,
   instrumentations: [getNodeAutoInstrumentations()]
@@ -164,6 +160,7 @@ The below table describes which versions of each set of packages are expected to
 
 | Stable Packages | Experimental Packages |
 |-----------------|-----------------------|
+| 2.0.x           | 0.200.x               |
 | 1.30.x          | 0.57.x                |
 | 1.29.x          | 0.56.x                |
 | 1.28.x          | 0.55.x                |

api/test/common/api/api.test.ts

@@ -48,14 +48,14 @@ const diagLoggerFunctions = [
   'error',
 ] as const;
 
-describe('API', () => {
-  it('should expose a tracer provider via getTracerProvider', () => {
+describe('API', function () {
+  it('should expose a tracer provider via getTracerProvider', function () {
     const tracer = api.trace.getTracerProvider();
     assert.ok(tracer);
     assert.strictEqual(typeof tracer, 'object');
   });
 
-  it('getActiveSpan should get the current span', () => {
+  it('getActiveSpan should get the current span', function () {
     const span = new NonRecordingSpan();
     const ctx = trace.setSpan(ROOT_CONTEXT, span);
     context.setGlobalContextManager({
@@ -69,8 +69,8 @@ describe('API', () => {
     context.disable();
   });
 
-  describe('Context', () => {
-    it('with should forward this, arguments and return value', () => {
+  describe('Context', function () {
+    it('with should forward this, arguments and return value', function () {
       function fnWithThis(this: string, a: string, b: number): string {
         assert.strictEqual(this, 'that');
         assert.strictEqual(arguments.length, 2);
@@ -89,7 +89,7 @@ describe('API', () => {
     });
   });
 
-  describe('GlobalTracerProvider', () => {
+  describe('GlobalTracerProvider', function () {
     const spanContext = {
       traceId: 'd4cda95b652f4a1592b449d5929fda1b',
       spanId: '6e0c63257de34c92',
@@ -103,14 +103,14 @@ describe('API', () => {
       propagation.disable();
     });
 
-    it('should use the global tracer provider', () => {
+    it('should use the global tracer provider', function () {
       api.trace.setGlobalTracerProvider(new TestTracerProvider());
       const tracer = api.trace.getTracerProvider().getTracer('name');
       const span = tracer.startSpan('test');
       assert.deepStrictEqual(span, dummySpan);
     });
 
-    it('should set delegate only on success', () => {
+    it('should set delegate only on success', function () {
       assert.strictEqual(
         api.trace.setGlobalTracerProvider(new TestTracerProvider()),
         true
@@ -134,7 +134,7 @@ describe('API', () => {
       }
     }
 
-    describe('should use the global propagation', () => {
+    describe('should use the global propagation', function () {
       const testKey = Symbol('kTestKey');
 
       interface Carrier {
@@ -169,7 +169,7 @@ describe('API', () => {
         }
       }
 
-      it('inject', () => {
+      it('inject', function () {
         api.propagation.setGlobalPropagator(new TestTextMapPropagation());
 
         const context = ROOT_CONTEXT.setValue(testKey, 15);
@@ -186,7 +186,7 @@ describe('API', () => {
         assert.strictEqual(carrier.setter, setter);
       });
 
-      it('extract', () => {
+      it('extract', function () {
         api.propagation.setGlobalPropagator(new TestTextMapPropagation());
 
         const carrier: Carrier = {};
@@ -209,7 +209,7 @@ describe('API', () => {
         assert.strictEqual(data.getter, getter);
       });
 
-      it('fields', () => {
+      it('fields', function () {
         api.propagation.setGlobalPropagator(new TestTextMapPropagation());
 
         const fields = api.propagation.fields();
@@ -218,37 +218,37 @@ describe('API', () => {
     });
   });
 
-  describe('Global diag', () => {
-    it('initialization', () => {
+  describe('Global diag', function () {
+    it('initialization', function () {
       const inst = DiagAPI.instance();
 
       assert.deepStrictEqual(diag, inst);
     });
 
     diagLoggerFunctions.forEach(fName => {
-      it(`no argument logger ${fName} message doesn't throw`, () => {
+      it(`no argument logger ${fName} message doesn't throw`, function () {
         //@ts-expect-error an undefined logger is not allowed
         diag.setLogger();
         assert.doesNotThrow(() => {
           diag[fName](`${fName} message`);
         });
       });
 
-      it(`null logger ${fName} message doesn't throw`, () => {
+      it(`null logger ${fName} message doesn't throw`, function () {
         diag.setLogger(null as any);
         assert.doesNotThrow(() => {
           diag[fName](`${fName} message`);
         });
       });
 
-      it(`undefined logger ${fName} message doesn't throw`, () => {
+      it(`undefined logger ${fName} message doesn't throw`, function () {
         diag.setLogger(undefined as any);
         assert.doesNotThrow(() => {
           diag[fName](`${fName} message`);
         });
       });
 
-      it(`empty logger ${fName} message doesn't throw`, () => {
+      it(`empty logger ${fName} message doesn't throw`, function () {
         diag.setLogger({} as any);
         assert.doesNotThrow(() => {
           diag[fName](`${fName} message`);
@@ -257,21 +257,21 @@ describe('API', () => {
     });
   });
 
-  describe('Global metrics', () => {
-    it('should expose a meter provider via getMeterProvider', () => {
+  describe('Global metrics', function () {
+    it('should expose a meter provider via getMeterProvider', function () {
       const meter = metrics.getMeterProvider();
       assert.ok(meter);
       assert.strictEqual(typeof meter, 'object');
     });
 
-    describe('GlobalMeterProvider', () => {
+    describe('GlobalMeterProvider', function () {
       const dummyMeter = new NoopMeter();
 
       beforeEach(() => {
         metrics.disable();
       });
 
-      it('should use the global meter provider', () => {
+      it('should use the global meter provider', function () {
         metrics.setGlobalMeterProvider(new TestMeterProvider());
         const meter = metrics.getMeterProvider().getMeter('name');
         assert.deepStrictEqual(meter, dummyMeter);