Merge branch 'main' into fix/aws-resource-detector-timeout

open-telemetry · May 14, 2024 · 9acdeac · 9acdeac
2 parents 3768701 + fd51c1c
commit 9acdeac
Show file tree

Hide file tree

Showing 18 changed files with 385 additions and 1,488 deletions.
diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ["14", "16", "18.18.2"]
+        node: ["14", "16", "18"]
     runs-on: ubuntu-latest
     services:
       mongo:

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -9,9 +9,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ["14", "16", "18.18.2"]
+        node: ["14", "16", "18"]
         include:
-            - node: 18.18.2
+            - node: 18
               code-coverage: true
     runs-on: ubuntu-latest
     services:

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -57,7 +57,6 @@
   "plugins/web/opentelemetry-instrumentation-long-task": "0.38.0",
   "plugins/web/opentelemetry-instrumentation-user-interaction": "0.38.0",
   "plugins/web/opentelemetry-plugin-react-load": "0.30.1",
-  "propagators/opentelemetry-propagator-grpc-census-binary": "0.27.2",
   "propagators/opentelemetry-propagator-instana": "0.3.2",
   "propagators/opentelemetry-propagator-ot-trace": "0.27.2"
 }
diff --git a/...opagator-grpc-census-binary/.eslintignore → ...opagator-grpc-census-binary/.eslintignore b/...opagator-grpc-census-binary/.eslintignore → ...opagator-grpc-census-binary/.eslintignore
diff --git a/...ropagator-grpc-census-binary/.eslintrc.js → ...ropagator-grpc-census-binary/.eslintrc.js b/...ropagator-grpc-census-binary/.eslintrc.js → ...ropagator-grpc-census-binary/.eslintrc.js
diff --git a/...ropagator-grpc-census-binary/CHANGELOG.md → ...ropagator-grpc-census-binary/CHANGELOG.md b/...ropagator-grpc-census-binary/CHANGELOG.md → ...ropagator-grpc-census-binary/CHANGELOG.md
diff --git a/...try-propagator-grpc-census-binary/LICENSE → ...try-propagator-grpc-census-binary/LICENSE b/...try-propagator-grpc-census-binary/LICENSE → ...try-propagator-grpc-census-binary/LICENSE
diff --git a/...y-propagator-grpc-census-binary/README.md → ...y-propagator-grpc-census-binary/README.md b/...y-propagator-grpc-census-binary/README.md → ...y-propagator-grpc-census-binary/README.md
diff --git a/...ropagator-grpc-census-binary/package.json → ...ropagator-grpc-census-binary/package.json b/...ropagator-grpc-census-binary/package.json → ...ropagator-grpc-census-binary/package.json
diff --git a/...c-census-binary/src/BinaryTraceContext.ts → ...c-census-binary/src/BinaryTraceContext.ts b/...c-census-binary/src/BinaryTraceContext.ts → ...c-census-binary/src/BinaryTraceContext.ts
diff --git a/...census-binary/src/GrpcCensusPropagator.ts → ...census-binary/src/GrpcCensusPropagator.ts b/...census-binary/src/GrpcCensusPropagator.ts → ...census-binary/src/GrpcCensusPropagator.ts
diff --git a/...ropagator-grpc-census-binary/src/index.ts → ...ropagator-grpc-census-binary/src/index.ts b/...ropagator-grpc-census-binary/src/index.ts → ...ropagator-grpc-census-binary/src/index.ts
diff --git a/...us-binary/test/BinaryTraceContext.test.ts → ...us-binary/test/BinaryTraceContext.test.ts b/...us-binary/test/BinaryTraceContext.test.ts → ...us-binary/test/BinaryTraceContext.test.ts
diff --git a/...-binary/test/GrpcCensusPropagator.test.ts → ...-binary/test/GrpcCensusPropagator.test.ts b/...-binary/test/GrpcCensusPropagator.test.ts → ...-binary/test/GrpcCensusPropagator.test.ts
diff --git a/...opagator-grpc-census-binary/tsconfig.json → ...opagator-grpc-census-binary/tsconfig.json b/...opagator-grpc-census-binary/tsconfig.json → ...opagator-grpc-census-binary/tsconfig.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json
@@ -32,6 +32,7 @@
   },
   "files": [
     "build/src/**/*.js",
+    "build/src/**/*.js.map",
     "build/src/**/*.d.ts"
   ],
   "publishConfig": {

diff --git a/release-please-config.json b/release-please-config.json
@@ -64,7 +64,6 @@
     "plugins/web/opentelemetry-instrumentation-long-task": {},
     "plugins/web/opentelemetry-instrumentation-user-interaction": {},
     "plugins/web/opentelemetry-plugin-react-load": {},
-    "propagators/opentelemetry-propagator-grpc-census-binary": {},
     "propagators/opentelemetry-propagator-instana": {},
     "propagators/opentelemetry-propagator-ot-trace": {}
   }