Merge branch 'main' into grpc-instrumentation-attributes-fix

open-telemetry · Jul 29, 2022 · 9d708eb · 9d708eb
2 parents 4b461d6 + df58fac
commit 9d708eb
Show file tree

Hide file tree

Showing 102 changed files with 2,086 additions and 458 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,18 +8,27 @@ All notable changes to this project will be documented in this file.
 
 ### :rocket: (Enhancement)
 
+feat(sdk-trace-base): move Sampler declaration into sdk-trace-base [#3088](https://github.com/open-telemetry/opentelemetry-js/pull/3088) @legendecas
+
 ### :bug: (Bug Fix)
 
 ### :books: (Refine Doc)
 
 ### :house: (Internal)
 
+## 1.5.0
+
+### :rocket: (Enhancement)
+
+* feat(sdk-trace-base): Improve extensibility of BasicTracerProvider [#3023](https://github.com/open-telemetry/opentelemetry-js/pull/3023) @Rauno56
+
 ## 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
+* fix(sdk-trace-base): fix spanLimits attribute length/count to consider env values [#3068](https://github.com/open-telemetry/opentelemetry-js/pull/3068) @svetlanabrennan
 
 ### :house: (Internal)
 

diff --git a/examples/basic-tracer-node/package.json b/examples/basic-tracer-node/package.json
@@ -30,5 +30,5 @@
  "@opentelemetry/semantic-conventions": "0.25.0",
  "@opentelemetry/sdk-trace-base": "0.25.0"
  },
- "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
+ "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/basic-tracer-node"
 }
diff --git a/examples/grpc-js/package.json b/examples/grpc-js/package.json
@@ -40,7 +40,7 @@
  "@opentelemetry/sdk-trace-node": "^1.0.1",
  "google-protobuf": "^3.9.2"
  },
- "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
+ "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/grpc-js",
  "devDependencies": {
  "cross-env": "^6.0.0"
  }

diff --git a/examples/grpc/package.json b/examples/grpc/package.json
@@ -41,7 +41,7 @@
  "grpc": "^1.23.3",
  "node-pre-gyp": "0.14.0"
  },
- "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
+ "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/grpc",
  "devDependencies": {
  "cross-env": "^6.0.0"
  }

diff --git a/examples/http/package.json b/examples/http/package.json
@@ -38,7 +38,7 @@
  "@opentelemetry/sdk-trace-node": "0.25.0",
  "@opentelemetry/sdk-trace-base": "0.25.0"
  },
- "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
+ "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http",
  "devDependencies": {
  "cross-env": "^6.0.0"
  }

diff --git a/examples/https/package.json b/examples/https/package.json
@@ -39,7 +39,7 @@
  "@opentelemetry/sdk-trace-node": "0.25.0",
  "@opentelemetry/sdk-trace-base": "0.25.0"
  },
- "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
+ "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https",
  "devDependencies": {
  "cross-env": "^6.0.0"
  }

diff --git a/examples/opentracing-shim/package.json b/examples/opentracing-shim/package.json
@@ -40,7 +40,7 @@
  "@opentelemetry/sdk-trace-base": "0.25.0",
  "opentracing": "^0.14.4"
  },
- "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
+ "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/opentracing-shim",
  "devDependencies": {
  "cross-env": "^6.0.0"
  }

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.30.0",
+ "version": "0.31.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.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"
+ "@opentelemetry/api-metrics": "0.31.0",
+ "@opentelemetry/core": "1.5.0",
+ "@opentelemetry/exporter-metrics-otlp-grpc": "0.31.0",
+ "@opentelemetry/exporter-metrics-otlp-http": "0.31.0",
+ "@opentelemetry/exporter-metrics-otlp-proto": "0.31.0",
+ "@opentelemetry/exporter-trace-otlp-grpc": "0.31.0",
+ "@opentelemetry/exporter-trace-otlp-http": "0.31.0",
+ "@opentelemetry/exporter-trace-otlp-proto": "0.31.0",
+ "@opentelemetry/resources": "1.5.0",
+ "@opentelemetry/sdk-metrics-base": "0.31.0",
+ "@opentelemetry/sdk-trace-base": "1.5.0",
+ "@opentelemetry/semantic-conventions": "1.5.0"
  },
- "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
+ "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
 }
diff --git a/examples/tracer-web/package.json b/examples/tracer-web/package.json
@@ -54,5 +54,5 @@
  "@opentelemetry/exporter-metrics-otlp-http": "0.27.0",
  "@opentelemetry/sdk-metrics-base": "0.27.0"
  },
- "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
+ "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web"
 }
diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
@@ -6,25 +6,40 @@ 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.31.0
+
+### :boom: Breaking Change
+
 * feature(views): move views registration to MeterProvider constructor [#3066](https://github.com/open-telemetry/opentelemetry-js/pull/3066) @pichlermarc
 * feat(sdk-metrics-base): split up Singular into Sum and Gauge in MetricData [#3079](https://github.com/open-telemetry/opentelemetry-js/pull/3079) @pichlermarc
  * removes `DataPointType.SINGULAR`, and replaces it with `DataPointType.SUM` and `DataPointType.GAUGE`
  * removes `SingularMetricData` and replaces it with `SumMetricData` (including an additional `isMonotonic` flag) and `GaugeMetricData`
+* feat(histogram): align collection of optional Histogram properties with spec [#3102](https://github.com/open-telemetry/opentelemetry-js/pull/3079) @pichlermarc
+ * changes type of `sum` property on `Histogram` to `number | undefined`
+ * changes type of `min` and `max` properties on `Histogram` to `number | undefined`
+ * removes `hasMinMax` flag on the exported `Histogram` - this is now indicated by `min` and `max` being `undefined`
 
 ### :rocket: (Enhancement)
 
 * feat(metrics-api): use common attributes definitions #3038 @legendecas
 * feat(otlp-proto): pre-compile proto files [#3098](https://github.com/open-telemetry/opentelemetry-js/pull/3098) @legendecas
+* feat(opentelemetry-sdk-metrics-base): added InMemoryMetricExporter [#3039](https://github.com/open-telemetry/opentelemetry-js/pull/3039) @weyert
 
 ### :bug: (Bug Fix)
 
 * fix(histogram): fix maximum when only values < -1 are provided [#3086](https://github.com/open-telemetry/opentelemetry-js/pull/3086) @pichlermarc
 * fix(sdk-metrics-base): fix PeriodicExportingMetricReader keeping Node.js process from exiting
  [#3106](https://github.com/open-telemetry/opentelemetry-js/pull/3106) @seemk
-
-### :books: (Refine Doc)
-
-### :house: (Internal)
+* fix(otlp-proto): fixes [#2791](https://github.com/open-telemetry/opentelemetry-js/issues/2791) otlp proto exporters no longer share a single global proto definition
+ [#3098](https://github.com/open-telemetry/opentelemetry-js/pull/3098) @legendecas
 
 ## 0.30.0
 

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.30.0",
+ "version": "0.31.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.30.0",
- "@opentelemetry/sdk-trace-base": "1.4.0"
+ "@opentelemetry/sdk-node": "0.31.0",
+ "@opentelemetry/sdk-trace-base": "1.5.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.30.0",
+ "version": "0.31.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.30.0",
- "@opentelemetry/sdk-trace-base": "1.4.0"
+ "@opentelemetry/sdk-node": "0.31.0",
+ "@opentelemetry/sdk-trace-base": "1.5.0"
  },
  "devDependencies": {
  "@types/node": "^16.0.0",

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.30.0",
+ "version": "0.31.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.30.0",
+ "@opentelemetry/otlp-exporter-base": "0.31.0",
  "@types/mocha": "8.2.3",
  "@types/node": "14.17.33",
  "@types/sinon": "10.0.6",
@@ -69,10 +69,11 @@
  "dependencies": {
  "@grpc/grpc-js": "^1.5.9",
  "@grpc/proto-loader": "^0.6.9",
- "@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"
- }
+ "@opentelemetry/core": "1.5.0",
+ "@opentelemetry/otlp-grpc-exporter-base": "0.31.0",
+ "@opentelemetry/otlp-transformer": "0.31.0",
+ "@opentelemetry/resources": "1.5.0",
+ "@opentelemetry/sdk-trace-base": "1.5.0"
+ },
+ "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-grpc"
 }
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.30.0",
+ "version": "0.31.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,11 @@
  "@opentelemetry/api": "^1.0.0"
  },
  "dependencies": {
- "@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"
- }
+ "@opentelemetry/core": "1.5.0",
+ "@opentelemetry/otlp-exporter-base": "0.31.0",
+ "@opentelemetry/otlp-transformer": "0.31.0",
+ "@opentelemetry/resources": "1.5.0",
+ "@opentelemetry/sdk-trace-base": "1.5.0"
+ },
+ "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-http"
 }
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.30.0",
+ "version": "0.31.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,13 @@
  },
  "dependencies": {
  "@grpc/proto-loader": "^0.6.9",
- "@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",
+ "@opentelemetry/core": "1.5.0",
+ "@opentelemetry/otlp-exporter-base": "0.31.0",
+ "@opentelemetry/otlp-proto-exporter-base": "0.31.0",
+ "@opentelemetry/otlp-transformer": "0.31.0",
+ "@opentelemetry/resources": "1.5.0",
+ "@opentelemetry/sdk-trace-base": "1.5.0",
  "protobufjs": "^6.9.0"
- }
+ },
+ "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-proto"
 }
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.30.0",
+ "version": "0.31.0",
  "description": "Public metrics API for OpenTelemetry",
  "main": "build/src/index.js",
  "module": "build/esm/index.js",
@@ -81,5 +81,6 @@
  "ts-mocha": "9.0.2",
  "typescript": "4.4.4",
  "webpack": "4.46.0"
- }
+ },
+ "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-api-metrics"
 }
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.30.0",
+ "version": "0.31.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.30.0",
+ "@opentelemetry/api-metrics": "0.31.0",
  "@types/mocha": "8.2.3",
  "@types/node": "14.17.33",
  "@types/sinon": "10.0.6",
@@ -69,11 +69,12 @@
  "dependencies": {
  "@grpc/grpc-js": "^1.5.9",
  "@grpc/proto-loader": "^0.6.9",
- "@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"
- }
+ "@opentelemetry/core": "1.5.0",
+ "@opentelemetry/exporter-metrics-otlp-http": "0.31.0",
+ "@opentelemetry/otlp-grpc-exporter-base": "0.31.0",
+ "@opentelemetry/otlp-transformer": "0.31.0",
+ "@opentelemetry/resources": "1.5.0",
+ "@opentelemetry/sdk-metrics-base": "0.31.0"
+ },
+ "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc"
 }
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.30.0",
+ "version": "0.31.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,12 @@
  "@opentelemetry/api": "^1.0.0"
  },
  "dependencies": {
- "@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"
- }
+ "@opentelemetry/api-metrics": "0.31.0",
+ "@opentelemetry/core": "1.5.0",
+ "@opentelemetry/otlp-exporter-base": "0.31.0",
+ "@opentelemetry/otlp-transformer": "0.31.0",
+ "@opentelemetry/resources": "1.5.0",
+ "@opentelemetry/sdk-metrics-base": "0.31.0"
+ },
+ "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-metrics-otlp-http"
 }