Merge remote-tracking branch 'origin/next' into main-to-next-12-1

dyladan · Dec 1, 2023 · de11cb9 · de11cb9
2 parents 6dd075c + 35be022
commit de11cb9
Show file tree

Hide file tree

Showing 60 changed files with 3,241 additions and 11,519 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         node_version:
-          - "18"
+          - 18
     runs-on: self-hosted
     timeout-minutes: 10
     env:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v4
         with:
-          node-version: '16'
+          node-version: 18
 
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -12,10 +12,12 @@ jobs:
       fail-fast: false
       matrix:
         node_version:
-          - "14"
-          - "16"
           - "18"
+<<<<<<< HEAD
           - "20"
+=======
+          # - "20" # disabled until http instrumentation can be fixed
+>>>>>>> origin/next
     runs-on: ubuntu-latest
     env:
       NPM_CONFIG_UNSAFE_PERM: true
@@ -28,11 +30,6 @@ 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: Bootstrap
         run: npm ci
@@ -43,13 +40,11 @@ jobs:
       - name: Unit tests
         run: |
           # TODO(legendecas): webpack https://stackoverflow.com/questions/69692842/error-message-error0308010cdigital-envelope-routinesunsupported
-          if [ "${{ matrix.node_version }}" = "18" ] || [ "${{ matrix.node_version }}" == "20" ]; then
-            export NODE_OPTIONS=--openssl-legacy-provider
-          fi
+          export NODE_OPTIONS=--openssl-legacy-provider
           npm run test
       - name: Report Coverage
         run: npm run codecov
-        if: ${{ matrix.node_version == '14' }}
+        if: ${{ matrix.node_version == '18' }}
   node-windows-tests:
     runs-on: windows-latest
     env:
@@ -86,7 +81,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
 
       - name: Bootstrap
         run: npm ci
@@ -107,7 +102,7 @@ jobs:
         uses: actions/checkout@v4.0.0
       - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
 
       - name: Bootstrap
         run: npm ci
@@ -127,6 +122,8 @@ jobs:
           - "8"
           - "10"
           - "12"
+          - "14"
+          - "16"
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/w3c-integration-test.yml b/.github/workflows/w3c-integration-test.yml
@@ -16,7 +16,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: '16'
+          node-version: 18
 
       - name: Install and Bootstrap 🔧
         run: npm ci

diff --git a/examples/basic-tracer-node/package.json b/examples/basic-tracer-node/package.json
@@ -16,7 +16,7 @@
     "tracing"
   ],
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",

diff --git a/examples/esm-http-ts/package.json b/examples/esm-http-ts/package.json
@@ -21,7 +21,7 @@
     "typescript"
   ],
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",

diff --git a/examples/grpc-js/package.json b/examples/grpc-js/package.json
@@ -20,7 +20,7 @@
     "tracing"
   ],
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",

diff --git a/examples/http/package.json b/examples/http/package.json
@@ -20,7 +20,7 @@
     "tracing"
   ],
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",

diff --git a/examples/https/package.json b/examples/https/package.json
@@ -24,7 +24,7 @@
     "tracing"
   ],
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",

diff --git a/examples/opentelemetry-web/package.json b/examples/opentelemetry-web/package.json
@@ -24,7 +24,7 @@
     "web"
   ],
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",

diff --git a/examples/opentracing-shim/package.json b/examples/opentracing-shim/package.json
@@ -21,7 +21,7 @@
     "opentracing"
   ],
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",

diff --git a/examples/otlp-exporter-node/package.json b/examples/otlp-exporter-node/package.json
@@ -20,7 +20,7 @@
     "tracing"
   ],
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",

diff --git a/experimental/backwards-compatibility/node14/package.json b/experimental/backwards-compatibility/node14/package.json
@@ -19,6 +19,6 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   }
 }
diff --git a/experimental/backwards-compatibility/node16/package.json b/experimental/backwards-compatibility/node16/package.json
@@ -19,6 +19,6 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   }
 }
diff --git a/experimental/examples/opencensus-shim/package.json b/experimental/examples/opencensus-shim/package.json
@@ -19,7 +19,7 @@
     "opencensus"
   ],
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",

diff --git a/experimental/packages/api-events/package.json b/experimental/packages/api-events/package.json
@@ -41,7 +41,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "files": [
     "build/esm/**/*.js",

diff --git a/experimental/packages/api-logs/package.json b/experimental/packages/api-logs/package.json
@@ -41,7 +41,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "files": [
     "build/esm/**/*.js",

diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json
@@ -33,7 +33,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json
@@ -26,7 +26,7 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "scripts": {
     "prepublishOnly": "npm run compile",

diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json
@@ -42,7 +42,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "files": [
     "build/esm/**/*.js",

diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json
@@ -32,7 +32,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json
@@ -43,7 +43,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "files": [
     "build/esm/**/*.js",

diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json
@@ -41,7 +41,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "files": [
     "build/esm/**/*.js",

diff --git a/experimental/packages/opentelemetry-browser-detector/package.json b/experimental/packages/opentelemetry-browser-detector/package.json
@@ -33,7 +33,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "files": [
     "build/esm/**/*.js",

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json
@@ -32,7 +32,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json
@@ -43,7 +43,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "files": [
     "build/esm/**/*.js",

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json
@@ -34,7 +34,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "files": [
     "build/esm/**/*.js",

diff --git a/experimental/packages/opentelemetry-exporter-prometheus/package.json b/experimental/packages/opentelemetry-exporter-prometheus/package.json
@@ -29,7 +29,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json
@@ -34,7 +34,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "files": [
     "build/esm/**/*.js",

diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json
@@ -32,7 +32,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json
@@ -31,7 +31,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json
@@ -34,7 +34,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "files": [
     "build/esm/**/*.js",

diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json
@@ -112,7 +112,7 @@
     "webpack-merge": "5.9.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "sideEffects": false
 }
diff --git a/experimental/packages/opentelemetry-instrumentation/test/node/InstrumentationBase.test.ts b/experimental/packages/opentelemetry-instrumentation/test/node/InstrumentationBase.test.ts
@@ -17,12 +17,12 @@
 import * as assert from 'assert';
 import * as sinon from 'sinon';
 import * as path from 'path';
+import { InstrumentationBase } from '../../src';
 import {
-  InstrumentationBase,
-  InstrumentationModuleDefinition,
   InstrumentationNodeModuleDefinition,
+  InstrumentationModuleDefinition,
   InstrumentationNodeModuleFile,
-} from '../../src';
+} from '../../src/';
 
 const MODULE_NAME = 'test-module';
 const MODULE_FILE_NAME = 'test-module-file';

diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json
@@ -31,7 +31,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json
@@ -42,7 +42,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "files": [
     "build/esm/**/*.js",

diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json
@@ -34,7 +34,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "files": [
     "build/src/**/*.js",