Merge pull request open-telemetry#183 from opentelemetrybot/opentelem…

…etrybot/merge-main [AutoMerge][Main] Merging staged change(s) to main
opentelemetrybot · Sep 7, 2023 · 521dc11 · 521dc11
2 parents 82e6b85 + 0d515cb
commit 521dc11
Show file tree

Hide file tree

Showing 21 changed files with 1,149 additions and 204 deletions.
diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-gcp/package.json b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-gcp/package.json
@@ -45,7 +45,7 @@
     "@opentelemetry/contrib-test-utils": "^0.34.1",
     "@types/mocha": "8.2.3",
     "@types/node": "18.6.5",
-    "@types/semver": "7.5.0",
+    "@types/semver": "7.5.1",
     "mocha": "7.2.0",
     "nock": "13.3.3",
     "nyc": "15.1.0",

diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-instana/package.json b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-instana/package.json
@@ -44,7 +44,7 @@
     "@opentelemetry/sdk-node": "^0.41.2",
     "@types/mocha": "8.2.3",
     "@types/node": "18.6.5",
-    "@types/semver": "7.5.0",
+    "@types/semver": "7.5.1",
     "mocha": "7.2.0",
     "nock": "13.3.3",
     "nyc": "15.1.0",

diff --git a/auto-merge/contrib/plugins/node/instrumentation-cucumber/package.json b/auto-merge/contrib/plugins/node/instrumentation-cucumber/package.json
@@ -52,7 +52,7 @@
     "@opentelemetry/sdk-trace-base": "^1.3.1",
     "@opentelemetry/sdk-trace-node": "^1.3.1",
     "@types/mocha": "7.0.2",
-    "@types/semver": "7.5.0",
+    "@types/semver": "7.5.1",
     "@types/shimmer": "1.0.2",
     "@types/sinon": "10.0.16",
     "mocha": "7.2.0",

diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-cassandra/package.json
@@ -53,7 +53,7 @@
     "@opentelemetry/sdk-trace-node": "^1.8.0",
     "@types/mocha": "7.0.2",
     "@types/node": "18.6.5",
-    "@types/semver": "7.5.0",
+    "@types/semver": "7.5.1",
     "@types/sinon": "10.0.16",
     "cassandra-driver": "4.6.4",
     "mocha": "7.2.0",

diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-dns/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-dns/package.json
@@ -51,7 +51,7 @@
     "@opentelemetry/sdk-trace-node": "^1.8.0",
     "@types/mocha": "7.0.2",
     "@types/node": "18.6.5",
-    "@types/semver": "7.5.0",
+    "@types/semver": "7.5.1",
     "@types/shimmer": "1.0.2",
     "@types/sinon": "10.0.16",
     "mocha": "7.2.0",

diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-generic-pool/package.json
@@ -52,7 +52,7 @@
     "@types/generic-pool": "^3.1.9",
     "@types/mocha": "7.0.2",
     "@types/node": "18.6.5",
-    "@types/semver": "7.5.0",
+    "@types/semver": "7.5.1",
     "generic-pool": "3.8.2",
     "mocha": "7.2.0",
     "nyc": "15.1.0",

diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-mysql2/package.json
@@ -54,7 +54,7 @@
     "@types/mocha": "7.0.2",
     "@types/mysql2": "github:types/mysql2",
     "@types/node": "18.6.5",
-    "@types/semver": "7.5.0",
+    "@types/semver": "7.5.1",
     "mocha": "7.2.0",
     "mysql2": "2.3.3",
     "nyc": "15.1.0",

diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json
@@ -59,7 +59,7 @@
     "@opentelemetry/sdk-trace-node": "^1.8.0",
     "@types/mocha": "7.0.2",
     "@types/node": "18.6.5",
-    "@types/semver": "7.5.0",
+    "@types/semver": "7.5.1",
     "cross-env": "7.0.3",
     "mocha": "7.2.0",
     "nyc": "15.1.0",

diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/package.json
@@ -53,7 +53,7 @@
     "@opentelemetry/sdk-trace-node": "^1.8.0",
     "@types/mocha": "7.0.2",
     "@types/node": "18.6.5",
-    "@types/semver": "7.5.0",
+    "@types/semver": "7.5.1",
     "@types/sinon": "10.0.16",
     "mocha": "7.2.0",
     "nyc": "15.1.0",

diff --git a/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-restify/package.json b/auto-merge/contrib/plugins/node/opentelemetry-instrumentation-restify/package.json
@@ -53,7 +53,7 @@
     "@types/mocha": "7.0.2",
     "@types/node": "18.6.5",
     "@types/restify": "4.3.9",
-    "@types/semver": "7.5.0",
+    "@types/semver": "7.5.1",
     "mocha": "7.2.0",
     "nyc": "15.1.0",
     "restify": "11.1.0",

diff --git a/auto-merge/contrib/propagators/opentelemetry-propagator-instana/package.json b/auto-merge/contrib/propagators/opentelemetry-propagator-instana/package.json
@@ -65,7 +65,7 @@
     "nyc": "15.1.0",
     "process": "0.11.10",
     "ts-loader": "8.3.0",
-    "ts-mocha": "8.0.0",
+    "ts-mocha": "10.0.0",
     "typescript": "4.4.4",
     "webpack": "4.46.0",
     "webpack-cli": "4.9.2"

diff --git a/auto-merge/js/.github/workflows/unit-test.yml b/auto-merge/js/.github/workflows/unit-test.yml
@@ -27,6 +27,11 @@ jobs:
           node-version: ${{ matrix.node_version }}
 
       - run: npm install -g npm@latest
+        if: ${{ matrix.node_version == '18' || matrix.node_version == '20' }}
+
+      # npm@10.0.0 drops support for Node.js v14 and v16
+      - run: npm install -g npm@"<10.0.0"
+        if: ${{ matrix.node_version == '14' || matrix.node_version == '16' }}
 
       - name: restore lerna
         id: cache
@@ -41,6 +46,10 @@ jobs:
             experimental/packages/*/package-lock.json
           key: node-tests-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}-04292022
 
+      # temporary fix for https://github.com/nrwl/nx/issues/19022
+      - run: npm install --save-dev nx@16.7.4 @nx/devkit@16.7.4
+        if: ${{ matrix.node_version == '14' }}
+
       - name: Bootstrap
         run: |
           npm install --ignore-scripts
@@ -70,7 +79,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '18'
 
       - run: npm install -g npm@latest
 
@@ -98,6 +107,8 @@ jobs:
           npm run compile
 
       - name: Unit tests
+        env:
+         NODE_OPTIONS: --openssl-legacy-provider
         run: npm run test
   browser-tests:
     runs-on: ubuntu-latest

diff --git a/auto-merge/js/CHANGELOG.md b/auto-merge/js/CHANGELOG.md
@@ -18,6 +18,7 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 ### :bug: (Bug Fix)
 
 * fix(exporter-zipkin): rounding duration to the nearest int to be compliant with zipkin protocol [#4064](https://github.com/open-telemetry/opentelemetry-js/pull/4064) @n0cloud
+* fix(sdk-metrics): metric names should be case-insensitive
 
 ### :books: (Refine Doc)
 

diff --git a/auto-merge/js/doc/tracing.md b/auto-merge/js/doc/tracing.md
@@ -79,7 +79,7 @@ server.on("GET", "/user/:id", onGet);
 Using span relationships, attributes, kind, and the related [semantic conventions](https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/trace/semantic_conventions), we can more accurately describe the span in a way our tracing backend will more easily understand. The following example uses these mechanisms, which are described below.
 
 ```typescript
-import { NetTransportValues SemanticAttributes } from '@opentelemetry/semantic-conventions';
+import { NetTransportValues, SemanticAttributes } from '@opentelemetry/semantic-conventions';
 import { trace, context, SpanKind, SpanStatusCode } from '@opentelemetry/api';
 
 async function onGet(request, response) {

diff --git a/auto-merge/js/package.json b/auto-merge/js/package.json
@@ -74,7 +74,7 @@
     "lerna": "7.1.5",
     "@lerna/legacy-package-management": "7.1.5",
     "linkinator": "5.0.2",
-    "markdownlint-cli": "0.35.0",
+    "markdownlint-cli": "0.36.0",
     "prettier": "3.0.3",
     "semver": "7.5.4",
     "typedoc": "0.22.18",