Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…

…o request-body-size

CHANGELOG.md

@@ -13,8 +13,14 @@ For semantic convention package changes, see the [semconv CHANGELOG](packages/se
 
 ### :rocket: (Enhancement)
 
+* feat(sdk-metrics, sdk-trace): add `mergeResourceWithDefaults` flag, which allows opting-out of resources getting merged with the default resource [#4617](https://github.com/open-telemetry/opentelemetry-js/pull/4617)
+  * default: `true` (no change in behavior)
+  * note: `false` will become the default behavior in the next major version in order to comply with [specification requirements](https://github.com/open-telemetry/opentelemetry-specification/blob/f3511a5ccda376dfd1de76dfa086fc9b35b54757/specification/resource/sdk.md?plain=1#L31-L36)
+
 ### :bug: (Bug Fix)
 
+* fix(sdk-metrics): await exports in `PeriodicExportingMetricReader` when async resource attributes have not yet settled [#5119](https://github.com/open-telemetry/opentelemetry-js/pull/5119/) @pichlermarc
+
 ### :books: (Refine Doc)
 
 ### :house: (Internal)

examples/esm-http-ts/package.json

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

examples/http/package.json

@@ -1,7 +1,7 @@
 {
   "name": "http-example",
   "private": true,
-  "version": "0.54.1",
+  "version": "0.54.2",
   "description": "Example of HTTP integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -32,8 +32,8 @@
     "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/exporter-jaeger": "1.27.0",
     "@opentelemetry/exporter-zipkin": "1.27.0",
-    "@opentelemetry/instrumentation": "0.54.1",
-    "@opentelemetry/instrumentation-http": "0.54.1",
+    "@opentelemetry/instrumentation": "0.54.2",
+    "@opentelemetry/instrumentation-http": "0.54.2",
     "@opentelemetry/resources": "1.27.0",
     "@opentelemetry/sdk-trace-base": "1.27.0",
     "@opentelemetry/sdk-trace-node": "1.27.0",

examples/https/package.json

@@ -1,7 +1,7 @@
 {
   "name": "https-example",
   "private": true,
-  "version": "0.54.1",
+  "version": "0.54.2",
   "description": "Example of HTTPs integration with OpenTelemetry",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -36,8 +36,8 @@
     "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/exporter-jaeger": "1.27.0",
     "@opentelemetry/exporter-zipkin": "1.27.0",
-    "@opentelemetry/instrumentation": "0.54.1",
-    "@opentelemetry/instrumentation-http": "0.54.1",
+    "@opentelemetry/instrumentation": "0.54.2",
+    "@opentelemetry/instrumentation-http": "0.54.2",
     "@opentelemetry/resources": "1.27.0",
     "@opentelemetry/sdk-trace-base": "1.27.0",
     "@opentelemetry/sdk-trace-node": "1.27.0",

examples/opentelemetry-web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "web-opentelemetry-example",
   "private": true,
-  "version": "0.54.1",
+  "version": "0.54.2",
   "description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser",
   "main": "index.js",
   "scripts": {
@@ -47,13 +47,13 @@
     "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/context-zone": "1.27.0",
     "@opentelemetry/core": "1.27.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.54.1",
-    "@opentelemetry/exporter-trace-otlp-http": "0.54.1",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.54.1",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.54.2",
+    "@opentelemetry/exporter-trace-otlp-http": "0.54.2",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.54.2",
     "@opentelemetry/exporter-zipkin": "1.27.0",
-    "@opentelemetry/instrumentation": "0.54.1",
-    "@opentelemetry/instrumentation-fetch": "0.54.1",
-    "@opentelemetry/instrumentation-xml-http-request": "0.54.1",
+    "@opentelemetry/instrumentation": "0.54.2",
+    "@opentelemetry/instrumentation-fetch": "0.54.2",
+    "@opentelemetry/instrumentation-xml-http-request": "0.54.2",
     "@opentelemetry/propagator-b3": "1.27.0",
     "@opentelemetry/sdk-metrics": "1.27.0",
     "@opentelemetry/sdk-trace-base": "1.27.0",

examples/otlp-exporter-node/package.json

@@ -1,7 +1,7 @@
 {
   "name": "example-otlp-exporter-node",
   "private": true,
-  "version": "0.54.1",
+  "version": "0.54.2",
   "description": "Example of using @opentelemetry/collector-exporter in Node.js",
   "main": "index.js",
   "scripts": {
@@ -31,12 +31,12 @@
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/core": "1.27.0",
-    "@opentelemetry/exporter-metrics-otlp-grpc": "0.54.1",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.54.1",
-    "@opentelemetry/exporter-metrics-otlp-proto": "0.54.1",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.54.1",
-    "@opentelemetry/exporter-trace-otlp-http": "0.54.1",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.54.1",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "0.54.2",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.54.2",
+    "@opentelemetry/exporter-metrics-otlp-proto": "0.54.2",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.54.2",
+    "@opentelemetry/exporter-trace-otlp-http": "0.54.2",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.54.2",
     "@opentelemetry/resources": "1.27.0",
     "@opentelemetry/sdk-metrics": "1.27.0",
     "@opentelemetry/sdk-trace-base": "1.27.0",

experimental/CHANGELOG.md

@@ -7,16 +7,65 @@ All notable changes to experimental packages in this project will be documented
 
 ### :boom: Breaking Change
 
+* feat(instrumentation-http)!: reduce public API surface by removing exports and making protected methods private [#5124](https://github.com/open-telemetry/opentelemetry-js/pull/5124) @pichlermarc
+  * (user-facing) the following exports were intended for internal use only and have been removed without replacement
+    * extractHostnameAndPort
+    * getAbsoluteUrl
+    * getIncomingRequestAttributes
+    * getIncomingRequestAttributesOnResponse
+    * getIncomingRequestMetricAttributes
+    * getIncomingRequestMetricAttributesOnResponse
+    * getOutgoingRequestAttributes
+    * getOutgoingRequestAttributesOnResponse
+    * getOutgoingRequestMetricAttributes
+    * getOutgoingRequestMetricAttributesOnResponse
+    * getRequestInfo
+    * headerCapture
+    * isCompressed
+    * isValidOptionsType
+    * parseResponseStatus
+    * satisfiesPattern
+    * setAttributesFromHttpKind
+    * setRequestContentLengthAttribute
+    * setResponseContentLengthAttribute
+    * setSpanWithError
+    * RequestSignature
+    * RequestFunction
+    * ParsedRequestOptions
+    * IgnoreMatcher
+    * Https
+    * HttpRequestArgs
+    * HttpCallbackOptional
+    * HttpCallback
+    * Http
+    * GetFunction
+    * Func
+    * Err
+
 ### :rocket: (Enhancement)
 
+* feat(sdk-node, sdk-logs): add `mergeResourceWithDefaults` flag, which allows opting-out of resources getting merged with the default resource [#4617](https://github.com/open-telemetry/opentelemetry-js/pull/4617)
+  * default: `true`
+  * note: `false` will become the default behavior in a future iteration in order to comply with [specification requirements](https://github.com/open-telemetry/opentelemetry-specification/blob/f3511a5ccda376dfd1de76dfa086fc9b35b54757/specification/resource/sdk.md?plain=1#L31-L36)
 * feat(instrumentation): Track request body size in XHR and Fetch instrumentations [#4706](https://github.com/open-telemetry/opentelemetry-js/pull/4706) @mustafahaddara
 
 ### :bug: (Bug Fix)
 
+* fix(instrumentation-http): Fix the `OTEL_SEMCONV_STABILITY_OPT_IN` variable check. Using `of` instead of `in` [#5137](https://github.com/open-telemetry/opentelemetry-js/pull/5137)
+
+* fix(instrumentation-http): drop url.parse in favor of URL constructor [#5091](https://github.com/open-telemetry/opentelemetry-js/pull/5091) @pichlermarc
+  * fixes a bug where using cyrillic characters in a client request string URL would throw an exception, whereas an un-instrumented client would accept the same input without throwing an exception
+
 ### :books: (Refine Doc)
 
 ### :house: (Internal)
 
+## 0.54.2
+
+### :bug: (Bug Fix)
+
+* fix(instrumentation): Fix wrapping ESM files with absolute path [#5094](https://github.com/open-telemetry/opentelemetry-js/pull/5094) @serkan-ozal
+
 ## 0.54.1
 
 ### :bug: (Bug Fix)

experimental/backwards-compatibility/node14/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node14",
-  "version": "0.54.1",
+  "version": "0.54.2",
   "private": true,
   "description": "Backwards compatibility app for node 14 types and the OpenTelemetry Node.js SDK",
   "main": "index.js",
@@ -10,7 +10,7 @@
     "align-api-deps": "node ../../../scripts/align-api-deps.js"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.54.1",
+    "@opentelemetry/sdk-node": "0.54.2",
     "@opentelemetry/sdk-trace-base": "1.27.0"
   },
   "devDependencies": {

experimental/backwards-compatibility/node16/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node16",
-  "version": "0.54.1",
+  "version": "0.54.2",
   "private": true,
   "description": "Backwards compatibility app for node 16 types and the OpenTelemetry Node.js SDK",
   "main": "index.js",
@@ -10,7 +10,7 @@
     "align-api-deps": "node ../../../scripts/align-api-deps.js"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.54.1",
+    "@opentelemetry/sdk-node": "0.54.2",
     "@opentelemetry/sdk-trace-base": "1.27.0"
   },
   "devDependencies": {

experimental/examples/events/package.json

@@ -1,17 +1,17 @@
 {
   "name": "events-example",
-  "version": "0.54.1",
+  "version": "0.54.2",
   "private": true,
   "scripts": {
     "start": "ts-node index.ts"
   },
   "dependencies": {
     "@opentelemetry/api": "^1.7.0",
-    "@opentelemetry/api-events": "0.54.1",
-    "@opentelemetry/api-logs": "0.54.1",
-    "@opentelemetry/exporter-logs-otlp-http": "0.54.1",
-    "@opentelemetry/sdk-events": "0.54.1",
-    "@opentelemetry/sdk-logs": "0.54.1"
+    "@opentelemetry/api-events": "0.54.2",
+    "@opentelemetry/api-logs": "0.54.2",
+    "@opentelemetry/exporter-logs-otlp-http": "0.54.2",
+    "@opentelemetry/sdk-events": "0.54.2",
+    "@opentelemetry/sdk-logs": "0.54.2"
   },
   "devDependencies": {
     "@types/node": "18.6.5",

experimental/examples/logs/package.json

@@ -1,15 +1,15 @@
 {
   "name": "logs-example",
-  "version": "0.54.1",
+  "version": "0.54.2",
   "private": true,
   "scripts": {
     "start": "ts-node index.ts",
     "align-api-deps": "node ../../../scripts/align-api-deps.js"
   },
   "dependencies": {
     "@opentelemetry/api": "^1.7.0",
-    "@opentelemetry/api-logs": "0.54.1",
-    "@opentelemetry/sdk-logs": "0.54.1"
+    "@opentelemetry/api-logs": "0.54.2",
+    "@opentelemetry/sdk-logs": "0.54.2"
   },
   "devDependencies": {
     "@types/node": "18.6.5",

experimental/examples/opencensus-shim/package.json

@@ -1,7 +1,7 @@
 {
   "name": "opencensus-shim",
   "private": true,
-  "version": "0.54.1",
+  "version": "0.54.2",
   "description": "Example of using @opentelemetry/shim-opencensus in Node.js",
   "main": "index.js",
   "scripts": {
@@ -32,13 +32,13 @@
     "@opencensus/instrumentation-http": "0.1.0",
     "@opencensus/nodejs-base": "0.1.0",
     "@opentelemetry/api": "1.9.0",
-    "@opentelemetry/exporter-prometheus": "0.54.1",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.54.1",
+    "@opentelemetry/exporter-prometheus": "0.54.2",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.54.2",
     "@opentelemetry/resources": "1.27.0",
     "@opentelemetry/sdk-metrics": "1.27.0",
     "@opentelemetry/sdk-trace-node": "1.27.0",
     "@opentelemetry/semantic-conventions": "1.27.0",
-    "@opentelemetry/shim-opencensus": "0.54.1"
+    "@opentelemetry/shim-opencensus": "0.54.2"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/examples/opencensus-shim"
 }

experimental/examples/prometheus/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prometheus-example",
-  "version": "0.54.1",
+  "version": "0.54.2",
   "private": true,
   "description": "Example of using @opentelemetry/sdk-metrics and @opentelemetry/exporter-prometheus",
   "main": "index.js",
@@ -12,7 +12,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/exporter-prometheus": "0.54.1",
+    "@opentelemetry/exporter-prometheus": "0.54.2",
     "@opentelemetry/sdk-metrics": "1.27.0"
   }
 }

experimental/packages/api-events/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/api-events",
-  "version": "0.54.1",
+  "version": "0.54.2",
   "description": "Public events API for OpenTelemetry",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
@@ -61,7 +61,7 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/api-logs": "0.54.1"
+    "@opentelemetry/api-logs": "0.54.2"
   },
   "devDependencies": {
     "@types/mocha": "10.0.8",

experimental/packages/api-logs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/api-logs",
-  "version": "0.54.1",
+  "version": "0.54.2",
   "description": "Public logs API for OpenTelemetry",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",

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

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-logs-otlp-grpc",
-  "version": "0.54.1",
+  "version": "0.54.2",
   "description": "OpenTelemetry Collector Exporter allows user to send collected log records to the OpenTelemetry Collector",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -51,8 +51,8 @@
   "devDependencies": {
     "@grpc/proto-loader": "^0.7.10",
     "@opentelemetry/api": "1.9.0",
-    "@opentelemetry/api-logs": "0.54.1",
-    "@opentelemetry/otlp-exporter-base": "0.54.1",
+    "@opentelemetry/api-logs": "0.54.2",
+    "@opentelemetry/otlp-exporter-base": "0.54.2",
     "@opentelemetry/resources": "1.27.0",
     "@types/mocha": "10.0.8",
     "@types/node": "18.6.5",
@@ -71,9 +71,9 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.7.1",
     "@opentelemetry/core": "1.27.0",
-    "@opentelemetry/otlp-grpc-exporter-base": "0.54.1",
-    "@opentelemetry/otlp-transformer": "0.54.1",
-    "@opentelemetry/sdk-logs": "0.54.1"
+    "@opentelemetry/otlp-grpc-exporter-base": "0.54.2",
+    "@opentelemetry/otlp-transformer": "0.54.2",
+    "@opentelemetry/sdk-logs": "0.54.2"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-grpc",
   "sideEffects": false

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

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-logs-otlp-http",
-  "version": "0.54.1",
+  "version": "0.54.2",
   "publishConfig": {
     "access": "public"
   },
@@ -101,10 +101,10 @@
     "@opentelemetry/api": "^1.3.0"
   },
   "dependencies": {
-    "@opentelemetry/api-logs": "0.54.1",
+    "@opentelemetry/api-logs": "0.54.2",
     "@opentelemetry/core": "1.27.0",
-    "@opentelemetry/otlp-exporter-base": "0.54.1",
-    "@opentelemetry/otlp-transformer": "0.54.1",
-    "@opentelemetry/sdk-logs": "0.54.1"
+    "@opentelemetry/otlp-exporter-base": "0.54.2",
+    "@opentelemetry/otlp-transformer": "0.54.2",
+    "@opentelemetry/sdk-logs": "0.54.2"
   }
 }