Merge branch 'main' into dluna/knex-semconv-strings

.github/component-label-map.yml

@@ -61,7 +61,6 @@ pkg:instrumentation-aws-lambda:
   - changed-files:
       - any-glob-to-any-file:
           - plugins/node/opentelemetry-instrumentation-aws-lambda/**
-          - propagators/opentelemetry-propagator-aws-xray/**
 pkg:instrumentation-aws-sdk:
   - changed-files:
       - any-glob-to-any-file:
@@ -246,10 +245,6 @@ pkg:propagation-utils:
       - any-glob-to-any-file:
           - packages/opentelemetry-propagation-utils/**
           - packages/opentelemetry-test-utils/**
-pkg:propagator-aws-xray:
-  - changed-files:
-      - any-glob-to-any-file:
-          - propagators/opentelemetry-propagator-aws-xray/**
 pkg:propagator-grpc-census-binary:
   - changed-files:
       - any-glob-to-any-file:

.github/component_owners.yml

@@ -138,8 +138,6 @@ components:
     - obecny
   plugins/web/opentelemetry-plugin-react-load:
     - martinkuba
-  propagators/opentelemetry-propagator-aws-xray:
-    - carolabadeer
   propagators/opentelemetry-propagator-grpc-census-binary: []
     # Unmaintained?
   propagators/opentelemetry-propagator-instana:

.release-please-manifest.json

@@ -56,7 +56,6 @@
   "plugins/web/opentelemetry-instrumentation-long-task": "0.37.0",
   "plugins/web/opentelemetry-instrumentation-user-interaction": "0.37.0",
   "plugins/web/opentelemetry-plugin-react-load": "0.30.0",
-  "propagators/opentelemetry-propagator-aws-xray": "1.3.1",
   "propagators/opentelemetry-propagator-grpc-census-binary": "0.27.1",
   "propagators/opentelemetry-propagator-instana": "0.3.1",
   "propagators/opentelemetry-propagator-ot-trace": "0.27.1"

plugins/node/instrumentation-undici/test/undici.test.ts

@@ -119,6 +119,10 @@ describe('UndiciInstrumentation `undici` tests', function () {
     propagation.disable();
     mockServer.mockListener(undefined);
     mockServer.stop(done);
+
+    // Close kept-alive sockets. This can save a 4s keep-alive delay before the
+    // process exits.
+    (undici as any).getGlobalDispatcher().close();
   });
 
   beforeEach(function () {
@@ -216,11 +220,27 @@ describe('UndiciInstrumentation `undici` tests', function () {
       };
 
       const queryRequestUrl = `${protocol}://${hostname}:${mockServer.port}/?query=test`;
-      const firstQueryResponse = await undici.request(queryRequestUrl, {
-        headers,
-        // @ts-expect-error - method type expects in uppercase
-        method: 'get',
-      });
+      let firstQueryResponse;
+      try {
+        firstQueryResponse = await undici.request(queryRequestUrl, {
+          headers,
+          // @ts-expect-error - method type expects in uppercase
+          method: 'get',
+        });
+      } catch (err: any) {
+        // This request is using a bogus HTTP method `get`. If (a) using Node.js
+        // v14, v16, or early v18.x versions and (b) this request is re-using
+        // a socket (from an earlier keep-alive request in this test file),
+        // then Node.js will emit 'end' on the socket. Undici then throws
+        // `SocketError: other side closed`.  Given this is only for old Node.js
+        // versions and for this rare case of using a bogus HTTP method, we will
+        // skip out of this test instead of attempting to fully understand it.
+        assert.strictEqual(err.message, 'other side closed');
+        this.skip();
+      }
+      if (!firstQueryResponse) {
+        return;
+      }
       await consumeResponseBody(firstQueryResponse.body);
 
       const secondQueryResponse = await undici.request(queryRequestUrl, {