Merge branch 'main' into rm-otlp-attrib

.github/workflows/codeql-analysis.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

.github/workflows/docs.yaml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - uses: actions/setup-node@v3
         with:

.github/workflows/lint.yml

@@ -15,7 +15,7 @@ jobs:
         with:
           node-version: '14'
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Lint changelog file
         uses: avto-dev/markdown-lint@v1

.github/workflows/peer-api.yml

@@ -13,7 +13,7 @@ jobs:
       image: node:14
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install lerna
         run: npm install -g lerna

.github/workflows/unit-test.yml

@@ -16,7 +16,7 @@ jobs:
       NPM_CONFIG_UNSAFE_PERM: true
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - uses: actions/setup-node@v3
         with:
@@ -59,7 +59,7 @@ jobs:
       - name: Permission Setup
         run: sudo chmod -R 777 /github /__w
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: restore lerna
         id: cache
@@ -92,14 +92,14 @@ jobs:
   webworker-tests:
     runs-on: ubuntu-latest
     container:
-      image: circleci/node:14-browsers
+      image: circleci/node:16-browsers
     env:
       NPM_CONFIG_UNSAFE_PERM: true
     steps:
-      - name: Checkout
-        uses: actions/checkout@v1
       - name: Permission Setup
         run: sudo chmod -R 777 /github /__w
+      - name: Checkout
+        uses: actions/checkout@v3
 
       - name: restore lerna
         id: cache

.github/workflows/w3c-integration-test.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout 🛎️
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: restore lock files
         uses: actions/cache@master # must use unreleased master to cache multiple paths

CHANGELOG.md

@@ -6,6 +6,18 @@ All notable changes to this project will be documented in this file.
 
 ### :boom: Breaking Change
 
+### :rocket: (Enhancement)
+
+### :bug: (Bug Fix)
+
+### :books: (Refine Doc)
+
+### :house: (Internal)
+
+## 1.3.0
+
+### :boom: Breaking Change
+
 * chore: remove unused InstrumentationConfig#path [#2944](https://github.com/open-telemetry/opentelemetry-js/pull/2944) @flarna
 
 ### :rocket: (Enhancement)

examples/otlp-exporter-node/package.json

@@ -1,7 +1,7 @@
 {
   "name": "example-otlp-exporter-node",
   "private": true,
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "Example of using @opentelemetry/collector-exporter in Node.js",
   "main": "index.js",
   "scripts": {
@@ -29,18 +29,18 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.0.2",
-    "@opentelemetry/api-metrics": "0.28.0",
+    "@opentelemetry/api-metrics": "0.29.0",
     "@opentelemetry/core": "1.1.1",
-    "@opentelemetry/exporter-trace-otlp-http": "0.28.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.28.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.28.0",
-    "@opentelemetry/exporter-metrics-otlp-grpc": "0.28.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.28.0",
-    "@opentelemetry/exporter-metrics-otlp-proto": "0.28.0",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "0.29.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.29.0",
+    "@opentelemetry/exporter-metrics-otlp-proto": "0.29.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.29.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.29.0",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.29.0",
     "@opentelemetry/resources": "1.1.1",
-    "@opentelemetry/semantic-conventions": "1.1.1",
-    "@opentelemetry/sdk-metrics-base": "0.28.0",
-    "@opentelemetry/sdk-trace-base": "1.1.1"
+    "@opentelemetry/sdk-metrics-base": "0.29.0",
+    "@opentelemetry/sdk-trace-base": "1.1.1",
+    "@opentelemetry/semantic-conventions": "1.1.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
 }

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.29.0
+
+### :boom: Breaking Change
+
 * feat(metrics): metric readers and exporters now select aggregation temporality based on instrument type #2902 @seemk
 * refactor(metrics-sdk): rename InstrumentationLibrary -> InstrumentationScope #2959 @pichlermarc
 * feat(metrics): multi-instrument async callback support #2966 @legendecas
@@ -27,6 +39,9 @@ All notable changes to experimental packages in this project will be documented
 * fix(opentelemetry-instrumentation-http): use correct origin when port is `null` #2948 @danielgblanco
 * fix(otlp-exporter-base): include esm and esnext in package files #2952 @dyladan
 * fix(otlp-http-exporter): update endpoint to match spec #2895 @svetlanabrennan
+* fix(instrumentation): only patch core modules if enabled #2993 @santigimeno
+* fix(otlp-transformer): include esm and esnext in package files and update README #2992 @pichlermarc
+* fix(metrics): specification compliant default metric unit #2983 @andyfleming
 
 ### :books: (Refine Doc)
 

experimental/backwards-compatability/node10/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node10",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "private": true,
   "description": "Backwards compatability app for node8 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.28.0",
-    "@opentelemetry/sdk-trace-base": "1.2.0"
+    "@opentelemetry/sdk-node": "0.29.0",
+    "@opentelemetry/sdk-trace-base": "1.3.0"
   },
   "devDependencies": {
     "@types/node": "10.17.60",

experimental/backwards-compatability/node12/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node12",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "private": true,
   "description": "Backwards compatability app for node8 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.28.0",
-    "@opentelemetry/sdk-trace-base": "1.2.0"
+    "@opentelemetry/sdk-node": "0.29.0",
+    "@opentelemetry/sdk-trace-base": "1.3.0"
   },
   "devDependencies": {
     "@types/node": "12.20.37",

experimental/backwards-compatability/node8/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node8",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "private": true,
   "description": "Backwards compatability app for node8 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.28.0",
-    "@opentelemetry/sdk-trace-base": "1.2.0"
+    "@opentelemetry/sdk-node": "0.29.0",
+    "@opentelemetry/sdk-trace-base": "1.3.0"
   },
   "devDependencies": {
     "@types/node": "8.10.66",

experimental/packages/exporter-trace-otlp-grpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-trace-otlp-grpc",
-  "version": "0.28.0",
+  "version": "0.29.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.28.0",
+    "@opentelemetry/otlp-exporter-base": "0.29.0",
     "@types/mocha": "8.2.3",
     "@types/node": "14.17.33",
     "@types/sinon": "10.0.6",
@@ -67,12 +67,12 @@
     "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
-    "@opentelemetry/core": "1.2.0",
     "@grpc/grpc-js": "^1.5.9",
     "@grpc/proto-loader": "^0.6.9",
-    "@opentelemetry/otlp-transformer": "0.28.0",
-    "@opentelemetry/otlp-grpc-exporter-base": "0.28.0",
-    "@opentelemetry/resources": "1.2.0",
-    "@opentelemetry/sdk-trace-base": "1.2.0"
+    "@opentelemetry/core": "1.3.0",
+    "@opentelemetry/otlp-grpc-exporter-base": "0.29.0",
+    "@opentelemetry/otlp-transformer": "0.29.0",
+    "@opentelemetry/resources": "1.3.0",
+    "@opentelemetry/sdk-trace-base": "1.3.0"
   }
 }

experimental/packages/exporter-trace-otlp-http/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-trace-otlp-http",
-  "version": "0.28.0",
+  "version": "0.29.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.2.0",
-    "@opentelemetry/resources": "1.2.0",
-    "@opentelemetry/sdk-trace-base": "1.2.0",
-    "@opentelemetry/otlp-exporter-base": "0.28.0",
-    "@opentelemetry/otlp-transformer": "0.28.0"
+    "@opentelemetry/core": "1.3.0",
+    "@opentelemetry/otlp-exporter-base": "0.29.0",
+    "@opentelemetry/otlp-transformer": "0.29.0",
+    "@opentelemetry/resources": "1.3.0",
+    "@opentelemetry/sdk-trace-base": "1.3.0"
   }
 }

experimental/packages/exporter-trace-otlp-proto/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-trace-otlp-proto",
-  "version": "0.28.0",
+  "version": "0.29.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",
@@ -66,13 +66,13 @@
     "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
-    "@opentelemetry/core": "1.1.1",
     "@grpc/proto-loader": "^0.6.9",
-    "@opentelemetry/resources": "1.2.0",
-    "@opentelemetry/sdk-trace-base": "1.2.0",
-    "@opentelemetry/otlp-exporter-base": "0.28.0",
-    "@opentelemetry/otlp-proto-exporter-base": "0.28.0",
-    "protobufjs": "^6.9.0",
-    "@opentelemetry/otlp-transformer": "0.28.0"
+    "@opentelemetry/core": "1.1.1",
+    "@opentelemetry/otlp-exporter-base": "0.29.0",
+    "@opentelemetry/otlp-proto-exporter-base": "0.29.0",
+    "@opentelemetry/otlp-transformer": "0.29.0",
+    "@opentelemetry/resources": "1.3.0",
+    "@opentelemetry/sdk-trace-base": "1.3.0",
+    "protobufjs": "^6.9.0"
   }
 }

experimental/packages/opentelemetry-api-metrics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/api-metrics",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "description": "Public metrics API for OpenTelemetry",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",

experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-metrics-otlp-grpc",
-  "version": "0.28.0",
+  "version": "0.29.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.28.0",
+    "@opentelemetry/api-metrics": "0.29.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.2.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.28.0",
-    "@opentelemetry/otlp-grpc-exporter-base": "0.28.0",
-    "@opentelemetry/otlp-transformer": "0.28.0",
-    "@opentelemetry/resources": "1.2.0",
-    "@opentelemetry/sdk-metrics-base": "0.28.0"
+    "@opentelemetry/core": "1.3.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.29.0",
+    "@opentelemetry/otlp-grpc-exporter-base": "0.29.0",
+    "@opentelemetry/otlp-transformer": "0.29.0",
+    "@opentelemetry/resources": "1.3.0",
+    "@opentelemetry/sdk-metrics-base": "0.29.0"
   }
 }

experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/metricsHelper.ts

@@ -131,7 +131,7 @@ export function ensureExportedCounterIsCorrect(
   assert.deepStrictEqual(metric, {
     name: 'int-counter',
     description: 'sample counter description',
-    unit: '1',
+    unit: '',
     data: 'sum',
     sum: {
       dataPoints: [
@@ -159,7 +159,7 @@ export function ensureExportedObservableGaugeIsCorrect(
   assert.deepStrictEqual(metric, {
     name: 'double-observable-gauge',
     description: 'sample observable gauge description',
-    unit: '1',
+    unit: '',
     data: 'gauge',
     gauge: {
       dataPoints: [
@@ -187,7 +187,7 @@ export function ensureExportedHistogramIsCorrect(
   assert.deepStrictEqual(metric, {
     name: 'int-histogram',
     description: 'sample histogram description',
-    unit: '1',
+    unit: '',
     data: 'histogram',
     histogram: {
       dataPoints: [