Merge branch 'next' into MSNev/NextBrowserSupport

.github/workflows/unit-test.yml

@@ -38,10 +38,7 @@ jobs:
         run: npm run compile
 
       - name: Unit tests
-        run: |
-          # TODO(legendecas): webpack https://stackoverflow.com/questions/69692842/error-message-error0308010cdigital-envelope-routinesunsupported
-          export NODE_OPTIONS=--openssl-legacy-provider
-          npm run test
+        run: npm run test
       - name: Report Coverage
         uses: codecov/codecov-action@v4
         with:
@@ -72,8 +69,6 @@ jobs:
           npm run compile
 
       - name: Unit tests
-        env:
-         NODE_OPTIONS: --openssl-legacy-provider
         run: npm run test
   browser-tests:
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -11,17 +11,15 @@ For semantic convention package changes, see the [semconv CHANGELOG](packages/se
 
 ### :boom: Breaking Change
 
-* fix(otlp-exporter-base)!: decrease default concurrency limit to 30 [#4211](https://github.com/open-telemetry/opentelemetry-js/pull/4211) @pichlermarc
-  * fixes a memory leak on prolonged collector unavailability
-  * this change is marked as breaking as it changes defaults
-
 ### :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): make activeSpanProcessor private [#4965](https://github.com/open-telemetry/opentelemetry-js/pull/4965) @legalimpurity
+* 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)
 
@@ -31,6 +29,10 @@ For semantic convention package changes, see the [semconv CHANGELOG](packages/se
 
 * 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
 

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
@@ -293,10 +293,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

@@ -77,7 +77,7 @@
     "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",

experimental/CHANGELOG.md

@@ -10,12 +10,43 @@ All notable changes to experimental packages in this project will be documented
 ### :rocket: (Enhancement)
 
 * feat(api-logs): Add delegating no-op logger provider [#4861](https://github.com/open-telemetry/opentelemetry-js/pull/4861) @hectorhdzg
-* feat(instrumentation-http): Add support for client span semantic conventions 1.27 [#4940](https://github.com/open-telemetry/opentelemetry-js/pull/4940) @dyladan
+* feat(instrumentation-http): Add support for [Semantic Conventions 1.27+](https://github.com/open-telemetry/semantic-conventions/releases/tag/v1.27.0) [#4940](https://github.com/open-telemetry/opentelemetry-js/pull/4940) [#4978](https://github.com/open-telemetry/opentelemetry-js/pull/4978) [#5026](https://github.com/open-telemetry/opentelemetry-js/pull/5026) @dyladan
+  * Applies to client and server spans and metrics
+  * Generate spans and metrics compliant with Semantic Conventions 1.27+ when `OTEL_SEMCONV_STABILITY_OPT_IN` contains `http` or `http/dup`
+  * Generate spans and metrics backwards compatible with previous attributes when `OTEL_SEMCONV_STABILITY_OPT_IN` contains `http/dup` or DOES NOT contain `http`
 
 ### :bug: (Bug Fix)
 
 * fix(sampler-jaeger-remote): fixes an issue where package could emit unhandled promise rejections @Just-Sieb
 * fix(otlp-grpc-exporter-base): default compression to `'none'` if env vars `OTEL_EXPORTER_OTLP_TRACES_COMPRESSION` and `OTEL_EXPORTER_OTLP_COMPRESSION` are falsy @sjvans
+* fix(sdk-events): remove devDependencies to old `@opentelemetry/api-logs@0.52.0`, `@opentelemetry/api-events@0.52.0` packages [#5013](https://github.com/open-telemetry/opentelemetry-js/pull/5013) @pichlermarc
+* fix(sdk-logs): remove devDependencies to old `@opentelemetry/api-logs@0.52.0` [#5013](https://github.com/open-telemetry/opentelemetry-js/pull/5013) @pichlermarc
+* fix(sdk-logs): align LogRecord#setAttribute type with types from `@opentelemetry/api-logs@0.53.0` [#5013](https://github.com/open-telemetry/opentelemetry-js/pull/5013) @pichlermarc
+* feat(exporter-*-otlp-*)!: rewrite exporter config logic for testability [#4971](https://github.com/open-telemetry/opentelemetry-js/pull/4971) @pichlermarc
+  * (user-facing) `getDefaultUrl` was intended for internal use has been removed from all exporters
+  * (user-facing) `getUrlFromConfig` was intended for internal use and has been removed from all exporters
+  * (user-facing) `hostname` was intended for internal use and has been removed from all exporters
+  * (user-facing) `url` was intended for internal use and has been removed from all exporters
+  * (user-facing) `timeoutMillis` was intended for internal use and has been removed from all exporters
+  * (user-facing) `onInit` was intended for internal use and has been removed from all exporters
+* fix(exporter-*-otlp-*): fixes a bug where signal-specific environment variables would not be applied and the trace-specific one was used instead [#4971](https://github.com/open-telemetry/opentelemetry-js/pull/4971) @pichlermarc
+  * Fixes:
+    * `OTEL_EXPORTER_OTLP_METRICS_COMPRESSION`
+    * `OTEL_EXPORTER_OTLP_LOGS_COMPRESSION`
+    * `OTEL_EXPORTER_OTLP_METRICS_CLIENT_CERTIFICATE`
+    * `OTEL_EXPORTER_OTLP_LOGS_CLIENT_CERTIFICATE`
+    * `OTEL_EXPORTER_OTLP_METRICS_CLIENT_KEY`
+    * `OTEL_EXPORTER_OTLP_LOGS_CLIENT_KEY`
+    * `OTEL_EXPORTER_OTLP_METRICS_INSECURE`
+    * `OTEL_EXPORTER_OTLP_LOGS_INSECURE`
+* feat(otlp-exporter-base)!: do not export functions that are intended for internal use [#4971](https://github.com/open-telemetry/opentelemetry-js/pull/4971) @pichlermarc
+  * Drops the following functions and types that were intended for internal use from the package exports:
+    * `parseHeaders`
+    * `appendResourcePathToUrl`
+    * `appendResourcePathToUrlIfNeeded`
+    * `configureExporterTimeout`
+    * `invalidTimeout`
+* fix(sdk-node): use warn instead of error on unknown OTEL_NODE_RESOURCE_DETECTORS values [#5034](https://github.com/open-telemetry/opentelemetry-js/pull/5034)
 
 ### :books: (Refine Doc)
 

experimental/packages/api-events/package.json

@@ -64,7 +64,7 @@
     "@opentelemetry/api-logs": "0.53.0"
   },
   "devDependencies": {
-    "@types/mocha": "10.0.7",
+    "@types/mocha": "10.0.8",
     "@types/node": "18.6.5",
     "@types/webpack-env": "1.16.3",
     "babel-plugin-istanbul": "7.0.0",

experimental/packages/api-logs/package.json

@@ -63,7 +63,7 @@
     "@opentelemetry/api": "^1.3.0"
   },
   "devDependencies": {
-    "@types/mocha": "10.0.7",
+    "@types/mocha": "10.0.8",
     "@types/node": "18.6.5",
     "@types/webpack-env": "1.16.3",
     "babel-plugin-istanbul": "7.0.0",

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

@@ -54,7 +54,7 @@
     "@opentelemetry/api-logs": "0.53.0",
     "@opentelemetry/otlp-exporter-base": "0.53.0",
     "@opentelemetry/resources": "1.26.0",
-    "@types/mocha": "10.0.7",
+    "@types/mocha": "10.0.8",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "cross-var": "1.1.0",

experimental/packages/exporter-logs-otlp-grpc/src/OTLPLogExporter.ts

@@ -15,22 +15,14 @@
  */
 
 import { LogRecordExporter, ReadableLogRecord } from '@opentelemetry/sdk-logs';
-import { baggageUtils, getEnv } from '@opentelemetry/core';
 import {
   OTLPGRPCExporterConfigNode,
   OTLPGRPCExporterNodeBase,
-  validateAndNormalizeUrl,
-  DEFAULT_COLLECTOR_URL,
 } from '@opentelemetry/otlp-grpc-exporter-base';
 import {
   IExportLogsServiceResponse,
   ProtobufLogsSerializer,
 } from '@opentelemetry/otlp-transformer';
-import { VERSION } from './version';
-
-const USER_AGENT = {
-  'User-Agent': `OTel-OTLP-Exporter-JavaScript/${VERSION}`,
-};
 
 /**
  * OTLP Logs Exporter for Node
@@ -43,34 +35,12 @@ export class OTLPLogExporter
   implements LogRecordExporter
 {
   constructor(config: OTLPGRPCExporterConfigNode = {}) {
-    const signalSpecificMetadata = {
-      ...USER_AGENT,
-      ...baggageUtils.parseKeyPairsIntoRecord(
-        getEnv().OTEL_EXPORTER_OTLP_LOGS_HEADERS
-      ),
-    };
     super(
       config,
-      signalSpecificMetadata,
+      ProtobufLogsSerializer,
       'LogsExportService',
       '/opentelemetry.proto.collector.logs.v1.LogsService/Export',
-      ProtobufLogsSerializer
-    );
-  }
-
-  getDefaultUrl(config: OTLPGRPCExporterConfigNode) {
-    return validateAndNormalizeUrl(this.getUrlFromConfig(config));
-  }
-
-  getUrlFromConfig(config: OTLPGRPCExporterConfigNode): string {
-    if (typeof config.url === 'string') {
-      return config.url;
-    }
-
-    return (
-      getEnv().OTEL_EXPORTER_OTLP_LOGS_ENDPOINT ||
-      getEnv().OTEL_EXPORTER_OTLP_ENDPOINT ||
-      DEFAULT_COLLECTOR_URL
+      'LOGS'
     );
   }
 }

experimental/packages/exporter-logs-otlp-grpc/test/OTLPLogExporter.test.ts

@@ -37,7 +37,6 @@ import {
   IExportLogsServiceRequest,
   IResourceLogs,
 } from '@opentelemetry/otlp-transformer';
-import { VERSION } from '../src/version';
 
 const logsServiceProtoPath =
   'opentelemetry/proto/collector/logs/v1/logs_service.proto';
@@ -294,104 +293,9 @@ const testCollectorExporter = (params: TestParams) => {
         }, 500);
       });
     });
-    describe('Logs Exporter with compression', () => {
-      const envSource = process.env;
-      it('should return gzip compression algorithm on exporter', () => {
-        const credentials = useTLS
-          ? grpc.credentials.createSsl(
-              fs.readFileSync('./test/certs/ca.crt'),
-              fs.readFileSync('./test/certs/client.key'),
-              fs.readFileSync('./test/certs/client.crt')
-            )
-          : grpc.credentials.createInsecure();
-
-        envSource.OTEL_EXPORTER_OTLP_COMPRESSION = 'gzip';
-        collectorExporter = new OTLPLogExporter({
-          url: address,
-          credentials,
-          metadata: metadata,
-        });
-        assert.strictEqual(
-          collectorExporter.compression,
-          CompressionAlgorithm.GZIP
-        );
-        delete envSource.OTEL_EXPORTER_OTLP_COMPRESSION;
-      });
-    });
   });
 };
 
-describe('OTLPLogExporter - node (getDefaultUrl)', () => {
-  it('should default to localhost', done => {
-    const collectorExporter = new OTLPLogExporter({});
-    setTimeout(() => {
-      assert.strictEqual(collectorExporter['url'], 'localhost:4317');
-      done();
-    });
-  });
-  it('should keep the URL if included', done => {
-    const url = 'http://foo.bar.com';
-    const collectorExporter = new OTLPLogExporter({ url });
-    setTimeout(() => {
-      assert.strictEqual(collectorExporter['url'], 'foo.bar.com');
-      done();
-    });
-  });
-});
-
-describe('when configuring via environment', () => {
-  const envSource = process.env;
-
-  afterEach(function () {
-    // Ensure we don't pollute other tests if assertions fail
-    delete envSource.OTEL_EXPORTER_OTLP_ENDPOINT;
-    delete envSource.OTEL_EXPORTER_OTLP_LOGS_ENDPOINT;
-    delete envSource.OTEL_EXPORTER_OTLP_HEADERS;
-    delete envSource.OTEL_EXPORTER_OTLP_LOGS_HEADERS;
-    sinon.restore();
-  });
-
-  it('should use url defined in env', () => {
-    envSource.OTEL_EXPORTER_OTLP_ENDPOINT = 'http://foo.bar';
-    const collectorExporter = new OTLPLogExporter();
-    assert.strictEqual(collectorExporter.url, 'foo.bar');
-  });
-  it('should override global exporter url with signal url defined in env', () => {
-    envSource.OTEL_EXPORTER_OTLP_ENDPOINT = 'http://foo.bar';
-    envSource.OTEL_EXPORTER_OTLP_LOGS_ENDPOINT = 'http://foo.logs';
-    const collectorExporter = new OTLPLogExporter();
-    assert.strictEqual(collectorExporter.url, 'foo.logs');
-  });
-  it('should include user-agent header by default', () => {
-    const collectorExporter = new OTLPLogExporter();
-    const actualMetadata =
-      collectorExporter['_transport']['_parameters'].metadata();
-    assert.deepStrictEqual(actualMetadata.get('User-Agent'), [
-      `OTel-OTLP-Exporter-JavaScript/${VERSION}`,
-    ]);
-  });
-  it('should use headers defined via env', () => {
-    envSource.OTEL_EXPORTER_OTLP_HEADERS = 'foo=bar';
-    const collectorExporter = new OTLPLogExporter();
-    const actualMetadata =
-      collectorExporter['_transport']['_parameters'].metadata();
-    assert.deepStrictEqual(actualMetadata.get('foo'), ['bar']);
-  });
-  it('should not override hard-coded headers config with headers defined via env', () => {
-    const metadata = new grpc.Metadata();
-    metadata.set('foo', 'bar');
-    metadata.set('goo', 'lol');
-    envSource.OTEL_EXPORTER_OTLP_HEADERS = 'foo=jar,bar=foo';
-    envSource.OTEL_EXPORTER_OTLP_LOGS_HEADERS = 'foo=boo';
-    const collectorExporter = new OTLPLogExporter({ metadata });
-    const actualMetadata =
-      collectorExporter['_transport']['_parameters'].metadata();
-    assert.deepStrictEqual(actualMetadata.get('foo'), ['bar']);
-    assert.deepStrictEqual(actualMetadata.get('goo'), ['lol']);
-    assert.deepStrictEqual(actualMetadata.get('bar'), ['foo']);
-  });
-});
-
 testCollectorExporter({ useTLS: true });
 testCollectorExporter({ useTLS: false });
 testCollectorExporter({ metadata });

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

@@ -74,7 +74,7 @@
     "@babel/preset-env": "7.25.4",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/resources": "1.26.0",
-    "@types/mocha": "10.0.7",
+    "@types/mocha": "10.0.8",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "@types/webpack-env": "1.16.3",

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

@@ -23,8 +23,6 @@ import type { IExportLogsServiceResponse } from '@opentelemetry/otlp-transformer
 import { OTLPExporterBrowserBase } from '@opentelemetry/otlp-exporter-base';
 import { JsonLogsSerializer } from '@opentelemetry/otlp-transformer';
 
-import { getDefaultUrl } from '../config';
-
 /**
  * Collector Logs Exporter for Web
  */
@@ -38,11 +36,10 @@ export class OTLPLogExporter
         ...config,
       },
       JsonLogsSerializer,
-      'application/json'
+      {
+        'Content-Type': 'application/json',
+      },
+      'v1/logs'
     );
   }
-
-  getDefaultUrl(config: OTLPExporterConfigBase): string {
-    return getDefaultUrl(config);
-  }
 }