Merge branch 'main' into dup-browser-detector

Author: pichlermarc

.github/workflows/docs.yaml

@@ -1,8 +1,11 @@
 name: Deploy API Documentation
 
-on:
-  release:
-    types: [published]
+# 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: []
 
 jobs:
   build-and-deploy:

.github/workflows/unit-test.yml

@@ -17,6 +17,7 @@ jobs:
           - "20.6.0"
           - "20"
           - "22"
+          - "23"
     runs-on: ubuntu-latest
     env:
       NPM_CONFIG_UNSAFE_PERM: true
@@ -43,7 +44,8 @@ jobs:
       - run: npm install -g npm@latest
         if: ${{
           matrix.node_version == '20' ||
-          matrix.node_version == '22'
+          matrix.node_version == '22' ||
+          matrix.node_version == '23'
           }}
 
       - name: Bootstrap
@@ -52,8 +54,15 @@ jobs:
       - name: Build 🔧
         run: npm run compile
 
-      - name: Unit tests
-        run: npm run test
+      - run: npm test
+        if: ${{ matrix.node_version != '23' }}
+      # Node.js 23 type stripping conflicts with mocha usage of ts-node.
+      # See https://github.com/open-telemetry/opentelemetry-js/issues/5415
+      - run: npm test
+        env:
+          NODE_OPTIONS: '--no-experimental-strip-types'
+        if: ${{ matrix.node_version == '23' }}
+
       - name: Report Coverage
         uses: codecov/codecov-action@v5
         env:

CHANGELOG.md

@@ -81,17 +81,31 @@ For semantic convention package changes, see the [semconv CHANGELOG](packages/se
 * feat(core)!: remove TracesSamplerValues from exports [#5406](https://github.com/open-telemetry/opentelemetry-js/pull/5406) @pichlermarc
   * (user-facing): TracesSamplerValues was only consumed internally and has been removed from exports without replacement
 * chore(resources)!: Remove deprecated duplicate browser detector from `@opentelemetry/resource` in favor of `@opentelemetry/opentelemetry-browser-detector` [#5420](https://github.com/open-telemetry/opentelemetry-js/pull/5420)
+* feat(core)!: remove unused and obsolete functions and types [#5444](https://github.com/open-telemetry/opentelemetry-js/pull/5444) @pichlermarc
+  * (user-facing): `VERSION` was an internal constant that was unintentionally exported. It has been removed without replacement.
+  * (user-facing): `isWrapped` has been removed in favor of `isWrapped` from `@opentelemetry/instrumentation`
+  * (user-facing): `ShimWrapped` has been removed in favor of `ShimWrapped` from `@opentelemetry/instrumentation`
+  * (user-facing): `hexToBase64` was a utility function that is not used by the SDK anymore. It has been removed without replacement.
+  * (user-facing): `hexToBinary` was a utility function that now internal to `@opentelemetry/otlp-tranformer`. It has been removed without replacement.
+  * (user-facing): `baggageUtils.getKeyParis` was an internal utility function that was unintentionally exported. It has been removed without replacement.
+  * (user-facing): `baggageUtils.serializeKeyPairs` was an internal utility function that was unintentionally exported. It has been removed without replacement.
+  * (user-facing): `baggageUtils.parseKeyPairsIntoRecord,` has been removed in favor of `parseKeyPairsIntoRecord`
+  * (user-facing): `baggageUtils.parsePairKeyValue` was an internal utility function that was unintentionally exported. It has been removed without replacement.
+  * (user-facing): `TimeOriginLegacy` has been removed without replacement.
+  * (user-facing): `isAttributeKey` was an internal utility function that was unintentionally exported. It has been removed without replacement.
 
 ### :rocket: (Enhancement)
 
 * feat(sdk-trace-web): do not throw when passing extra options [#5357](https://github.com/open-telemetry/opentelemetry-js/pull/5357) @pichlermarc
   * `WebTracerProvider` constructor now does not throw anymore when `contextManager` or `propagator` are passed as extra options to the constructor
 * feat(sdk-trace-base): add stack trace warning to debug instrumentation [#5363](https://github.com/open-telemetry/opentelemetry-js/pull/5363) @neilfordyce
+* feat(core): add more scalable replacements for getEnv(), getEnvWithoutDefaults() [#5443](https://github.com/open-telemetry/opentelemetry-js/pull/5443) @pichlermarc
 
 ### :bug: (Bug Fix)
 
 * 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)
 
@@ -105,6 +119,7 @@ For semantic convention package changes, see the [semconv CHANGELOG](packages/se
 * chore(selenium-tests): remove internal selenium-tests/ package, it wasn't being used @trentm
 * chore: update typescript `module` compiler option to `node16`. [#5347](https://github.com/open-telemetry/opentelemetry-js/pull/5347) @david-luna
 * feat(opentelemetry-instrumentation): replace `semver` package with internal semantic versioning check implementation to get rid of `semver` package initialization overhead especially in the AWS Lambda environment during coldstart [#5305](https://github.com/open-telemetry/opentelemetry-js/pull/5305) @serkan-ozal
+* chore: unpin `@opentelemetry/semantic-conventions` dep to allow better de-duplication in installs [#5439](https://github.com/open-telemetry/opentelemetry-js/pull/5439) @trentm
 
 ## 1.30.0
 

README.md

@@ -239,27 +239,54 @@ We have a weekly SIG meeting! See the [community page](https://github.com/open-t
 - [Marc Pichler](https://github.com/pichlermarc), Dynatrace
 - [Trent Mick](https://github.com/trentm), Elastic
 
-*Find more about the maintainer role in the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).*
+*Find more about the maintainer role in the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer).*
 
 #### Approvers ([@open-telemetry/javascript-approvers](https://github.com/orgs/open-telemetry/teams/javascript-approvers))
 
 - [David Luna](https://github.com/david-luna), Elastic
 - [Hector Hernandez](https://github.com/hectorhdzg), Microsoft
 - [Martin Kuba](https://github.com/martinkuba), Lightstep
+- [Marylia Gutierrez](https://github.com/maryliag), Grafana Labs
 - [Matthew Wear](https://github.com/mwear), LightStep
 - [Naseem K. Ullah](https://github.com/naseemkullah), Transit
 - [Neville Wylie](https://github.com/MSNev), Microsoft
 - [Purvi Kanal](https://github.com/pkanal), Honeycomb
 - [Svetlana Brennan](https://github.com/svetlanabrennan), New Relic
-- [Marylia Gutierrez](https://github.com/maryliag), Grafana Labs
 
-*Find more about the approver role in the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).*
+*Find more about the approver role in the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver).*
+
+#### Triagers ([@open-telemetry/javascript-triagers](https://github.com/orgs/open-telemetry/teams/javascript-triagers))
+
+Members of this team have triager permissions for opentelemetry-js.git and opentelemetry-js-contrib.git.
+
+- (none currently)
+
+*Find more about the triager role in the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#triager).*
+
+#### Contrib Triagers ([@open-telemetry/javascript-contrib-triagers](https://github.com/orgs/open-telemetry/teams/javascript-contrib-triagers))
 
-#### Triager ([@open-telemetry/javascript-triagers](https://github.com/orgs/open-telemetry/teams/javascript-triagers))
+Members of this team have triager permissions for opentelemetry-js-contrib.git.
+Typically, members of this are [component owners](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/.github/component_owners.yml) of one or more packages in the contrib repo.
 
-- N/A
+- [Aaron Abbott](https://github.com/aabmass), Google
+- [Abhinav Mathur](https://github.com/abhee11), AppDynamics
+- [Bartlomiej Obecny](https://github.com/obecny)
+- [Daniel Li](https://github.com/d4nyll)
+- [Florencia Acosta](https://github.com/facostaembrace), Embrace
+- [Jackson Weber](https://github.com/JacksonWeber), Microsoft
+- [Jaryk](https://github.com/Ugzuzg), Volvo Cars
+- [Jonathan Lee](https://github.com/jj22ee)
+- [Jonathan Munz](https://github.com/jpmunz), Embrace
+- [kirrg001](https://github.com/kirrg001), Instana
+- [MartenH](https://github.com/mhennoch), Splunk
+- [Mike Goldsmith](https://github.com/MikeGoldsmith), Honeycomb
+- [Motti](https://github.com/mottibec)
+- [Punya Biswal](https://github.com/punya), Google
+- [Siim Kallas](https://github.com/seemk), Splunk
+- [Trivikram Kamat](https://github.com/trivikr), AWS
+- [t2t2](https://github.com/t2t2), Splunk
 
-*Find more about the triager role in the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#triager).*
+*Find more about the triager role in the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#triager).*
 
 #### Emeriti
 
@@ -276,7 +303,7 @@ We have a weekly SIG meeting! See the [community page](https://github.com/open-t
 - [Gerhard Stöbich](https://github.com/Flarna), Dynatrace, Approver
 - [Haddas Bronfman](https://github.com/haddasbronfman), Cisco, Approver
 
-*Find more about the emeritus role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#emeritus-maintainerapprovertriager).*
+*Find more about the emeritus role in [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager).*
 
 #### Thanks to all the people who already contributed
 

api/package.json

@@ -31,9 +31,6 @@
     "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
     "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",
-    "docs:deploy": "gh-pages --dist docs/out",
-    "docs:test": "linkinator docs/out --silent && linkinator docs/*.md *.md --markdown --silent",
     "lint:fix": "eslint . --ext .ts --fix",
     "lint": "eslint . --ext .ts",
     "test:browser": "karma start --single-run",

api/src/experimental/index.ts

@@ -13,5 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/**
+ * Any exports here may change at any time and without warning
+ * @module @opentelemetry/api/experimental
+ */
+
 export { wrapTracer, SugaredTracer } from './trace/SugaredTracer';
 export { SugaredSpanOptions } from './trace/SugaredOptions';

api/src/index.ts

@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+/**
+ * @module @opentelemetry/api
+ */
+
 export { BaggageEntry, BaggageEntryMetadata, Baggage } from './baggage/types';
 export { baggageEntryMetadataFromString } from './baggage/utils';
 export { Exception } from './common/Exception';

api/typedoc.json

@@ -0,0 +1,6 @@
+{
+  "entryPoints": [
+    "src/index.ts",
+    "src/experimental/index.ts"
+  ]
+}

doc/metrics.md

@@ -521,7 +521,7 @@ a new http server on port 9464. You can now access the metrics at the endpoint
 <http://localhost:9464/metrics>. This is the URL that can be scraped by Prometheus so it can consumed the metrics collected by OpenTelemetry in your application.
 
 More information about Prometheus and how to configure can be found at:
-[https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config](Prometheus Scraping Config)
+[Prometheus Scraping Config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config)
 
 For a fully functioning code example for using this exporter, please have a look
 at: <https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/examples/prometheus>

examples/esm-http-ts/package.json

@@ -38,6 +38,6 @@
     "@opentelemetry/resources": "1.30.0",
     "@opentelemetry/sdk-trace-base": "1.30.0",
     "@opentelemetry/sdk-trace-node": "1.30.0",
-    "@opentelemetry/semantic-conventions": "1.28.0"
+    "@opentelemetry/semantic-conventions": "^1.29.0"
   }
 }

examples/http/package.json

@@ -37,7 +37,7 @@
     "@opentelemetry/resources": "1.30.0",
     "@opentelemetry/sdk-trace-base": "1.30.0",
     "@opentelemetry/sdk-trace-node": "1.30.0",
-    "@opentelemetry/semantic-conventions": "1.28.0"
+    "@opentelemetry/semantic-conventions": "^1.29.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http",
   "devDependencies": {

examples/https/package.json

@@ -41,7 +41,7 @@
     "@opentelemetry/resources": "1.30.0",
     "@opentelemetry/sdk-trace-base": "1.30.0",
     "@opentelemetry/sdk-trace-node": "1.30.0",
-    "@opentelemetry/semantic-conventions": "1.28.0"
+    "@opentelemetry/semantic-conventions": "^1.29.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https",
   "devDependencies": {

examples/opentelemetry-web/package.json

@@ -58,7 +58,7 @@
     "@opentelemetry/sdk-metrics": "1.30.0",
     "@opentelemetry/sdk-trace-base": "1.30.0",
     "@opentelemetry/sdk-trace-web": "1.30.0",
-    "@opentelemetry/semantic-conventions": "1.28.0"
+    "@opentelemetry/semantic-conventions": "^1.29.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web"
 }

examples/otlp-exporter-node/package.json

@@ -40,7 +40,7 @@
     "@opentelemetry/resources": "1.30.0",
     "@opentelemetry/sdk-metrics": "1.30.0",
     "@opentelemetry/sdk-trace-base": "1.30.0",
-    "@opentelemetry/semantic-conventions": "1.28.0"
+    "@opentelemetry/semantic-conventions": "^1.29.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
 }

experimental/CHANGELOG.md

@@ -27,6 +27,7 @@ All notable changes to experimental packages in this project will be documented
 * fix(instrumentation-grpc): monitor error events with events.errorMonitor [#5369](https://github.com/open-telemetry/opentelemetry-js/pull/5369) @cjihrig
 * fix(exporter-metrics-otlp-http): browser OTLPMetricExporter was not passing config to OTLPMetricExporterBase super class [#5331](https://github.com/open-telemetry/opentelemetry-js/pull/5331) @trentm
 * fix(instrumentation-fetch, instrumentation-xhr): Ignore network events with zero-timings [#5332](https://github.com/open-telemetry/opentelemetry-js/pull/5332) @chancancode
+* fix(exporter-logs/trace-otlp-grpc): fix error for missing dependency otlp-exporter-base [#5412](https://github.com/open-telemetry/opentelemetry-js/pull/5412) @JamieDanielson
 
 ### :books: (Refine Doc)
 
@@ -36,6 +37,7 @@ All notable changes to experimental packages in this project will be documented
 * refactor(otlp-exporter-base): remove unnecessary isNaN() checks [#5374](https://github.com/open-telemetry/opentelemetry-js/pull/5374) @cjihrig
 * refactor(exporter-prometheus): remove unnecessary isNaN() check [#5377](https://github.com/open-telemetry/opentelemetry-js/pull/5377) @cjihrig
 * refactor(sdk-node): move code to auto-instantiate propagators into utils [#5355](https://github.com/open-telemetry/opentelemetry-js/pull/5355) @pichlermarc
+* chore: unpin `@opentelemetry/semantic-conventions` dep to allow better de-duplication in installs [#5439](https://github.com/open-telemetry/opentelemetry-js/pull/5439) @trentm
 
 ## 0.57.0
 

experimental/examples/opencensus-shim/package.json

@@ -37,7 +37,7 @@
     "@opentelemetry/resources": "1.30.0",
     "@opentelemetry/sdk-metrics": "1.30.0",
     "@opentelemetry/sdk-trace-node": "1.30.0",
-    "@opentelemetry/semantic-conventions": "1.28.0",
+    "@opentelemetry/semantic-conventions": "^1.29.0",
     "@opentelemetry/shim-opencensus": "0.57.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/examples/opencensus-shim"

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

@@ -51,7 +51,6 @@
     "@grpc/proto-loader": "^0.7.10",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/api-logs": "0.57.0",
-    "@opentelemetry/otlp-exporter-base": "0.57.0",
     "@opentelemetry/resources": "1.30.0",
     "@types/mocha": "10.0.10",
     "@types/node": "18.6.5",
@@ -70,6 +69,7 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.7.1",
     "@opentelemetry/core": "1.30.0",
+    "@opentelemetry/otlp-exporter-base": "0.57.0",
     "@opentelemetry/otlp-grpc-exporter-base": "0.57.0",
     "@opentelemetry/otlp-transformer": "0.57.0",
     "@opentelemetry/sdk-logs": "0.57.0"

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

@@ -14,7 +14,4 @@
  * limitations under the License.
  */
 
-/* eslint no-restricted-syntax: ["warn", "ExportAllDeclaration"] --
- * TODO: Replace wildcard export with named exports before next major version
- */
 export { OTLPLogExporter } from './OTLPLogExporter';

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

@@ -49,7 +49,6 @@
   "devDependencies": {
     "@grpc/proto-loader": "^0.7.10",
     "@opentelemetry/api": "1.9.0",
-    "@opentelemetry/otlp-exporter-base": "0.57.0",
     "@types/mocha": "10.0.10",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
@@ -67,6 +66,7 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.7.1",
     "@opentelemetry/core": "1.30.0",
+    "@opentelemetry/otlp-exporter-base": "0.57.0",
     "@opentelemetry/otlp-grpc-exporter-base": "0.57.0",
     "@opentelemetry/otlp-transformer": "0.57.0",
     "@opentelemetry/resources": "1.30.0",

experimental/packages/opentelemetry-exporter-prometheus/package.json

@@ -44,7 +44,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "1.9.0",
-    "@opentelemetry/semantic-conventions": "1.28.0",
+    "@opentelemetry/semantic-conventions": "^1.29.0",
     "@types/mocha": "10.0.10",
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",

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

@@ -90,7 +90,7 @@
     "@opentelemetry/core": "1.30.0",
     "@opentelemetry/instrumentation": "0.57.0",
     "@opentelemetry/sdk-trace-web": "1.30.0",
-    "@opentelemetry/semantic-conventions": "1.28.0"
+    "@opentelemetry/semantic-conventions": "^1.29.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-fetch",
   "sideEffects": false,

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

@@ -72,7 +72,7 @@
   },
   "dependencies": {
     "@opentelemetry/instrumentation": "0.57.0",
-    "@opentelemetry/semantic-conventions": "1.28.0"
+    "@opentelemetry/semantic-conventions": "^1.29.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-grpc",
   "sideEffects": false

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

@@ -102,7 +102,7 @@ export function patchResponseMetadataEvent(
   call: EventEmitter,
   metadataCapture: metadataCaptureType
 ) {
-  call.on('metadata', (responseMetadata: any) => {
+  call.on('metadata', (responseMetadata: Metadata) => {
     metadataCapture.client.captureResponseMetadata(span, responseMetadata);
   });
 }

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

@@ -126,22 +126,22 @@ export class GrpcInstrumentation extends InstrumentationBase<GrpcInstrumentation
           this._wrap(
             moduleExports.Client.prototype,
             'makeUnaryRequest',
-            this._patchClientRequestMethod(moduleExports, false) as any
+            this._patchClientRequestMethod(moduleExports, false)
           );
           this._wrap(
             moduleExports.Client.prototype,
             'makeClientStreamRequest',
-            this._patchClientRequestMethod(moduleExports, false) as any
+            this._patchClientRequestMethod(moduleExports, false)
           );
           this._wrap(
             moduleExports.Client.prototype,
             'makeServerStreamRequest',
-            this._patchClientRequestMethod(moduleExports, true) as any
+            this._patchClientRequestMethod(moduleExports, true)
           );
           this._wrap(
             moduleExports.Client.prototype,
             'makeBidiStreamRequest',
-            this._patchClientRequestMethod(moduleExports, true) as any
+            this._patchClientRequestMethod(moduleExports, true)
           );
           return moduleExports;
         },