Merge branch 'main' into span-add-links-after-creation

.github/workflows/unit-test.yml

@@ -16,6 +16,7 @@ jobs:
           - "16"
           - "18"
           - "20"
+          - "22"
     runs-on: ubuntu-latest
     env:
       NPM_CONFIG_UNSAFE_PERM: true
@@ -31,7 +32,7 @@ jobs:
           node-version: ${{ matrix.node_version }}
 
       - run: npm install -g npm@latest
-        if: ${{ matrix.node_version == '18' || matrix.node_version == '20' }}
+        if: ${{ matrix.node_version == '18' || matrix.node_version == '20' || matrix.node_version == '22' }}
 
       # [email protected] drops support for Node.js v14 and v16
       - run: npm install -g npm@"<10.0.0"
@@ -46,7 +47,7 @@ jobs:
       - 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" ]; then
+          if [ "${{ matrix.node_version }}" = "18" ] || [ "${{ matrix.node_version }}" == "20" ] || [ "${{ matrix.node_version }}" == "22" ]; then
             export NODE_OPTIONS=--openssl-legacy-provider
           fi
           npm run test

CHANGELOG.md

@@ -11,6 +11,9 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 
 ### :rocket: (Enhancement)
 
+* feat(instrumentation): generic config type in instrumentation base [#4659](https://github.com/open-telemetry/opentelemetry-js/pull/4659) @blumamir
+* feat: support node 22 [#4666](https://github.com/open-telemetry/opentelemetry-js/pull/4666) @dyladan
+
 ### :bug: (Bug Fix)
 
 * fix(core): align inconsistent behavior of `getEnv()` and `getEnvWithoutDefaults()` when a `process` polyfill is used [#4648](https://github.com/open-telemetry/opentelemetry-js/pull/4648) @pichlermarc
@@ -34,6 +37,8 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 
 * fix(sdk-trace-web): fix invalid timings in span events [#4486](https://github.com/open-telemetry/opentelemetry-js/pull/4486) @Abinet18
 * fix(resources): ensure BrowserDetector does not think Node.js v21 is a browser [#4561](https://github.com/open-telemetry/opentelemetry-js/issues/4561) @trentm
+* fix(core): align inconsistent behavior of `getEnv()` and `getEnvWithoutDefaults()` when a `process` polyfill is used [#4648](https://github.com/open-telemetry/opentelemetry-js/pull/4648) @pichlermarc
+  * `getEnvWithoutDefaults()` would use `process.env` if it was defined when running in a browser, while `getEnv()` would always use `_globalThis`. Now both use `_globalThis` when running in a browser.
 
 ## 1.23.0
 

README.md

@@ -111,6 +111,7 @@ If you are a library author looking to build OpenTelemetry into your library, pl
 
 | Platform Version    | Supported                                     |
 |---------------------|-----------------------------------------------|
+| Node.JS `v22`       | :heavy_check_mark:                            |
 | Node.JS `v20`       | :heavy_check_mark:                            |
 | Node.JS `v18`       | :heavy_check_mark:                            |
 | Node.JS `v16`       | :heavy_check_mark:                            |

api/CHANGELOG.md

@@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file.
 
 * feat(api): allow adding span links after span creation [#4536](https://github.com/open-telemetry/opentelemetry-js/pull/4536) @seemk
   * This change is non-breaking for end-users, but breaking for Trace SDK implmentations in accordance with the [specification](https://github.com/open-telemetry/opentelemetry-specification/blob/a03382ada8afa9415266a84dafac0510ec8c160f/specification/upgrading.md?plain=1#L97-L122) as new features need to be implemented.
+* feat: support node 22 [#4666](https://github.com/open-telemetry/opentelemetry-js/pull/4666) @dyladan
 
 ### :bug: (Bug Fix)
 

api/package.json

@@ -95,7 +95,7 @@
     "karma-mocha": "2.0.1",
     "karma-mocha-webworker": "1.3.0",
     "karma-spec-reporter": "0.0.36",
-    "karma-webpack": "4.0.2",
+    "karma-webpack": "5.0.1",
     "lerna": "6.6.2",
     "memfs": "3.5.3",
     "mocha": "10.2.0",

api/test/common/internal/version.test.ts

@@ -17,13 +17,18 @@
 import * as assert from 'assert';
 import { VERSION } from '../../../src/version';
 
-describe('version', () => {
-  it('should have generated VERSION.ts', () => {
+describe('version', function () {
+  it('should have generated VERSION.ts', function () {
+    // Skip in case we're not running in Node.js
+    if (global.process?.versions?.node === undefined) {
+      this.skip();
+    }
+
     const pjson = require('../../../package.json');
     assert.strictEqual(pjson.version, VERSION);
   });
 
-  it('prerelease tag versions are banned', () => {
+  it('prerelease tag versions are banned', function () {
     // see https://github.com/open-telemetry/opentelemetry-js-api/issues/74
     assert.ok(VERSION.match(/^\d+\.\d+\.\d+$/));
   });

experimental/CHANGELOG.md

@@ -14,6 +14,8 @@ All notable changes to experimental packages in this project will be documented
 
 ### :rocket: (Enhancement)
 
+* feat: support node 22 [#4666](https://github.com/open-telemetry/opentelemetry-js/pull/4666) @dyladan
+
 ### :bug: (Bug Fix)
 
 ### :books: (Refine Doc)

experimental/packages/api-events/package.json

@@ -76,7 +76,7 @@
     "karma-coverage": "2.2.1",
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.36",
-    "karma-webpack": "4.0.2",
+    "karma-webpack": "5.0.1",
     "lerna": "6.6.2",
     "mocha": "10.2.0",
     "nyc": "15.1.0",

experimental/packages/api-logs/package.json

@@ -75,7 +75,7 @@
     "karma-coverage": "2.2.1",
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.36",
-    "karma-webpack": "4.0.2",
+    "karma-webpack": "5.0.1",
     "lerna": "6.6.2",
     "mocha": "10.2.0",
     "nyc": "15.1.0",

experimental/packages/exporter-logs-otlp-http/package.json

@@ -89,7 +89,7 @@
     "karma-coverage": "2.2.1",
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.36",
-    "karma-webpack": "4.0.2",
+    "karma-webpack": "5.0.1",
     "lerna": "6.6.2",
     "mocha": "10.2.0",
     "nyc": "15.1.0",

experimental/packages/exporter-logs-otlp-http/test/browser/OTLPLogExporter.test.ts

@@ -32,7 +32,7 @@ describe('OTLPLogExporter', () => {
     sinon.restore();
   });
 
-  if (typeof process === 'undefined') {
+  if (global.process?.versions?.node === undefined) {
     envSource = globalThis as unknown as Record<string, any>;
   } else {
     envSource = process.env as Record<string, any>;

experimental/packages/exporter-logs-otlp-http/test/config.test.ts

@@ -21,7 +21,7 @@ import { getDefaultUrl } from '../src/platform/config';
 describe('getDefaultUrl', () => {
   let envSource: Record<string, any>;
 
-  if (typeof process === 'undefined') {
+  if (global.process?.versions?.node === undefined) {
     envSource = globalThis as unknown as Record<string, any>;
   } else {
     envSource = process.env as Record<string, any>;

experimental/packages/exporter-logs-otlp-http/test/node/OTLPLogExporter.test.ts

@@ -68,7 +68,7 @@ describe('OTLPLogExporter', () => {
     sinon.restore();
   });
 
-  if (typeof process === 'undefined') {
+  if (global.process?.versions?.node === undefined) {
     envSource = globalThis as unknown as Record<string, any>;
   } else {
     envSource = process.env as Record<string, any>;

experimental/packages/exporter-logs-otlp-proto/package.json

@@ -78,7 +78,7 @@
     "karma-coverage": "2.2.1",
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.36",
-    "karma-webpack": "4.0.2",
+    "karma-webpack": "5.0.1",
     "lerna": "6.6.2",
     "mocha": "10.2.0",
     "nyc": "15.1.0",

experimental/packages/exporter-trace-otlp-http/package.json

@@ -80,7 +80,7 @@
     "karma-coverage": "2.2.1",
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.36",
-    "karma-webpack": "4.0.2",
+    "karma-webpack": "5.0.1",
     "lerna": "6.6.2",
     "mocha": "10.2.0",
     "nyc": "15.1.0",

experimental/packages/exporter-trace-otlp-proto/package.json

@@ -77,7 +77,7 @@
     "karma-coverage": "2.2.1",
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.36",
-    "karma-webpack": "4.0.2",
+    "karma-webpack": "5.0.1",
     "lerna": "6.6.2",
     "mocha": "10.2.0",
     "nyc": "15.1.0",

experimental/packages/opentelemetry-browser-detector/package.json

@@ -67,7 +67,7 @@
     "karma-coverage": "2.2.1",
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.36",
-    "karma-webpack": "4.0.2",
+    "karma-webpack": "5.0.1",
     "lerna": "6.6.2",
     "mocha": "10.2.0",
     "nyc": "15.1.0",

experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json

@@ -80,7 +80,7 @@
     "karma-coverage": "2.2.1",
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.36",
-    "karma-webpack": "4.0.2",
+    "karma-webpack": "5.0.1",
     "lerna": "6.6.2",
     "mocha": "10.2.0",
     "nyc": "15.1.0",

experimental/packages/opentelemetry-instrumentation-fetch/package.json

@@ -73,7 +73,7 @@
     "karma-coverage": "2.2.1",
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.36",
-    "karma-webpack": "4.0.2",
+    "karma-webpack": "5.0.1",
     "lerna": "6.6.2",
     "mocha": "10.2.0",
     "nyc": "15.1.0",

experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts

@@ -72,7 +72,7 @@ export interface FetchInstrumentationConfig extends InstrumentationConfig {
 /**
  * This class represents a fetch plugin for auto instrumentation
  */
-export class FetchInstrumentation extends InstrumentationBase {
+export class FetchInstrumentation extends InstrumentationBase<FetchInstrumentationConfig> {
   readonly component: string = 'fetch';
   readonly version: string = VERSION;
   moduleName = this.component;
@@ -85,10 +85,6 @@ export class FetchInstrumentation extends InstrumentationBase {
 
   init(): void {}
 
-  private _getConfig(): FetchInstrumentationConfig {
-    return this._config;
-  }
-
   /**
    * Add cors pre flight child span
    * @param span
@@ -105,7 +101,7 @@ export class FetchInstrumentation extends InstrumentationBase {
       },
       api.trace.setSpan(api.context.active(), span)
     );
-    if (!this._getConfig().ignoreNetworkEvents) {
+    if (!this.getConfig().ignoreNetworkEvents) {
       web.addSpanNetworkEvents(childSpan, corsPreFlightRequest);
     }
     childSpan.end(
@@ -149,7 +145,7 @@ export class FetchInstrumentation extends InstrumentationBase {
     if (
       !web.shouldPropagateTraceHeaders(
         spanUrl,
-        this._getConfig().propagateTraceHeaderCorsUrls
+        this.getConfig().propagateTraceHeaderCorsUrls
       )
     ) {
       const headers: Partial<Record<string, unknown>> = {};
@@ -186,7 +182,7 @@ export class FetchInstrumentation extends InstrumentationBase {
    * @private
    */
   private _clearResources() {
-    if (this._tasksCount === 0 && this._getConfig().clearTimingResources) {
+    if (this._tasksCount === 0 && this.getConfig().clearTimingResources) {
       performance.clearResourceTimings();
       this._usedResources = new WeakSet<PerformanceResourceTiming>();
     }
@@ -201,7 +197,7 @@ export class FetchInstrumentation extends InstrumentationBase {
     url: string,
     options: Partial<Request | RequestInit> = {}
   ): api.Span | undefined {
-    if (core.isUrlIgnored(url, this._getConfig().ignoreUrls)) {
+    if (core.isUrlIgnored(url, this.getConfig().ignoreUrls)) {
       this._diag.debug('ignoring span as url matches ignored url');
       return;
     }
@@ -258,7 +254,7 @@ export class FetchInstrumentation extends InstrumentationBase {
         this._addChildSpan(span, corsPreFlightRequest);
         this._markResourceAsUsed(corsPreFlightRequest);
       }
-      if (!this._getConfig().ignoreNetworkEvents) {
+      if (!this.getConfig().ignoreNetworkEvents) {
         web.addSpanNetworkEvents(span, mainRequest);
       }
     }
@@ -419,7 +415,7 @@ export class FetchInstrumentation extends InstrumentationBase {
     result: Response | FetchError
   ) {
     const applyCustomAttributesOnSpan =
-      this._getConfig().applyCustomAttributesOnSpan;
+      this.getConfig().applyCustomAttributesOnSpan;
     if (applyCustomAttributesOnSpan) {
       safeExecuteInTheMiddle(
         () => applyCustomAttributesOnSpan(span, request, result),

experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts

@@ -88,7 +88,7 @@ import {
 import { AttributeValues } from './enums/AttributeValues';
 import { VERSION } from './version';
 
-export class GrpcInstrumentation extends InstrumentationBase {
+export class GrpcInstrumentation extends InstrumentationBase<GrpcInstrumentationConfig> {
   private _metadataCapture: metadataCaptureType;
 
   constructor(config?: GrpcInstrumentationConfig) {
@@ -195,16 +195,7 @@ export class GrpcInstrumentation extends InstrumentationBase {
     ];
   }
 
-  /**
-   * @internal
-   * Public reference to the protected BaseInstrumentation `_config` instance to be used by this
-   * plugin's external helper functions
-   */
-  override getConfig(): GrpcInstrumentationConfig {
-    return super.getConfig();
-  }
-
-  override setConfig(config?: GrpcInstrumentationConfig): void {
+  override setConfig(config: GrpcInstrumentationConfig = {}): void {
     super.setConfig(config);
     this._metadataCapture = this._createMetadataCapture();
   }

experimental/packages/opentelemetry-instrumentation-http/package.json

@@ -66,7 +66,7 @@
     "request": "2.88.2",
     "request-promise-native": "1.0.9",
     "sinon": "15.1.2",
-    "superagent": "8.0.9",
+    "superagent": "9.0.1",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"
   },