Merge pull request open-telemetry#124 from opentelemetrybot/opentelem…

…etrybot/merge-main

[AutoMerge][Main] Merging staged change(s) to main

auto-merge/contrib/tsconfig.base.esm.json

@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.es5.json",
+  "extends": "./tsconfig.base.es5.json",
   "compilerOptions": {
     "module": "ES6",
     "moduleResolution": "node"

auto-merge/contrib/tsconfig.base.json

@@ -5,6 +5,7 @@
     "declaration": true,
     "declarationMap": true,
     "forceConsistentCasingInFileNames": true,
+    "inlineSources": true,
     "module": "commonjs",
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,

auto-merge/js/CHANGELOG.md

@@ -11,14 +11,18 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 
 ### :rocket: (Enhancement)
 
-* feat(SpanExpoter): Add optional forceFlush to SpanExporter interface [#3753](https://github.com/open-telemetry/opentelemetry-js/pull/3753/) @sgracias1 @JacksonWeber
-
 ### :bug: (Bug Fix)
 
 ### :books: (Refine Doc)
 
 ### :house: (Internal)
 
+## 1.14.0
+
+### :rocket: (Enhancement)
+
+* feat(SpanExporter): Add optional forceFlush to SpanExporter interface [#3753](https://github.com/open-telemetry/opentelemetry-js/pull/3753/) @sgracias1 @JacksonWeber
+
 ## 1.13.0
 
 ### :rocket: (Enhancement)

auto-merge/js/examples/esm-http-ts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "esm-http-ts",
   "private": true,
-  "version": "0.38.0",
+  "version": "0.40.0",
   "description": "Example of HTTP integration with OpenTelemetry using ESM and TypeScript",
   "main": "build/index.js",
   "type": "module",

auto-merge/js/examples/http/package.json

@@ -1,7 +1,7 @@
 {
   "name": "http-example",
   "private": true,
-  "version": "0.39.1",
+  "version": "0.40.0",
   "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.13.0",
-    "@opentelemetry/exporter-zipkin": "1.13.0",
-    "@opentelemetry/instrumentation": "0.39.1",
-    "@opentelemetry/instrumentation-http": "0.39.1",
-    "@opentelemetry/resources": "1.13.0",
-    "@opentelemetry/sdk-trace-base": "1.13.0",
-    "@opentelemetry/sdk-trace-node": "1.13.0",
-    "@opentelemetry/semantic-conventions": "1.13.0"
+    "@opentelemetry/exporter-jaeger": "1.14.0",
+    "@opentelemetry/exporter-zipkin": "1.14.0",
+    "@opentelemetry/instrumentation": "0.40.0",
+    "@opentelemetry/instrumentation-http": "0.40.0",
+    "@opentelemetry/resources": "1.14.0",
+    "@opentelemetry/sdk-trace-base": "1.14.0",
+    "@opentelemetry/sdk-trace-node": "1.14.0",
+    "@opentelemetry/semantic-conventions": "1.14.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http",
   "devDependencies": {

auto-merge/js/examples/https/package.json

@@ -1,7 +1,7 @@
 {
   "name": "https-example",
   "private": true,
-  "version": "0.39.1",
+  "version": "0.40.0",
   "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.13.0",
-    "@opentelemetry/exporter-zipkin": "1.13.0",
-    "@opentelemetry/instrumentation": "0.39.1",
-    "@opentelemetry/instrumentation-http": "0.39.1",
-    "@opentelemetry/resources": "1.13.0",
-    "@opentelemetry/sdk-trace-base": "1.13.0",
-    "@opentelemetry/sdk-trace-node": "1.13.0",
-    "@opentelemetry/semantic-conventions": "1.13.0"
+    "@opentelemetry/exporter-jaeger": "1.14.0",
+    "@opentelemetry/exporter-zipkin": "1.14.0",
+    "@opentelemetry/instrumentation": "0.40.0",
+    "@opentelemetry/instrumentation-http": "0.40.0",
+    "@opentelemetry/resources": "1.14.0",
+    "@opentelemetry/sdk-trace-base": "1.14.0",
+    "@opentelemetry/sdk-trace-node": "1.14.0",
+    "@opentelemetry/semantic-conventions": "1.14.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https",
   "devDependencies": {

auto-merge/js/examples/opentelemetry-web/package.json

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

auto-merge/js/examples/otlp-exporter-node/package.json

@@ -1,7 +1,7 @@
 {
   "name": "example-otlp-exporter-node",
   "private": true,
-  "version": "0.39.1",
+  "version": "0.40.0",
   "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.13.0",
-    "@opentelemetry/exporter-metrics-otlp-grpc": "0.39.1",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.39.1",
-    "@opentelemetry/exporter-metrics-otlp-proto": "0.39.1",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.39.1",
-    "@opentelemetry/exporter-trace-otlp-http": "0.39.1",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.39.1",
-    "@opentelemetry/resources": "1.13.0",
-    "@opentelemetry/sdk-metrics": "1.13.0",
-    "@opentelemetry/sdk-trace-base": "1.13.0",
-    "@opentelemetry/semantic-conventions": "1.13.0"
+    "@opentelemetry/core": "1.14.0",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "0.40.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.40.0",
+    "@opentelemetry/exporter-metrics-otlp-proto": "0.40.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.40.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.40.0",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.40.0",
+    "@opentelemetry/resources": "1.14.0",
+    "@opentelemetry/sdk-metrics": "1.14.0",
+    "@opentelemetry/sdk-trace-base": "1.14.0",
+    "@opentelemetry/semantic-conventions": "1.14.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
 }

auto-merge/js/experimental/CHANGELOG.md

@@ -6,6 +6,18 @@ All notable changes to experimental packages in this project will be documented
 
 ### :boom: Breaking Change
 
+### :rocket: (Enhancement)
+
+### :bug: (Bug Fix)
+
+### :books: (Refine Doc)
+
+### :house: (Internal)
+
+## 0.40.0
+
+### :boom: Breaking Change
+
 * fix(exporter-logs-otlp-grpc): change OTLPLogsExporter to OTLPLogExporter [#3819](https://github.com/open-telemetry/opentelemetry-js/pull/3819) @fuaiyi
 * chore(instrumentation-grpc): add 'grpc' deprecation notice postinstall script [#3833](https://github.com/open-telemetry/opentelemetry-js/pull/3833) @pichlermarc
   * Support for telemetry generation for the [`grpc`](https://www.npmjs.com/package/grpc) module will be dropped in the next release as the package has been
@@ -26,10 +38,6 @@ All notable changes to experimental packages in this project will be documented
 * fix(sdk-node): use resource interface instead of concrete class [#3803](https://github.com/open-telemetry/opentelemetry-js/pull/3803) @blumamir
 * fix(sdk-logs): remove includeTraceContext configuration and use LogRecord context when available  [#3817](https://github.com/open-telemetry/opentelemetry-js/pull/3817) @hectorhdzg
 
-### :books: (Refine Doc)
-
-### :house: (Internal)
-
 ## 0.39.1
 
 ### :bug: (Bug Fix)

auto-merge/js/experimental/backwards-compatability/node14/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node14",
-  "version": "0.39.1",
+  "version": "0.40.0",
   "private": true,
   "description": "Backwards compatability app for node 14 types and the OpenTelemetry Node.js SDK",
   "main": "index.js",
@@ -9,8 +9,8 @@
     "peer-api-check": "node ../../../scripts/peer-api-check.js"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.39.1",
-    "@opentelemetry/sdk-trace-base": "1.13.0"
+    "@opentelemetry/sdk-node": "0.40.0",
+    "@opentelemetry/sdk-trace-base": "1.14.0"
   },
   "devDependencies": {
     "@types/node": "14.18.25",

auto-merge/js/experimental/backwards-compatability/node16/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node16",
-  "version": "0.39.1",
+  "version": "0.40.0",
   "private": true,
   "description": "Backwards compatability app for node 16 types and the OpenTelemetry Node.js SDK",
   "main": "index.js",
@@ -9,8 +9,8 @@
     "peer-api-check": "node ../../../scripts/peer-api-check.js"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.39.1",
-    "@opentelemetry/sdk-trace-base": "1.13.0"
+    "@opentelemetry/sdk-node": "0.40.0",
+    "@opentelemetry/sdk-trace-base": "1.14.0"
   },
   "devDependencies": {
     "@types/node": "16.11.52",

auto-merge/js/experimental/examples/logs/package.json

@@ -1,14 +1,14 @@
 {
   "name": "logs-example",
-  "version": "0.2.0",
+  "version": "0.40.0",
   "private": true,
   "scripts": {
     "start": "ts-node index.ts"
   },
   "dependencies": {
     "@opentelemetry/api": "^1.4.1",
-    "@opentelemetry/api-logs": "0.39.1",
-    "@opentelemetry/sdk-logs": "0.39.1"
+    "@opentelemetry/api-logs": "0.40.0",
+    "@opentelemetry/sdk-logs": "0.40.0"
   },
   "devDependencies": {
     "@types/node": "18.6.5",

auto-merge/js/experimental/examples/prometheus/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prometheus-example",
-  "version": "0.39.1",
+  "version": "0.40.0",
   "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.39.1",
-    "@opentelemetry/sdk-metrics": "1.13.0"
+    "@opentelemetry/exporter-prometheus": "0.40.0",
+    "@opentelemetry/sdk-metrics": "1.14.0"
   }
 }

auto-merge/js/experimental/packages/exporter-logs-otlp-grpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-logs-otlp-grpc",
-  "version": "0.39.1",
+  "version": "0.40.0",
   "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,9 +51,9 @@
     "@babel/core": "7.16.0",
     "@grpc/proto-loader": "^0.7.3",
     "@opentelemetry/api": "1.4.1",
-    "@opentelemetry/api-logs": "0.39.1",
-    "@opentelemetry/otlp-exporter-base": "0.39.1",
-    "@opentelemetry/resources": "1.13.0",
+    "@opentelemetry/api-logs": "0.40.0",
+    "@opentelemetry/otlp-exporter-base": "0.40.0",
+    "@opentelemetry/resources": "1.14.0",
     "@types/mocha": "10.0.0",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.13",
@@ -71,10 +71,10 @@
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.7.1",
-    "@opentelemetry/core": "1.13.0",
-    "@opentelemetry/otlp-grpc-exporter-base": "0.39.1",
-    "@opentelemetry/otlp-transformer": "0.39.1",
-    "@opentelemetry/sdk-logs": "0.39.1"
+    "@opentelemetry/core": "1.14.0",
+    "@opentelemetry/otlp-grpc-exporter-base": "0.40.0",
+    "@opentelemetry/otlp-transformer": "0.40.0",
+    "@opentelemetry/sdk-logs": "0.40.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-grpc",
   "sideEffects": false

auto-merge/js/experimental/packages/exporter-logs-otlp-http/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-logs-otlp-http",
-  "version": "0.39.1",
+  "version": "0.40.0",
   "publishConfig": {
     "access": "public"
   },
@@ -72,7 +72,7 @@
   "sideEffects": false,
   "devDependencies": {
     "@babel/core": "7.16.0",
-    "@opentelemetry/api-logs": ">=0.38.0",
+    "@opentelemetry/api-logs": "0.40.0",
     "@types/mocha": "10.0.0",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.13",
@@ -115,9 +115,9 @@
     "@opentelemetry/api-logs": ">=0.38.0"
   },
   "dependencies": {
-    "@opentelemetry/core": "1.13.0",
-    "@opentelemetry/otlp-exporter-base": "0.39.1",
-    "@opentelemetry/otlp-transformer": "0.39.1",
-    "@opentelemetry/sdk-logs": "0.39.1"
+    "@opentelemetry/core": "1.14.0",
+    "@opentelemetry/otlp-exporter-base": "0.40.0",
+    "@opentelemetry/otlp-transformer": "0.40.0",
+    "@opentelemetry/sdk-logs": "0.40.0"
   }
 }

auto-merge/js/experimental/packages/exporter-logs-otlp-proto/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-logs-otlp-proto",
-  "version": "0.39.1",
+  "version": "0.40.0",
   "description": "An OTLP exporter to send logs using protobuf over HTTP",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
@@ -81,14 +81,14 @@
     "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
-    "@opentelemetry/core": "1.13.0",
-    "@opentelemetry/otlp-transformer": "0.39.1",
-    "@opentelemetry/resources": "1.13.0",
-    "@opentelemetry/sdk-trace-base": "1.13.0",
-    "@opentelemetry/api-logs": "^0.39.1",
-    "@opentelemetry/otlp-exporter-base": "0.39.1",
-    "@opentelemetry/otlp-proto-exporter-base": "0.39.1",
-    "@opentelemetry/sdk-logs": "^0.39.1"
+    "@opentelemetry/api-logs": "0.40.0",
+    "@opentelemetry/core": "1.14.0",
+    "@opentelemetry/otlp-exporter-base": "0.40.0",
+    "@opentelemetry/otlp-proto-exporter-base": "0.40.0",
+    "@opentelemetry/otlp-transformer": "0.40.0",
+    "@opentelemetry/resources": "1.14.0",
+    "@opentelemetry/sdk-logs": "0.40.0",
+    "@opentelemetry/sdk-trace-base": "1.14.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-proto",
   "sideEffects": false