Merge branch 'main' into patch-1

CHANGELOG.md

@@ -17,6 +17,13 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 
 ### :house: (Internal)
 
+## 1.15.1
+
+### :bug: (Bug Fix)
+
+* Revert "feat(minification): Add noEmitHelpers, importHelpers and tslib as a dependency (#3914)"
+  [#4011](https://github.com/open-telemetry/opentelemetry-js/pull/4011) @dyladan
+
 ## 1.15.0
 
 ### :bug: (Bug Fix)

api/package.json

@@ -87,9 +87,6 @@
     "unionfs": "4.5.1",
     "webpack": "4.46.0"
   },
-  "dependencies": {
-    "tslib": "^2.3.1"
-  },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/api",
   "sideEffects": false
 }

examples/esm-http-ts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "esm-http-ts",
   "private": true,
-  "version": "0.41.0",
+  "version": "0.41.1",
   "description": "Example of HTTP integration with OpenTelemetry using ESM and TypeScript",
   "main": "build/index.js",
   "type": "module",
@@ -31,12 +31,12 @@
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/",
   "dependencies": {
     "@opentelemetry/api": "1.4.1",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.41.0",
-    "@opentelemetry/instrumentation": "0.41.0",
-    "@opentelemetry/instrumentation-http": "0.41.0",
-    "@opentelemetry/resources": "1.15.0",
-    "@opentelemetry/sdk-trace-base": "1.15.0",
-    "@opentelemetry/sdk-trace-node": "1.15.0",
-    "@opentelemetry/semantic-conventions": "1.15.0"
+    "@opentelemetry/exporter-trace-otlp-proto": "0.41.1",
+    "@opentelemetry/instrumentation": "0.41.1",
+    "@opentelemetry/instrumentation-http": "0.41.1",
+    "@opentelemetry/resources": "1.15.1",
+    "@opentelemetry/sdk-trace-base": "1.15.1",
+    "@opentelemetry/sdk-trace-node": "1.15.1",
+    "@opentelemetry/semantic-conventions": "1.15.1"
   }
 }

examples/esm-http-ts/tsconfig.json

@@ -18,8 +18,7 @@
     "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
 
     /* Completeness */
-    "skipLibCheck": true /* Skip type checking all .d.ts files. */,
-    "importHelpers": true
+    "skipLibCheck": true /* Skip type checking all .d.ts files. */
   },
   "include": ["**/*.ts", "**/*.js", "*.config.js"],
   "exclude": ["node_modules"]

examples/http/package.json

@@ -1,7 +1,7 @@
 {
   "name": "http-example",
   "private": true,
-  "version": "0.41.0",
+  "version": "0.41.1",
   "description": "Example of HTTP integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -29,14 +29,14 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/exporter-jaeger": "1.15.0",
-    "@opentelemetry/exporter-zipkin": "1.15.0",
-    "@opentelemetry/instrumentation": "0.41.0",
-    "@opentelemetry/instrumentation-http": "0.41.0",
-    "@opentelemetry/resources": "1.15.0",
-    "@opentelemetry/sdk-trace-base": "1.15.0",
-    "@opentelemetry/sdk-trace-node": "1.15.0",
-    "@opentelemetry/semantic-conventions": "1.15.0"
+    "@opentelemetry/exporter-jaeger": "1.15.1",
+    "@opentelemetry/exporter-zipkin": "1.15.1",
+    "@opentelemetry/instrumentation": "0.41.1",
+    "@opentelemetry/instrumentation-http": "0.41.1",
+    "@opentelemetry/resources": "1.15.1",
+    "@opentelemetry/sdk-trace-base": "1.15.1",
+    "@opentelemetry/sdk-trace-node": "1.15.1",
+    "@opentelemetry/semantic-conventions": "1.15.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http",
   "devDependencies": {

examples/https/package.json

@@ -1,7 +1,7 @@
 {
   "name": "https-example",
   "private": true,
-  "version": "0.41.0",
+  "version": "0.41.1",
   "description": "Example of HTTPs integration with OpenTelemetry",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -33,14 +33,14 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/exporter-jaeger": "1.15.0",
-    "@opentelemetry/exporter-zipkin": "1.15.0",
-    "@opentelemetry/instrumentation": "0.41.0",
-    "@opentelemetry/instrumentation-http": "0.41.0",
-    "@opentelemetry/resources": "1.15.0",
-    "@opentelemetry/sdk-trace-base": "1.15.0",
-    "@opentelemetry/sdk-trace-node": "1.15.0",
-    "@opentelemetry/semantic-conventions": "1.15.0"
+    "@opentelemetry/exporter-jaeger": "1.15.1",
+    "@opentelemetry/exporter-zipkin": "1.15.1",
+    "@opentelemetry/instrumentation": "0.41.1",
+    "@opentelemetry/instrumentation-http": "0.41.1",
+    "@opentelemetry/resources": "1.15.1",
+    "@opentelemetry/sdk-trace-base": "1.15.1",
+    "@opentelemetry/sdk-trace-node": "1.15.1",
+    "@opentelemetry/semantic-conventions": "1.15.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https",
   "devDependencies": {

examples/opentelemetry-web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "web-opentelemetry-example",
   "private": true,
-  "version": "0.41.0",
+  "version": "0.41.1",
   "description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser",
   "main": "index.js",
   "scripts": {
@@ -43,21 +43,20 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/context-zone": "1.15.0",
-    "@opentelemetry/core": "1.15.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.41.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.41.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.41.0",
-    "@opentelemetry/exporter-zipkin": "1.15.0",
-    "@opentelemetry/instrumentation": "0.41.0",
-    "@opentelemetry/instrumentation-fetch": "0.41.0",
-    "@opentelemetry/instrumentation-xml-http-request": "0.41.0",
-    "@opentelemetry/propagator-b3": "1.15.0",
-    "@opentelemetry/sdk-metrics": "1.15.0",
-    "@opentelemetry/sdk-trace-base": "1.15.0",
-    "@opentelemetry/sdk-trace-web": "1.15.0",
-    "@opentelemetry/semantic-conventions": "1.15.0",
-    "tslib": "^2.3.1"
+    "@opentelemetry/context-zone": "1.15.1",
+    "@opentelemetry/core": "1.15.1",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.41.1",
+    "@opentelemetry/exporter-trace-otlp-http": "0.41.1",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.41.1",
+    "@opentelemetry/exporter-zipkin": "1.15.1",
+    "@opentelemetry/instrumentation": "0.41.1",
+    "@opentelemetry/instrumentation-fetch": "0.41.1",
+    "@opentelemetry/instrumentation-xml-http-request": "0.41.1",
+    "@opentelemetry/propagator-b3": "1.15.1",
+    "@opentelemetry/sdk-metrics": "1.15.1",
+    "@opentelemetry/sdk-trace-base": "1.15.1",
+    "@opentelemetry/sdk-trace-web": "1.15.1",
+    "@opentelemetry/semantic-conventions": "1.15.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web"
 }

examples/otlp-exporter-node/package.json

@@ -1,7 +1,7 @@
 {
   "name": "example-otlp-exporter-node",
   "private": true,
-  "version": "0.41.0",
+  "version": "0.41.1",
   "description": "Example of using @opentelemetry/collector-exporter in Node.js",
   "main": "index.js",
   "scripts": {
@@ -29,17 +29,17 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/core": "1.15.0",
-    "@opentelemetry/exporter-metrics-otlp-grpc": "0.41.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.41.0",
-    "@opentelemetry/exporter-metrics-otlp-proto": "0.41.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.41.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.41.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.41.0",
-    "@opentelemetry/resources": "1.15.0",
-    "@opentelemetry/sdk-metrics": "1.15.0",
-    "@opentelemetry/sdk-trace-base": "1.15.0",
-    "@opentelemetry/semantic-conventions": "1.15.0"
+    "@opentelemetry/core": "1.15.1",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "0.41.1",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.41.1",
+    "@opentelemetry/exporter-metrics-otlp-proto": "0.41.1",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.41.1",
+    "@opentelemetry/exporter-trace-otlp-http": "0.41.1",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.41.1",
+    "@opentelemetry/resources": "1.15.1",
+    "@opentelemetry/sdk-metrics": "1.15.1",
+    "@opentelemetry/sdk-trace-base": "1.15.1",
+    "@opentelemetry/semantic-conventions": "1.15.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
 }

experimental/CHANGELOG.md

@@ -6,20 +6,33 @@ All notable changes to experimental packages in this project will be documented
 
 ### :books: (Refine Doc)
 
-* docs(sdk-metrics): add example of exponential histogram metric [#3855](https://github.com/open-telemetry/opentelemetry-js/pull/3855) @JamieDanielson
-
 ### :boom: Breaking Change
 
 ### :rocket: (Enhancement)
 
-* feat(sdk-node): logs support added [#3969](https://github.com/open-telemetry/opentelemetry-js/pull/3969) @psk001
+### :bug: (Bug Fix)
 
 ### :bug: (Bug Fix)
 
 ### :books: (Refine Doc)
 
 ### :house: (Internal)
 
+## 0.41.1
+
+### :books: (Refine Doc)
+
+* docs(sdk-metrics): add example of exponential histogram metric [#3855](https://github.com/open-telemetry/opentelemetry-js/pull/3855) @JamieDanielson
+
+### :rocket: (Enhancement)
+
+* feat(sdk-node): logs support added [#3969](https://github.com/open-telemetry/opentelemetry-js/pull/3969) @psk001
+
+### :bug: (Bug Fix)
+
+* Revert "feat(minification): Add noEmitHelpers, importHelpers and tslib as a dependency (#3914)"
+  [#4011](https://github.com/open-telemetry/opentelemetry-js/pull/4011) @dyladan
+
 ## 0.41.0
 
 ### :boom: Breaking Change

experimental/backwards-compatibility/node14/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node14",
-  "version": "0.41.0",
+  "version": "0.41.1",
   "private": true,
   "description": "Backwards compatibility app for node 14 types and the OpenTelemetry Node.js SDK",
   "main": "index.js",
@@ -9,9 +9,8 @@
     "peer-api-check": "node ../../../scripts/peer-api-check.js"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.41.0",
-    "@opentelemetry/sdk-trace-base": "1.15.0",
-    "tslib": "^2.3.1"
+    "@opentelemetry/sdk-node": "0.41.1",
+    "@opentelemetry/sdk-trace-base": "1.15.1"
   },
   "devDependencies": {
     "@types/node": "14.18.25",

experimental/backwards-compatibility/node16/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node16",
-  "version": "0.41.0",
+  "version": "0.41.1",
   "private": true,
   "description": "Backwards compatibility app for node 16 types and the OpenTelemetry Node.js SDK",
   "main": "index.js",
@@ -9,9 +9,8 @@
     "peer-api-check": "node ../../../scripts/peer-api-check.js"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.41.0",
-    "@opentelemetry/sdk-trace-base": "1.15.0",
-    "tslib": "^2.3.1"
+    "@opentelemetry/sdk-node": "0.41.1",
+    "@opentelemetry/sdk-trace-base": "1.15.1"
   },
   "devDependencies": {
     "@types/node": "16.11.52",

experimental/examples/opencensus-shim/package.json

@@ -1,7 +1,7 @@
 {
   "name": "opencensus-shim",
   "private": true,
-  "version": "0.41.0",
+  "version": "0.41.1",
   "description": "Example of using @opentelemetry/shim-opencensus in Node.js",
   "main": "index.js",
   "scripts": {
@@ -30,11 +30,11 @@
     "@opencensus/core": "0.1.0",
     "@opencensus/nodejs-base": "0.1.0",
     "@opentelemetry/api": "1.4.1",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.41.0",
-    "@opentelemetry/resources": "1.15.0",
-    "@opentelemetry/sdk-trace-node": "1.15.0",
-    "@opentelemetry/semantic-conventions": "1.15.0",
-    "@opentelemetry/shim-opencensus": "0.41.0"
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.41.1",
+    "@opentelemetry/resources": "1.15.1",
+    "@opentelemetry/sdk-trace-node": "1.15.1",
+    "@opentelemetry/semantic-conventions": "1.15.1",
+    "@opentelemetry/shim-opencensus": "0.41.1"
   },
   "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.41.0",
+  "version": "0.41.1",
   "private": true,
   "description": "Example of using @opentelemetry/sdk-metrics and @opentelemetry/exporter-prometheus",
   "main": "index.js",
@@ -11,7 +11,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/exporter-prometheus": "0.41.0",
-    "@opentelemetry/sdk-metrics": "1.15.0"
+    "@opentelemetry/exporter-prometheus": "0.41.1",
+    "@opentelemetry/sdk-metrics": "1.15.1"
   }
 }

experimental/packages/api-events/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/api-events",
-  "version": "0.41.0",
+  "version": "0.41.1",
   "description": "Public events API for OpenTelemetry",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
@@ -61,16 +61,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.0.0",
-    "tslib": "^2.3.1"
+    "@opentelemetry/api": "^1.0.0"
   },
   "devDependencies": {
     "@types/mocha": "10.0.1",
     "@types/node": "18.6.5",
     "@types/webpack-env": "1.16.3",
+    "babel-plugin-istanbul": "6.1.1",
     "codecov": "3.8.3",
     "cross-var": "1.1.0",
-    "babel-plugin-istanbul": "6.1.1",
     "karma": "6.4.2",
     "karma-chrome-launcher": "3.1.0",
     "karma-coverage": "2.2.1",

experimental/packages/api-logs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/api-logs",
-  "version": "0.41.0",
+  "version": "0.41.1",
   "description": "Public logs API for OpenTelemetry",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
@@ -61,16 +61,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.0.0",
-    "tslib": "^2.3.1"
+    "@opentelemetry/api": "^1.0.0"
   },
   "devDependencies": {
     "@types/mocha": "10.0.1",
     "@types/node": "18.6.5",
     "@types/webpack-env": "1.16.3",
+    "babel-plugin-istanbul": "6.1.1",
     "codecov": "3.8.3",
     "cross-var": "1.1.0",
-    "babel-plugin-istanbul": "6.1.1",
     "karma": "6.4.2",
     "karma-chrome-launcher": "3.1.0",
     "karma-coverage": "2.2.1",