Merge branch 'main' into main

open-telemetry · Nov 9, 2023 · 62510e7 · 62510e7
2 parents c47439c + 40fde0f
commit 62510e7
Show file tree

Hide file tree

Showing 72 changed files with 1,037 additions and 882 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,12 +11,21 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 
 ### :rocket: (Enhancement)
 
-### :bug: (Bug Fix)
-
 ### :books: (Refine Doc)
 
 ### :house: (Internal)
 
+* chore: type reference on zone.js [#4257](https://github.com/open-telemetry/opentelemetry-js/pull/4257) @legendecas
+* chore: no need for 'packages' in lerna.json [#4264](https://github.com/open-telemetry/opentelemetry-js/pull/4264) @trentm
+
+### :bug: (Bug Fix)
+
+## 1.18.1
+
+### :bug: (Bug Fix)
+
+* fix(sdk-metrics): hand-roll MetricAdvice type as older API versions do not include it #4260
+
 ## 1.18.0
 
 ### :rocket: (Enhancement)

diff --git a/README.md b/README.md
@@ -143,7 +143,8 @@ The below table describes which versions of each set of packages are expected to
 
 | Stable Packages                                                 | Experimental Packages |
 |-----------------------------------------------------------------|-----------------------|
-| 1.17.x                                                          | 0.43.x                |
+| 1.18.x                                                          | 0.45.x                |
+| 1.17.x                                                          | 0.44.x                |
 | 1.16.x                                                          | 0.42.x                |
 | 1.15.x                                                          | 0.41.x                |
 | 1.14.x                                                          | 0.40.x                |

diff --git a/examples/esm-http-ts/package.json b/examples/esm-http-ts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "esm-http-ts",
   "private": true,
-  "version": "0.45.0",
+  "version": "0.45.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.7.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.45.0",
-    "@opentelemetry/instrumentation": "0.45.0",
-    "@opentelemetry/instrumentation-http": "0.45.0",
-    "@opentelemetry/resources": "1.18.0",
-    "@opentelemetry/sdk-trace-base": "1.18.0",
-    "@opentelemetry/sdk-trace-node": "1.18.0",
-    "@opentelemetry/semantic-conventions": "1.18.0"
+    "@opentelemetry/exporter-trace-otlp-proto": "0.45.1",
+    "@opentelemetry/instrumentation": "0.45.1",
+    "@opentelemetry/instrumentation-http": "0.45.1",
+    "@opentelemetry/resources": "1.18.1",
+    "@opentelemetry/sdk-trace-base": "1.18.1",
+    "@opentelemetry/sdk-trace-node": "1.18.1",
+    "@opentelemetry/semantic-conventions": "1.18.1"
   }
 }
diff --git a/examples/http/package.json b/examples/http/package.json
@@ -1,7 +1,7 @@
 {
   "name": "http-example",
   "private": true,
-  "version": "0.45.0",
+  "version": "0.45.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.18.0",
-    "@opentelemetry/exporter-zipkin": "1.18.0",
-    "@opentelemetry/instrumentation": "0.45.0",
-    "@opentelemetry/instrumentation-http": "0.45.0",
-    "@opentelemetry/resources": "1.18.0",
-    "@opentelemetry/sdk-trace-base": "1.18.0",
-    "@opentelemetry/sdk-trace-node": "1.18.0",
-    "@opentelemetry/semantic-conventions": "1.18.0"
+    "@opentelemetry/exporter-jaeger": "1.18.1",
+    "@opentelemetry/exporter-zipkin": "1.18.1",
+    "@opentelemetry/instrumentation": "0.45.1",
+    "@opentelemetry/instrumentation-http": "0.45.1",
+    "@opentelemetry/resources": "1.18.1",
+    "@opentelemetry/sdk-trace-base": "1.18.1",
+    "@opentelemetry/sdk-trace-node": "1.18.1",
+    "@opentelemetry/semantic-conventions": "1.18.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http",
   "devDependencies": {

diff --git a/examples/https/package.json b/examples/https/package.json
@@ -1,7 +1,7 @@
 {
   "name": "https-example",
   "private": true,
-  "version": "0.45.0",
+  "version": "0.45.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.18.0",
-    "@opentelemetry/exporter-zipkin": "1.18.0",
-    "@opentelemetry/instrumentation": "0.45.0",
-    "@opentelemetry/instrumentation-http": "0.45.0",
-    "@opentelemetry/resources": "1.18.0",
-    "@opentelemetry/sdk-trace-base": "1.18.0",
-    "@opentelemetry/sdk-trace-node": "1.18.0",
-    "@opentelemetry/semantic-conventions": "1.18.0"
+    "@opentelemetry/exporter-jaeger": "1.18.1",
+    "@opentelemetry/exporter-zipkin": "1.18.1",
+    "@opentelemetry/instrumentation": "0.45.1",
+    "@opentelemetry/instrumentation-http": "0.45.1",
+    "@opentelemetry/resources": "1.18.1",
+    "@opentelemetry/sdk-trace-base": "1.18.1",
+    "@opentelemetry/sdk-trace-node": "1.18.1",
+    "@opentelemetry/semantic-conventions": "1.18.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https",
   "devDependencies": {

diff --git a/examples/opentelemetry-web/package.json b/examples/opentelemetry-web/package.json
@@ -1,7 +1,7 @@
 {
   "name": "web-opentelemetry-example",
   "private": true,
-  "version": "0.45.0",
+  "version": "0.45.1",
   "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.18.0",
-    "@opentelemetry/core": "1.18.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.45.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.45.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.45.0",
-    "@opentelemetry/exporter-zipkin": "1.18.0",
-    "@opentelemetry/instrumentation": "0.45.0",
-    "@opentelemetry/instrumentation-fetch": "0.45.0",
-    "@opentelemetry/instrumentation-xml-http-request": "0.45.0",
-    "@opentelemetry/propagator-b3": "1.18.0",
-    "@opentelemetry/sdk-metrics": "1.18.0",
-    "@opentelemetry/sdk-trace-base": "1.18.0",
-    "@opentelemetry/sdk-trace-web": "1.18.0",
-    "@opentelemetry/semantic-conventions": "1.18.0"
+    "@opentelemetry/context-zone": "1.18.1",
+    "@opentelemetry/core": "1.18.1",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.45.1",
+    "@opentelemetry/exporter-trace-otlp-http": "0.45.1",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.45.1",
+    "@opentelemetry/exporter-zipkin": "1.18.1",
+    "@opentelemetry/instrumentation": "0.45.1",
+    "@opentelemetry/instrumentation-fetch": "0.45.1",
+    "@opentelemetry/instrumentation-xml-http-request": "0.45.1",
+    "@opentelemetry/propagator-b3": "1.18.1",
+    "@opentelemetry/sdk-metrics": "1.18.1",
+    "@opentelemetry/sdk-trace-base": "1.18.1",
+    "@opentelemetry/sdk-trace-web": "1.18.1",
+    "@opentelemetry/semantic-conventions": "1.18.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web"
 }
diff --git a/examples/otlp-exporter-node/package.json b/examples/otlp-exporter-node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "example-otlp-exporter-node",
   "private": true,
-  "version": "0.45.0",
+  "version": "0.45.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.18.0",
-    "@opentelemetry/exporter-metrics-otlp-grpc": "0.45.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.45.0",
-    "@opentelemetry/exporter-metrics-otlp-proto": "0.45.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.45.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.45.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.45.0",
-    "@opentelemetry/resources": "1.18.0",
-    "@opentelemetry/sdk-metrics": "1.18.0",
-    "@opentelemetry/sdk-trace-base": "1.18.0",
-    "@opentelemetry/semantic-conventions": "1.18.0"
+    "@opentelemetry/core": "1.18.1",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "0.45.1",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.45.1",
+    "@opentelemetry/exporter-metrics-otlp-proto": "0.45.1",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.45.1",
+    "@opentelemetry/exporter-trace-otlp-http": "0.45.1",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.45.1",
+    "@opentelemetry/resources": "1.18.1",
+    "@opentelemetry/sdk-metrics": "1.18.1",
+    "@opentelemetry/sdk-trace-base": "1.18.1",
+    "@opentelemetry/semantic-conventions": "1.18.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
 }
diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
@@ -16,6 +16,12 @@ All notable changes to experimental packages in this project will be documented
 
 ### :house: (Internal)
 
+## 0.45.1
+
+### :bug: (Bug Fix)
+
+* Bumps all dependencies to explicitly include Stable v1.18.1 packages
+
 ## 0.45.0
 
 ### :boom: Breaking Change

diff --git a/experimental/backwards-compatibility/node14/package.json b/experimental/backwards-compatibility/node14/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node14",
-  "version": "0.45.0",
+  "version": "0.45.1",
   "private": true,
   "description": "Backwards compatibility 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.45.0",
-    "@opentelemetry/sdk-trace-base": "1.18.0"
+    "@opentelemetry/sdk-node": "0.45.1",
+    "@opentelemetry/sdk-trace-base": "1.18.1"
   },
   "devDependencies": {
     "@types/node": "14.18.25",

diff --git a/experimental/backwards-compatibility/node16/package.json b/experimental/backwards-compatibility/node16/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node16",
-  "version": "0.45.0",
+  "version": "0.45.1",
   "private": true,
   "description": "Backwards compatibility 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.45.0",
-    "@opentelemetry/sdk-trace-base": "1.18.0"
+    "@opentelemetry/sdk-node": "0.45.1",
+    "@opentelemetry/sdk-trace-base": "1.18.1"
   },
   "devDependencies": {
     "@types/node": "16.11.52",

diff --git a/experimental/examples/logs/package.json b/experimental/examples/logs/package.json
@@ -1,14 +1,14 @@
 {
   "name": "logs-example",
-  "version": "0.45.0",
+  "version": "0.45.1",
   "private": true,
   "scripts": {
     "start": "ts-node index.ts"
   },
   "dependencies": {
     "@opentelemetry/api": "^1.7.0",
-    "@opentelemetry/api-logs": "0.45.0",
-    "@opentelemetry/sdk-logs": "0.45.0"
+    "@opentelemetry/api-logs": "0.45.1",
+    "@opentelemetry/sdk-logs": "0.45.1"
   },
   "devDependencies": {
     "@types/node": "18.6.5",

diff --git a/experimental/examples/opencensus-shim/package.json b/experimental/examples/opencensus-shim/package.json
@@ -1,7 +1,7 @@
 {
   "name": "opencensus-shim",
   "private": true,
-  "version": "0.45.0",
+  "version": "0.45.1",
   "description": "Example of using @opentelemetry/shim-opencensus in Node.js",
   "main": "index.js",
   "scripts": {
@@ -31,13 +31,13 @@
     "@opencensus/instrumentation-http": "0.1.0",
     "@opencensus/nodejs-base": "0.1.0",
     "@opentelemetry/api": "1.7.0",
-    "@opentelemetry/exporter-prometheus": "0.45.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.45.0",
-    "@opentelemetry/resources": "1.18.0",
-    "@opentelemetry/sdk-metrics": "1.18.0",
-    "@opentelemetry/sdk-trace-node": "1.18.0",
-    "@opentelemetry/semantic-conventions": "1.18.0",
-    "@opentelemetry/shim-opencensus": "0.45.0"
+    "@opentelemetry/exporter-prometheus": "0.45.1",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.45.1",
+    "@opentelemetry/resources": "1.18.1",
+    "@opentelemetry/sdk-metrics": "1.18.1",
+    "@opentelemetry/sdk-trace-node": "1.18.1",
+    "@opentelemetry/semantic-conventions": "1.18.1",
+    "@opentelemetry/shim-opencensus": "0.45.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/examples/opencensus-shim"
 }
diff --git a/experimental/examples/prometheus/README.md b/experimental/examples/prometheus/README.md
@@ -11,17 +11,28 @@ This is a simple example that demonstrates basic metrics collection and exports
 npm install
 ```
 
-Setup [Prometheus](https://prometheus.io/docs/prometheus/latest/getting_started/)
-
 ## Run the Application
 
-- Run the server
-
 ```sh
 # from this directory
 npm run start
 ```
 
+If you are using the default configurations, the metrics should be available at <http://localhost:9464/metrics>
+
+## Run Prometheus
+
+### With docker
+
+```sh
+# from this directory
+docker compose up
+```
+
+### With binary
+
+Setup [Prometheus](https://prometheus.io/docs/prometheus/latest/getting_started/)
+
 - Replace the `prometheus.yml` provided by the Prometheus installation with the following:
 
 ```yaml
@@ -34,7 +45,6 @@ scrape_configs:
     # scheme defaults to 'http'.
     static_configs:
     - targets: ['localhost:9464']
-
 ```
 
 - Start Prometheus
@@ -44,7 +54,7 @@ scrape_configs:
 prometheus --config.file=prometheus.yml
 ```
 
-### Prometheus UI
+## Prometheus UI
 
 If you are using the default configurations, the prometheus client will be available at <http://localhost:9090>
 

diff --git a/experimental/examples/prometheus/docker-compose.yaml b/experimental/examples/prometheus/docker-compose.yaml
@@ -0,0 +1,12 @@
+version: '3.7'
+
+services:
+  prometheus:
+    image: prom/prometheus:v2.47.2
+    extra_hosts:
+      - host.docker.internal:host-gateway
+    volumes:
+      - "./prometheus.docker.yml:/etc/prometheus/prometheus.yml"
+    ports:
+      - 9090:9090
+    restart: always
diff --git a/experimental/examples/prometheus/package.json b/experimental/examples/prometheus/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prometheus-example",
-  "version": "0.45.0",
+  "version": "0.45.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.45.0",
-    "@opentelemetry/sdk-metrics": "1.18.0"
+    "@opentelemetry/exporter-prometheus": "0.45.1",
+    "@opentelemetry/sdk-metrics": "1.18.1"
   }
 }
diff --git a/experimental/examples/prometheus/prometheus.docker.yml b/experimental/examples/prometheus/prometheus.docker.yml
@@ -0,0 +1,9 @@
+global:
+  scrape_interval: 15s # Default is every 1 minute.
+
+scrape_configs:
+  - job_name: 'opentelemetry'
+    # metrics_path defaults to '/metrics'
+    # scheme defaults to 'http'.
+    static_configs:
+    - targets: ['host.docker.internal:9464']