Merge remote-tracking branch 'upstream/main' into metrics-ff/reader-a…

…ggregation # Conflicts: # experimental/packages/opentelemetry-sdk-metrics/src/index.ts # experimental/packages/opentelemetry-sdk-metrics/test/state/MeterSharedState.test.ts
open-telemetry · Aug 31, 2022 · ac40e73 · ac40e73
2 parents fabdaf4 + bd9159a
commit ac40e73
Show file tree

Hide file tree

Showing 50 changed files with 356 additions and 261 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,16 @@ All notable changes to this project will be documented in this file.
 
 ### :rocket: (Enhancement)
 
+### :bug: (Bug Fix)
+
+### :books: (Refine Doc)
+
+### :house: (Internal)
+
+## 1.6.0
+
+### :rocket: (Enhancement)
+
 * perf(opentelemetry-core): improve hexToBase64 performance [#3178](https://github.com/open-telemetry/opentelemetry-js/pull/3178)
 * feat(sdk-trace-base): move Sampler declaration into sdk-trace-base [#3088](https://github.com/open-telemetry/opentelemetry-js/pull/3088) @legendecas
 * fix(grpc-instrumentation): added grpc attributes in instrumentation [#3127](https://github.com/open-telemetry/opentelemetry-js/pull/3127) @andrewzenkov

diff --git a/README.md b/README.md
@@ -45,8 +45,10 @@ 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.2.x       | 1.6.x        | 0.32.x                |
+| 1.1.x       | 1.5.x        | 0.31.x                |
+| 1.1.x       | 1.4.x        | 0.30.x                |
+| 1.1.x       | 1.2.x, 1.3.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       | -----                 |
@@ -225,12 +227,12 @@ Maintainers ([@open-telemetry/js-maintainers](https://github.com/orgs/open-telem
 
 ### Implementation / SDKs
 
-| Package                                         | Description                                                                                                                                                                                                                                           |
-| ----------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [@opentelemetry/sdk-trace-base][otel-tracing]   | This module provides a full control over instrumentation and span creation. It doesn't load [`async_hooks`](https://nodejs.org/api/async_hooks.html) or any instrumentation by default. It is intended for use both on the server and in the browser. |
-| [@opentelemetry/sdk-metrics][otel-metrics] | This module provides instruments and meters for reporting of time series data.                                                                                                                                                                        |
-| [@opentelemetry/sdk-trace-node][otel-node]      | This module provides automatic tracing for Node.js applications. It is intended for use on the server only.                                                                                                                                           |
-| [@opentelemetry/sdk-trace-web][otel-web]        | This module provides automated instrumentation and tracing for Web applications. It is intended for use in the browser only.                                                                                                                          |
+| Package                                       | Description                                                                                                                                                                                                                                           |
+| --------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [@opentelemetry/sdk-trace-base][otel-tracing] | This module provides a full control over instrumentation and span creation. It doesn't load [`async_hooks`](https://nodejs.org/api/async_hooks.html) or any instrumentation by default. It is intended for use both on the server and in the browser. |
+| [@opentelemetry/sdk-metrics][otel-metrics]    | This module provides instruments and meters for reporting of time series data.                                                                                                                                                                        |
+| [@opentelemetry/sdk-trace-node][otel-node]    | This module provides automatic tracing for Node.js applications. It is intended for use on the server only.                                                                                                                                           |
+| [@opentelemetry/sdk-trace-web][otel-web]      | This module provides automated instrumentation and tracing for Web applications. It is intended for use in the browser only.                                                                                                                          |
 
 ### Compatible Exporters
 

diff --git a/eslint.config.js b/eslint.config.js
@@ -13,7 +13,7 @@ module.exports = {
     "indent": ["error", 2, { "SwitchCase": 1 }],
     "no-trailing-spaces": "error",
     "eol-last": "error",
-    "quotes": [2, "single", { "avoidEscape": true }],
+    "quotes": ["error", "single", { "avoidEscape": true }],
     "brace-style": ["error", "1tbs"],
     "eqeqeq": [
       "error",
@@ -24,7 +24,7 @@ module.exports = {
     "no-shadow": "off",
     "arrow-parens": ["error", "as-needed"],
     "node/no-deprecated-api": ["warn"],
-    "header/header": [2, "block", [{
+    "header/header": ["error", "block", [{
       pattern: / \* Copyright The OpenTelemetry Authors[\r\n]+ \*[\r\n]+ \* Licensed under the Apache License, Version 2\.0 \(the \"License\"\);[\r\n]+ \* you may not use this file except in compliance with the License\.[\r\n]+ \* You may obtain a copy of the License at[\r\n]+ \*[\r\n]+ \*      https:\/\/www\.apache\.org\/licenses\/LICENSE-2\.0[\r\n]+ \*[\r\n]+ \* Unless required by applicable law or agreed to in writing, software[\r\n]+ \* distributed under the License is distributed on an \"AS IS\" BASIS,[\r\n]+ \* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.[\r\n]+ \* See the License for the specific language governing permissions and[\r\n]+ \* limitations under the License\./gm,
       template:
         `\n * Copyright The OpenTelemetry Authors\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n `
@@ -34,7 +34,7 @@ module.exports = {
     {
       files: ['*.ts'],
       rules: {
-        "@typescript-eslint/no-floating-promises": 2,
+        "@typescript-eslint/no-floating-promises": "error",
         "@typescript-eslint/no-this-alias": "off",
         "@typescript-eslint/naming-convention": [
           "error",
@@ -45,7 +45,6 @@ module.exports = {
             "leadingUnderscore": "require"
           }
         ],
-        "@typescript-eslint/no-shadow": ["warn"],
         "@typescript-eslint/no-unused-vars": ["error", {"argsIgnorePattern": "^_", "args": "after-used"}],
         "@typescript-eslint/no-inferrable-types": ["error", { ignoreProperties: true }],
         "@typescript-eslint/no-empty-function": ["off"],
@@ -65,7 +64,6 @@ module.exports = {
         "@typescript-eslint/ban-ts-ignore": "off",
         "@typescript-eslint/no-empty-function": "off",
         "@typescript-eslint/no-explicit-any": "off",
-        "@typescript-eslint/no-floating-promises": 1,
         "@typescript-eslint/no-unused-vars": "off",
         "@typescript-eslint/no-var-requires": "off",
         "@typescript-eslint/no-shadow": ["off"],

diff --git a/examples/https/package.json b/examples/https/package.json
@@ -1,7 +1,7 @@
 {
   "name": "https-example",
   "private": true,
-  "version": "0.31.0",
+  "version": "0.32.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.5.0",
-    "@opentelemetry/exporter-zipkin": "1.5.0",
-    "@opentelemetry/instrumentation": "0.31.0",
-    "@opentelemetry/instrumentation-http": "0.31.0",
-    "@opentelemetry/resources": "1.5.0",
-    "@opentelemetry/sdk-trace-base": "1.5.0",
-    "@opentelemetry/sdk-trace-node": "1.5.0",
-    "@opentelemetry/semantic-conventions": "1.5.0"
+    "@opentelemetry/exporter-jaeger": "1.6.0",
+    "@opentelemetry/exporter-zipkin": "1.6.0",
+    "@opentelemetry/instrumentation": "0.32.0",
+    "@opentelemetry/instrumentation-http": "0.32.0",
+    "@opentelemetry/resources": "1.6.0",
+    "@opentelemetry/sdk-trace-base": "1.6.0",
+    "@opentelemetry/sdk-trace-node": "1.6.0",
+    "@opentelemetry/semantic-conventions": "1.6.0"
   },
   "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.31.0",
+  "version": "0.32.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.0.2",
-    "@opentelemetry/api-metrics": "0.31.0",
-    "@opentelemetry/context-zone": "^1.0.1",
-    "@opentelemetry/core": "^1.0.1",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.31.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.31.0",
-    "@opentelemetry/exporter-zipkin": "^1.0.1",
-    "@opentelemetry/instrumentation": "0.31.0",
-    "@opentelemetry/instrumentation-fetch": "0.31.0",
-    "@opentelemetry/instrumentation-xml-http-request": "0.31.0",
-    "@opentelemetry/propagator-b3": "^1.0.1",
-    "@opentelemetry/sdk-metrics": "0.31.0",
-    "@opentelemetry/sdk-trace-base": "^1.0.1",
-    "@opentelemetry/sdk-trace-web": "^1.0.1",
-    "@opentelemetry/semantic-conventions": "^1.0.1"
+    "@opentelemetry/api-metrics": "0.32.0",
+    "@opentelemetry/context-zone": "1.6.0",
+    "@opentelemetry/core": "1.6.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.32.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.32.0",
+    "@opentelemetry/exporter-zipkin": "1.6.0",
+    "@opentelemetry/instrumentation": "0.32.0",
+    "@opentelemetry/instrumentation-fetch": "0.32.0",
+    "@opentelemetry/instrumentation-xml-http-request": "0.32.0",
+    "@opentelemetry/propagator-b3": "1.6.0",
+    "@opentelemetry/sdk-metrics": "0.32.0",
+    "@opentelemetry/sdk-trace-base": "1.6.0",
+    "@opentelemetry/sdk-trace-web": "1.6.0",
+    "@opentelemetry/semantic-conventions": "1.6.0"
   },
   "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.31.0",
+  "version": "0.32.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.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": "0.31.0",
-    "@opentelemetry/sdk-trace-base": "1.5.0",
-    "@opentelemetry/semantic-conventions": "1.5.0"
+    "@opentelemetry/api-metrics": "0.32.0",
+    "@opentelemetry/core": "1.6.0",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "0.32.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.32.0",
+    "@opentelemetry/exporter-metrics-otlp-proto": "0.32.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.32.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.32.0",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.32.0",
+    "@opentelemetry/resources": "1.6.0",
+    "@opentelemetry/sdk-metrics": "0.32.0",
+    "@opentelemetry/sdk-trace-base": "1.6.0",
+    "@opentelemetry/semantic-conventions": "1.6.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
 }
diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
@@ -6,6 +6,28 @@ All notable changes to experimental packages in this project will be documented
 
 ### :boom: Breaking Change
 
+* chore(metrics-sdk): clean up exports [#3197](https://github.com/open-telemetry/opentelemetry-js/pull/3197) @pichlermarc
+  * removes export for:
+    * `AccumulationRecord`
+    * `Aggregator`
+    * `AggregatorKind`
+    * `Accumulation`
+    * `createInstrumentDescriptor`
+    * `createInstrumentDescriptorWithView`
+    * `isDescriptorCompatibleWith`
+
+### :rocket: (Enhancement)
+
+### :bug: (Bug Fix)
+
+### :books: (Refine Doc)
+
+### :house: (Internal)
+
+## 0.32.0
+
+### :boom: Breaking Change
+
 * Rename @opentelemetry/sdk-metrics-base package to @opentelemetry/sdk-metrics  [#3162](https://github.com/open-telemetry/opentelemetry-js/pull/3162) @hectorhdzg
 
 ### :rocket: (Enhancement)
@@ -20,10 +42,6 @@ All notable changes to experimental packages in this project will be documented
 
 * fix(instrumentation-http): add `http.host` attribute before sending the request #3054 @cuichenli
 
-### :books: (Refine Doc)
-
-### :house: (Internal)
-
 ## 0.31.0
 
 ### :boom: Breaking Change

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.31.0",
+  "version": "0.32.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.31.0",
-    "@opentelemetry/sdk-trace-base": "1.5.0"
+    "@opentelemetry/sdk-node": "0.32.0",
+    "@opentelemetry/sdk-trace-base": "1.6.0"
   },
   "devDependencies": {
     "@types/node": "14.18.25",

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.31.0",
+  "version": "0.32.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.31.0",
-    "@opentelemetry/sdk-trace-base": "1.5.0"
+    "@opentelemetry/sdk-node": "0.32.0",
+    "@opentelemetry/sdk-trace-base": "1.6.0"
   },
   "devDependencies": {
     "@types/node": "16.11.52",

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.31.0",
+  "version": "0.32.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.31.0",
+    "@opentelemetry/otlp-exporter-base": "0.32.0",
     "@types/mocha": "9.1.1",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.13",
@@ -69,11 +69,11 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.5.9",
     "@grpc/proto-loader": "^0.6.9",
-    "@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"
+    "@opentelemetry/core": "1.6.0",
+    "@opentelemetry/otlp-grpc-exporter-base": "0.32.0",
+    "@opentelemetry/otlp-transformer": "0.32.0",
+    "@opentelemetry/resources": "1.6.0",
+    "@opentelemetry/sdk-trace-base": "1.6.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.31.0",
+  "version": "0.32.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,11 +94,11 @@
     "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
-    "@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"
+    "@opentelemetry/core": "1.6.0",
+    "@opentelemetry/otlp-exporter-base": "0.32.0",
+    "@opentelemetry/otlp-transformer": "0.32.0",
+    "@opentelemetry/resources": "1.6.0",
+    "@opentelemetry/sdk-trace-base": "1.6.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.31.0",
+  "version": "0.32.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.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",
+    "@opentelemetry/core": "1.6.0",
+    "@opentelemetry/otlp-exporter-base": "0.32.0",
+    "@opentelemetry/otlp-proto-exporter-base": "0.32.0",
+    "@opentelemetry/otlp-transformer": "0.32.0",
+    "@opentelemetry/resources": "1.6.0",
+    "@opentelemetry/sdk-trace-base": "1.6.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.31.0",
+  "version": "0.32.0",
   "description": "Public metrics API for OpenTelemetry",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",