Merge branch 'main' into set-output

.github/component_owners.yml

@@ -56,6 +56,9 @@ components:
     - rauno56
   plugins/node/opentelemetry-instrumentation-pg:
     - rauno56
+  plugins/node/opentelemetry-instrumentation-socket.io:
+    - mottibec
+    - rauno56
   plugins/web/opentelemetry-instrumentation-document-load:
     - obecny
   plugins/web/opentelemetry-instrumentation-long-task:

.release-please-manifest.json

@@ -1,2 +1,2 @@
-{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.27.3","detectors/node/opentelemetry-resource-detector-aws":"1.2.1","detectors/node/opentelemetry-resource-detector-container":"0.2.1","detectors/node/opentelemetry-resource-detector-gcp":"0.27.4","detectors/node/opentelemetry-resource-detector-github":"0.27.0","detectors/node/opentelemetry-resource-detector-instana":"0.4.0","metapackages/auto-instrumentations-node":"0.35.0","metapackages/auto-instrumentations-web":"0.31.0","packages/opentelemetry-host-metrics":"0.31.0","packages/opentelemetry-id-generator-aws-xray":"1.1.1","packages/opentelemetry-propagation-utils":"0.29.1","packages/opentelemetry-test-utils":"0.33.0","plugins/node/instrumentation-amqplib":"0.32.0","plugins/node/instrumentation-dataloader":"0.3.0","plugins/node/instrumentation-fs":"0.6.0","plugins/node/instrumentation-lru-memoizer":"0.32.0","plugins/node/instrumentation-mongoose":"0.32.0","plugins/node/instrumentation-tedious":"0.5.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.34.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.10.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.31.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.32.0","plugins/node/opentelemetry-instrumentation-connect":"0.31.0","plugins/node/opentelemetry-instrumentation-dns":"0.31.0","plugins/node/opentelemetry-instrumentation-express":"0.32.0","plugins/node/opentelemetry-instrumentation-fastify":"0.31.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.31.0","plugins/node/opentelemetry-instrumentation-graphql":"0.33.0","plugins/node/opentelemetry-instrumentation-hapi":"0.31.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.33.0","plugins/node/opentelemetry-instrumentation-knex":"0.31.0","plugins/node/opentelemetry-instrumentation-koa":"0.34.0","plugins/node/opentelemetry-instrumentation-memcached":"0.31.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.33.0","plugins/node/opentelemetry-instrumentation-mysql":"0.32.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.33.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.32.0","plugins/node/opentelemetry-instrumentation-net":"0.31.0","plugins/node/opentelemetry-instrumentation-pg":"0.33.0","plugins/node/opentelemetry-instrumentation-pino":"0.33.0","plugins/node/opentelemetry-instrumentation-redis":"0.34.0","plugins/node/opentelemetry-instrumentation-redis-4":"0.34.0","plugins/node/opentelemetry-instrumentation-restify":"0.31.0","plugins/node/opentelemetry-instrumentation-router":"0.32.0","plugins/node/opentelemetry-instrumentation-winston":"0.31.0","plugins/web/opentelemetry-instrumentation-document-load":"0.31.0","plugins/web/opentelemetry-instrumentation-long-task":"0.32.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.32.0","plugins/web/opentelemetry-plugin-react-load":"0.28.1","propagators/opentelemetry-propagator-aws-xray":"1.1.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.26.0","propagators/opentelemetry-propagator-instana":"0.2.1","propagators/opentelemetry-propagator-ot-trace":"0.26.2"}
+{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.27.3","detectors/node/opentelemetry-resource-detector-aws":"1.2.1","detectors/node/opentelemetry-resource-detector-container":"0.2.1","detectors/node/opentelemetry-resource-detector-gcp":"0.27.4","detectors/node/opentelemetry-resource-detector-github":"0.27.0","detectors/node/opentelemetry-resource-detector-instana":"0.4.0","metapackages/auto-instrumentations-node":"0.35.0","metapackages/auto-instrumentations-web":"0.31.0","packages/opentelemetry-host-metrics":"0.31.0","packages/opentelemetry-id-generator-aws-xray":"1.1.1","packages/opentelemetry-propagation-utils":"0.29.1","packages/opentelemetry-test-utils":"0.33.0","plugins/node/instrumentation-amqplib":"0.32.0","plugins/node/instrumentation-dataloader":"0.3.0","plugins/node/instrumentation-fs":"0.6.0","plugins/node/instrumentation-lru-memoizer":"0.32.0","plugins/node/instrumentation-mongoose":"0.32.0", "plugins/node/instrumentation-socket.io": "0.32.0","plugins/node/instrumentation-tedious":"0.5.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.34.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.10.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.31.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.32.0","plugins/node/opentelemetry-instrumentation-connect":"0.31.0","plugins/node/opentelemetry-instrumentation-dns":"0.31.0","plugins/node/opentelemetry-instrumentation-express":"0.32.0","plugins/node/opentelemetry-instrumentation-fastify":"0.31.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.31.0","plugins/node/opentelemetry-instrumentation-graphql":"0.33.0","plugins/node/opentelemetry-instrumentation-hapi":"0.31.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.33.0","plugins/node/opentelemetry-instrumentation-knex":"0.31.0","plugins/node/opentelemetry-instrumentation-koa":"0.34.0","plugins/node/opentelemetry-instrumentation-memcached":"0.31.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.33.0","plugins/node/opentelemetry-instrumentation-mysql":"0.32.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.33.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.32.0","plugins/node/opentelemetry-instrumentation-net":"0.31.0","plugins/node/opentelemetry-instrumentation-pg":"0.33.0","plugins/node/opentelemetry-instrumentation-pino":"0.33.0","plugins/node/opentelemetry-instrumentation-redis":"0.34.0","plugins/node/opentelemetry-instrumentation-redis-4":"0.34.0","plugins/node/opentelemetry-instrumentation-restify":"0.31.0","plugins/node/opentelemetry-instrumentation-router":"0.32.0","plugins/node/opentelemetry-instrumentation-winston":"0.31.0","plugins/web/opentelemetry-instrumentation-document-load":"0.31.0","plugins/web/opentelemetry-instrumentation-long-task":"0.32.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.32.0","plugins/web/opentelemetry-plugin-react-load":"0.28.1","propagators/opentelemetry-propagator-aws-xray":"1.1.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.26.0","propagators/opentelemetry-propagator-instana":"0.2.1","propagators/opentelemetry-propagator-ot-trace":"0.26.2"}
 

metapackages/auto-instrumentations-node/README.md

@@ -88,6 +88,7 @@ registerInstrumentations({
 - [@opentelemetry/instrumentation-pino](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-pino)
 - [@opentelemetry/instrumentation-redis](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-redis)
 - [@opentelemetry/instrumentation-restify](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-restify)
+- [@opentelemetry/instrumentation-socket.io](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-socket.io)
 - [@opentelemetry/instrumentation-winston](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-winston)
 
 ## Useful links

metapackages/auto-instrumentations-node/package.json

@@ -80,6 +80,7 @@
     "@opentelemetry/instrumentation-redis-4": "^0.34.0",
     "@opentelemetry/instrumentation-restify": "^0.31.0",
     "@opentelemetry/instrumentation-router": "^0.32.0",
+    "@opentelemetry/instrumentation-socket.io": "^0.32.0",
     "@opentelemetry/instrumentation-tedious": "^0.5.0",
     "@opentelemetry/instrumentation-winston": "^0.31.0"
   }

metapackages/auto-instrumentations-node/src/utils.ts

@@ -50,6 +50,7 @@ import { RedisInstrumentation as RedisInstrumentationV2 } from '@opentelemetry/i
 import { RedisInstrumentation as RedisInstrumentationV4 } from '@opentelemetry/instrumentation-redis-4';
 import { RestifyInstrumentation } from '@opentelemetry/instrumentation-restify';
 import { RouterInstrumentation } from '@opentelemetry/instrumentation-router';
+import { SocketIoInstrumentation } from '@opentelemetry/instrumentation-socket.io';
 import { TediousInstrumentation } from '@opentelemetry/instrumentation-tedious';
 import { WinstonInstrumentation } from '@opentelemetry/instrumentation-winston';
 
@@ -88,6 +89,7 @@ const InstrumentationMap = {
   '@opentelemetry/instrumentation-redis-4': RedisInstrumentationV4,
   '@opentelemetry/instrumentation-restify': RestifyInstrumentation,
   '@opentelemetry/instrumentation-router': RouterInstrumentation,
+  '@opentelemetry/instrumentation-socket.io': SocketIoInstrumentation,
   '@opentelemetry/instrumentation-tedious': TediousInstrumentation,
   '@opentelemetry/instrumentation-winston': WinstonInstrumentation,
 };

packages/opentelemetry-propagation-utils/package.json

@@ -49,7 +49,7 @@
     "@types/mocha": "^9.1.1",
     "@types/node": "18.11.7",
     "@types/sinon": "^10.0.11",
-    "expect": "27.4.2",
+    "expect": "29.2.0",
     "gts": "3.1.0",
     "mocha": "7.2.0",
     "nyc": "15.1.0",

packages/opentelemetry-propagation-utils/test/pubsub-propagation.test.ts

@@ -20,7 +20,7 @@ import {
   resetMemoryExporter,
 } from '@opentelemetry/contrib-test-utils';
 import { ROOT_CONTEXT, trace } from '@opentelemetry/api';
-import * as expect from 'expect';
+import { expect } from 'expect';
 
 registerInstrumentationTestingProvider();
 

plugins/node/instrumentation-amqplib/package.json

@@ -59,7 +59,7 @@
     "@types/sinon": "10.0.2",
     "@types/node": "18.11.7",
     "amqplib": "0.8.0",
-    "expect": "27.4.2",
+    "expect": "29.2.0",
     "lodash": "4.17.21",
     "mocha": "7.2.0",
     "ts-mocha": "10.0.0",

plugins/node/instrumentation-amqplib/test/amqplib-callbacks.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import 'mocha';
-import * as expect from 'expect';
+import { expect } from 'expect';
 import { AmqplibInstrumentation } from '../src';
 import {
   getTestSpans,

plugins/node/instrumentation-amqplib/test/amqplib-connection.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import 'mocha';
-import * as expect from 'expect';
+import { expect } from 'expect';
 import { shouldTest } from './utils';
 import {
   censoredUrl,

plugins/node/instrumentation-amqplib/test/amqplib-promise.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import 'mocha';
-import * as expect from 'expect';
+import { expect } from 'expect';
 import * as sinon from 'sinon';
 import * as lodash from 'lodash';
 import {

plugins/node/instrumentation-amqplib/test/utils.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import 'mocha';
-import * as expect from 'expect';
+import { expect } from 'expect';
 import {
   getConnectionAttributesFromServer,
   getConnectionAttributesFromUrl,

plugins/node/instrumentation-amqplib/test/utils.ts

@@ -15,7 +15,7 @@
  */
 import type * as amqp from 'amqplib';
 import type * as amqpCallback from 'amqplib/callback_api';
-import * as expect from 'expect';
+import { expect } from 'expect';
 
 export const asyncConfirmSend = (
   confirmChannel: amqp.ConfirmChannel | amqpCallback.ConfirmChannel,

plugins/node/instrumentation-lru-memoizer/package.json

@@ -47,7 +47,7 @@
     "@types/lru-cache": "7.10.9",
     "@types/mocha": "8.2.3",
     "@types/node": "18.11.7",
-    "expect": "25.5.0",
+    "expect": "29.2.0",
     "gts": "3.1.0",
     "lru-memoizer": "2.1.4",
     "mocha": "7.2.0",

plugins/node/instrumentation-lru-memoizer/test/index.test.ts

@@ -15,7 +15,7 @@
  */
 import LruMemoizerInstrumentation from '../src';
 import { trace, context } from '@opentelemetry/api';
-import * as expect from 'expect';
+import { expect } from 'expect';
 
 import { registerInstrumentationTesting } from '@opentelemetry/contrib-test-utils';
 

plugins/node/instrumentation-mongoose/package.json

@@ -50,7 +50,7 @@
     "@opentelemetry/sdk-trace-base": "^1.8.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.11.7",
-    "expect": "27.4.2",
+    "expect": "29.2.0",
     "gts": "3.1.0",
     "mocha": "7.2.0",
     "mongoose": "6.5.2",

plugins/node/instrumentation-mongoose/test/asserts.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as expect from 'expect';
+import { expect } from 'expect';
 import { ReadableSpan } from '@opentelemetry/sdk-trace-base';
 import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
 import { SpanStatusCode } from '@opentelemetry/api';

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import 'mocha';
-import * as expect from 'expect';
+import { expect } from 'expect';
 import { context, ROOT_CONTEXT } from '@opentelemetry/api';
 import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
 import { MongooseInstrumentation } from '../src';

plugins/node/instrumentation-socket.io/.eslintignore

@@ -0,0 +1 @@
+build

plugins/node/instrumentation-socket.io/.eslintrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+    "env": {
+        "mocha": true,
+        "node": true
+    },
+    ...require('../../../eslint.config.js')
+}

plugins/node/instrumentation-socket.io/.npmignore

@@ -0,0 +1,4 @@
+/bin
+/coverage
+/doc
+/test

plugins/node/instrumentation-socket.io/.tav.yml

@@ -0,0 +1,15 @@
+'socket.io':
+  - versions: "2.1.1 || 2.2.0 || 2.3.0 || 2.4.0 || ^2.5.0"
+    peerDependencies: socket.io-client@^2
+    commands:
+      - npm run test
+
+  - versions: "^3.1.3"
+    peerDependencies: socket.io-client@^3
+    commands:
+      - npm run test
+
+  - versions: "4.4.1 || 4.5.1 || 4.5.2 || ^4.5.3"
+    peerDependencies: socket.io-client@^4
+    commands:
+      - npm run test