Merge branch 'main' into bugfix/max-on-negative-values

open-telemetry · Jul 11, 2022 · c082d15 · c082d15
2 parents fef55ee + 747c404
commit c082d15
Show file tree

Hide file tree

Showing 58 changed files with 385 additions and 301 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,11 +10,17 @@ All notable changes to this project will be documented in this file.
 
 ### :bug: (Bug Fix)
 
+### :books: (Refine Doc)
+
+### :house: (Internal)
+
+## 1.4.0
+
+### :rocket: (Enhancement)
+
 * fix(resources): fix browser compatibility for host and os detectors [#3004](https://github.com/open-telemetry/opentelemetry-js/pull/3004) @legendecas
 * fix(sdk-trace-base): fix crash on environments without global document [#3000](https://github.com/open-telemetry/opentelemetry-js/pull/3000) @legendecas
 
-### :books: (Refine Doc)
-
 ### :house: (Internal)
 
 * test: add node 18 and remove EoL node versions [#3048](https://github.com/open-telemetry/opentelemetry-js/pull/3048) @dyladan

diff --git a/README.md b/README.md
@@ -47,6 +47,8 @@ This is the JavaScript version of [OpenTelemetry](https://opentelemetry.io/), a
 
 | API Version | Core version | Experimental Packages |
 | ----------- | ------------ | --------------------- |
+| 1.1.x       | 1.3.x        | 0.30.x                |
+| 1.1.x       | 1.2.x        | 0.29.x                |
 | 1.1.x       | 1.1.x        | 0.28.x                |
 | 1.0.x       | 1.0.x        | 0.26.x, 0.27.x        |
 | 1.0.x       | 0.26.x       | -----                 |

diff --git a/examples/http/README.md b/examples/http/README.md
@@ -44,7 +44,7 @@ Setup [Jaeger Tracing](https://www.jaegertracing.io/docs/latest/getting-started/
 #### Zipkin UI
 
 `zipkin:server` script should output the `traceid` in the terminal (e.g `traceid: 4815c3d576d930189725f1f1d1bdfcc6`).
-Go to Zipkin with your browser <http://localhost:9411/zipkin/traces/(your-trace-id)> (e.g <http://localhost:9411/zipkin/traces/4815c3d576d930189725f1f1d1bdfcc6)>
+Go to Zipkin with your browser <http://localhost:9411/zipkin/traces/(your-trace-id)> (e.g <http://localhost:9411/zipkin/traces/4815c3d576d930189725f1f1d1bdfcc6>)
 
 <p align="center"><img src="./images/zipkin-ui.png?raw=true"/></p>
 
@@ -67,7 +67,7 @@ Go to Zipkin with your browser <http://localhost:9411/zipkin/traces/(your-trace-
 #### Jaeger UI
 
 `jaeger:server` script should output the `traceid` in the terminal (e.g `traceid: 4815c3d576d930189725f1f1d1bdfcc6`).
-Go to Jaeger with your browser <http://localhost:16686/trace/(your-trace-id)> (e.g <http://localhost:16686/trace/4815c3d576d930189725f1f1d1bdfcc6)>
+Go to Jaeger with your browser <http://localhost:16686/trace/(your-trace-id)> (e.g <http://localhost:16686/trace/4815c3d576d930189725f1f1d1bdfcc6>)
 
 <p align="center"><img src="images/jaeger-ui.png?raw=true"/></p>
 

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.29.2",
+  "version": "0.30.0",
   "description": "Example of using @opentelemetry/collector-exporter in Node.js",
   "main": "index.js",
   "scripts": {
@@ -29,18 +29,18 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.1.0",
-    "@opentelemetry/api-metrics": "0.29.2",
-    "@opentelemetry/core": "1.3.1",
-    "@opentelemetry/exporter-metrics-otlp-grpc": "0.29.2",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.29.2",
-    "@opentelemetry/exporter-metrics-otlp-proto": "0.29.2",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.29.2",
-    "@opentelemetry/exporter-trace-otlp-http": "0.29.2",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.29.2",
-    "@opentelemetry/resources": "1.3.1",
-    "@opentelemetry/sdk-metrics-base": "0.29.2",
-    "@opentelemetry/sdk-trace-base": "1.3.1",
-    "@opentelemetry/semantic-conventions": "1.3.1"
+    "@opentelemetry/api-metrics": "0.30.0",
+    "@opentelemetry/core": "1.4.0",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "0.30.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.30.0",
+    "@opentelemetry/exporter-metrics-otlp-proto": "0.30.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.30.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.30.0",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.30.0",
+    "@opentelemetry/resources": "1.4.0",
+    "@opentelemetry/sdk-metrics-base": "0.30.0",
+    "@opentelemetry/sdk-trace-base": "1.4.0",
+    "@opentelemetry/semantic-conventions": "1.4.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
 }
diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
diff --git a/experimental/backwards-compatability/node14/package.json b/experimental/backwards-compatability/node14/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node14",
-  "version": "0.29.2",
+  "version": "0.30.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.29.2",
-    "@opentelemetry/sdk-trace-base": "1.3.1"
+    "@opentelemetry/sdk-node": "0.30.0",
+    "@opentelemetry/sdk-trace-base": "1.4.0"
   },
   "devDependencies": {
     "@types/node": "^14.0.0",

diff --git a/experimental/backwards-compatability/node16/package.json b/experimental/backwards-compatability/node16/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node16",
-  "version": "0.29.2",
+  "version": "0.30.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.29.2",
-    "@opentelemetry/sdk-trace-base": "1.3.1"
+    "@opentelemetry/sdk-node": "0.30.0",
+    "@opentelemetry/sdk-trace-base": "1.4.0"
   },
   "devDependencies": {
     "@types/node": "^16.0.0",

diff --git a/experimental/examples/prometheus/index.js b/experimental/examples/prometheus/index.js
@@ -31,8 +31,17 @@ const upDownCounter = meter.createUpDownCounter('test_up_down_counter', {
 
 const attributes = { pid: process.pid, environment: 'staging' };
 
+let counter = 0;
+const observableCounter = meter.createObservableCounter('observable_requests', {
+  description: 'Example of an ObservableCounter',
+});
+observableCounter.addCallback(observableResult => {
+  observableResult.observe(counter, attributes);
+});
+
 // Record metrics
 setInterval(() => {
+  counter++;
   requestCounter.add(1, attributes);
   upDownCounter.add(Math.random() > 0.5 ? 1 : -1, attributes);
 }, 1000);
diff --git a/experimental/packages/exporter-trace-otlp-grpc/README.md b/experimental/packages/exporter-trace-otlp-grpc/README.md
@@ -3,7 +3,7 @@
 [![NPM Published Version][npm-img]][npm-url]
 [![Apache License][license-image]][license-image]
 
-This module provides exporter for node to be used with [opentelemetry-collector][opentelemetry-collector-url].
+This module provides exporter for node to be used with OTLP (`grpc`) compatible receivers.
 Compatible with [opentelemetry-collector][opentelemetry-collector-url] versions `>=0.16 <=0.50`.
 
 ## Installation

diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-trace-otlp-grpc",
-  "version": "0.29.2",
+  "version": "0.30.0",
   "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@babel/core": "7.16.0",
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/otlp-exporter-base": "0.29.2",
+    "@opentelemetry/otlp-exporter-base": "0.30.0",
     "@types/mocha": "8.2.3",
     "@types/node": "14.17.33",
     "@types/sinon": "10.0.6",
@@ -69,10 +69,10 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.5.9",
     "@grpc/proto-loader": "^0.6.9",
-    "@opentelemetry/core": "1.3.1",
-    "@opentelemetry/otlp-grpc-exporter-base": "0.29.2",
-    "@opentelemetry/otlp-transformer": "0.29.2",
-    "@opentelemetry/resources": "1.3.1",
-    "@opentelemetry/sdk-trace-base": "1.3.1"
+    "@opentelemetry/core": "1.4.0",
+    "@opentelemetry/otlp-grpc-exporter-base": "0.30.0",
+    "@opentelemetry/otlp-transformer": "0.30.0",
+    "@opentelemetry/resources": "1.4.0",
+    "@opentelemetry/sdk-trace-base": "1.4.0"
   }
 }
diff --git a/experimental/packages/exporter-trace-otlp-http/README.md b/experimental/packages/exporter-trace-otlp-http/README.md
@@ -3,7 +3,7 @@
 [![NPM Published Version][npm-img]][npm-url]
 [![Apache License][license-image]][license-image]
 
-This module provides exporter for web and node to be used with [opentelemetry-collector][opentelemetry-collector-url]
+This module provides exporter for web and node to be used with OTLP (`http/json`) compatible receivers.
 Compatible with [opentelemetry-collector][opentelemetry-collector-url] versions `>=0.48 <=0.50`.
 
 ## Installation

diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-trace-otlp-http",
-  "version": "0.29.2",
+  "version": "0.30.0",
   "description": "OpenTelemetry Collector Trace Exporter allows user to send collected traces to the OpenTelemetry Collector",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
@@ -94,10 +94,10 @@
     "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
-    "@opentelemetry/core": "1.3.1",
-    "@opentelemetry/otlp-exporter-base": "0.29.2",
-    "@opentelemetry/otlp-transformer": "0.29.2",
-    "@opentelemetry/resources": "1.3.1",
-    "@opentelemetry/sdk-trace-base": "1.3.1"
+    "@opentelemetry/core": "1.4.0",
+    "@opentelemetry/otlp-exporter-base": "0.30.0",
+    "@opentelemetry/otlp-transformer": "0.30.0",
+    "@opentelemetry/resources": "1.4.0",
+    "@opentelemetry/sdk-trace-base": "1.4.0"
   }
 }
diff --git a/experimental/packages/exporter-trace-otlp-proto/README.md b/experimental/packages/exporter-trace-otlp-proto/README.md
@@ -3,7 +3,7 @@
 [![NPM Published Version][npm-img]][npm-url]
 [![Apache License][license-image]][license-image]
 
-This module provides exporter for node to be used with [opentelemetry-collector][opentelemetry-collector-url].
+This module provides exporter for node to be used with OTLP (`http/protobuf`) compatible receivers.
 Compatible with [opentelemetry-collector][opentelemetry-collector-url] versions `>=0.32 <=0.50`.
 
 ## Installation

diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-trace-otlp-proto",
-  "version": "0.29.2",
+  "version": "0.30.0",
   "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector using protobuf over HTTP",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -67,12 +67,12 @@
   },
   "dependencies": {
     "@grpc/proto-loader": "^0.6.9",
-    "@opentelemetry/core": "1.3.1",
-    "@opentelemetry/otlp-exporter-base": "0.29.2",
-    "@opentelemetry/otlp-proto-exporter-base": "0.29.2",
-    "@opentelemetry/otlp-transformer": "0.29.2",
-    "@opentelemetry/resources": "1.3.1",
-    "@opentelemetry/sdk-trace-base": "1.3.1",
+    "@opentelemetry/core": "1.4.0",
+    "@opentelemetry/otlp-exporter-base": "0.30.0",
+    "@opentelemetry/otlp-proto-exporter-base": "0.30.0",
+    "@opentelemetry/otlp-transformer": "0.30.0",
+    "@opentelemetry/resources": "1.4.0",
+    "@opentelemetry/sdk-trace-base": "1.4.0",
     "protobufjs": "^6.9.0"
   }
 }
diff --git a/experimental/packages/opentelemetry-api-metrics/package.json b/experimental/packages/opentelemetry-api-metrics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/api-metrics",
-  "version": "0.29.2",
+  "version": "0.30.0",
   "description": "Public metrics API for OpenTelemetry",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/README.md b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/README.md
@@ -3,7 +3,7 @@
 [![NPM Published Version][npm-img]][npm-url]
 [![Apache License][license-image]][license-image]
 
-This module provides exporter for node to be used with [opentelemetry-collector][opentelemetry-collector-url].
+This module provides exporter for node to be used with OTLP (`grpc`) compatible receivers.
 Compatible with [opentelemetry-collector][opentelemetry-collector-url] versions `>=0.16 <=0.53`.
 
 ## Installation

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-metrics-otlp-grpc",
-  "version": "0.29.2",
+  "version": "0.30.0",
   "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@babel/core": "7.16.0",
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/api-metrics": "0.29.2",
+    "@opentelemetry/api-metrics": "0.30.0",
     "@types/mocha": "8.2.3",
     "@types/node": "14.17.33",
     "@types/sinon": "10.0.6",
@@ -69,11 +69,11 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.5.9",
     "@grpc/proto-loader": "^0.6.9",
-    "@opentelemetry/core": "1.3.1",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.29.2",
-    "@opentelemetry/otlp-grpc-exporter-base": "0.29.2",
-    "@opentelemetry/otlp-transformer": "0.29.2",
-    "@opentelemetry/resources": "1.3.1",
-    "@opentelemetry/sdk-metrics-base": "0.29.2"
+    "@opentelemetry/core": "1.4.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.30.0",
+    "@opentelemetry/otlp-grpc-exporter-base": "0.30.0",
+    "@opentelemetry/otlp-transformer": "0.30.0",
+    "@opentelemetry/resources": "1.4.0",
+    "@opentelemetry/sdk-metrics-base": "0.30.0"
   }
 }
diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md
@@ -3,7 +3,7 @@
 [![NPM Published Version][npm-img]][npm-url]
 [![Apache License][license-image]][license-image]
 
-This module provides exporter for web and node to be used with [opentelemetry-collector][opentelemetry-collector-url].
+This module provides exporter for web and node to be used with OTLP (`http/json`) compatible receivers.
 Compatible with [opentelemetry-collector][opentelemetry-collector-url] versions `>=0.52 <=0.53`.
 
 ## Installation

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-metrics-otlp-http",
-  "version": "0.29.2",
+  "version": "0.30.0",
   "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
@@ -94,11 +94,11 @@
     "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
-    "@opentelemetry/api-metrics": "0.29.2",
-    "@opentelemetry/core": "1.3.1",
-    "@opentelemetry/otlp-exporter-base": "0.29.2",
-    "@opentelemetry/otlp-transformer": "0.29.2",
-    "@opentelemetry/resources": "1.3.1",
-    "@opentelemetry/sdk-metrics-base": "0.29.2"
+    "@opentelemetry/api-metrics": "0.30.0",
+    "@opentelemetry/core": "1.4.0",
+    "@opentelemetry/otlp-exporter-base": "0.30.0",
+    "@opentelemetry/otlp-transformer": "0.30.0",
+    "@opentelemetry/resources": "1.4.0",
+    "@opentelemetry/sdk-metrics-base": "0.30.0"
   }
 }
diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/README.md b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/README.md
@@ -3,7 +3,7 @@
 [![NPM Published Version][npm-img]][npm-url]
 [![Apache License][license-image]][license-image]
 
-This module provides exporter for node to be used with [opentelemetry-collector][opentelemetry-collector-url].
+This module provides exporter for node to be used with OTLP (`http/protobuf`) compatible receivers.
 Compatible with [opentelemetry-collector][opentelemetry-collector-url] versions `>=0.32 <=0.53`.
 
 ## Installation

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-metrics-otlp-proto",
-  "version": "0.29.2",
+  "version": "0.30.0",
   "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector using protobuf over HTTP",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@babel/core": "7.16.0",
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/api-metrics": "0.29.2",
+    "@opentelemetry/api-metrics": "0.30.0",
     "@types/mocha": "8.2.3",
     "@types/node": "14.17.33",
     "@types/sinon": "10.0.6",
@@ -68,13 +68,13 @@
   },
   "dependencies": {
     "@grpc/proto-loader": "0.6.9",
-    "@opentelemetry/core": "1.3.1",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.29.2",
-    "@opentelemetry/otlp-exporter-base": "0.29.2",
-    "@opentelemetry/otlp-proto-exporter-base": "0.29.2",
-    "@opentelemetry/otlp-transformer": "0.29.2",
-    "@opentelemetry/resources": "1.3.1",
-    "@opentelemetry/sdk-metrics-base": "0.29.2",
+    "@opentelemetry/core": "1.4.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.30.0",
+    "@opentelemetry/otlp-exporter-base": "0.30.0",
+    "@opentelemetry/otlp-proto-exporter-base": "0.30.0",
+    "@opentelemetry/otlp-transformer": "0.30.0",
+    "@opentelemetry/resources": "1.4.0",
+    "@opentelemetry/sdk-metrics-base": "0.30.0",
     "protobufjs": "^6.9.0"
   }
 }