diff --git a/package-lock.json b/package-lock.json index 8c16b6ad1d..38f708cf1c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10991,12 +10991,12 @@ } }, "node_modules/@types/amqplib": { - "version": "0.5.17", - "resolved": "https://registry.npmjs.org/@types/amqplib/-/amqplib-0.5.17.tgz", - "integrity": "sha512-RImqiLP1swDqWBW8UX9iBXVEOw6MYzNmxdXqfemDfdwtUvdTM/W0s2RlSuMVIGkRhaWvpkC9O/N81VzzQwfAbw==", + "version": "0.10.7", + "resolved": "https://registry.npmjs.org/@types/amqplib/-/amqplib-0.10.7.tgz", + "integrity": "sha512-IVj3avf9AQd2nXCx0PGk/OYq7VmHiyNxWFSb5HhU9ATh+i+gHWvVcljFTcTWQ/dyHJCTrzCixde+r/asL2ErDA==", "dev": true, + "license": "MIT", "dependencies": { - "@types/bluebird": "*", "@types/node": "*" } }, @@ -11011,12 +11011,6 @@ "integrity": "sha512-Anitqkl3+KrzcW2k77lRlg/GfLZLWXBuNgbEcIOU6M92yw42vsd3xV/Z/yAHEj8m+KUjL6bWOVOFqX8PFPJ4LA==", "dev": true }, - "node_modules/@types/bluebird": { - "version": "3.5.42", - "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.42.tgz", - "integrity": "sha512-Jhy+MWRlro6UjVi578V/4ZGNfeCOcNCp0YaFNIUGFKlImowqwb1O/22wDVk3FDGMLqxdpOV3qQHD5fPEH4hK6A==", - "dev": true - }, "node_modules/@types/body-parser": { "version": "1.19.6", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz", @@ -32961,7 +32955,7 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/contrib-test-utils": "^0.49.0", - "@types/amqplib": "^0.5.17", + "@types/amqplib": "^0.10.7", "@types/lodash": "4.14.199", "@types/mocha": "10.0.10", "@types/node": "18.18.14", @@ -43855,7 +43849,7 @@ "@opentelemetry/core": "^2.0.0", "@opentelemetry/instrumentation": "^0.203.0", "@opentelemetry/semantic-conventions": "^1.27.0", - "@types/amqplib": "^0.5.17", + "@types/amqplib": "^0.10.7", "@types/lodash": "4.14.199", "@types/mocha": "10.0.10", "@types/node": "18.18.14", @@ -48200,12 +48194,11 @@ } }, "@types/amqplib": { - "version": "0.5.17", - "resolved": "https://registry.npmjs.org/@types/amqplib/-/amqplib-0.5.17.tgz", - "integrity": "sha512-RImqiLP1swDqWBW8UX9iBXVEOw6MYzNmxdXqfemDfdwtUvdTM/W0s2RlSuMVIGkRhaWvpkC9O/N81VzzQwfAbw==", + "version": "0.10.7", + "resolved": "https://registry.npmjs.org/@types/amqplib/-/amqplib-0.10.7.tgz", + "integrity": "sha512-IVj3avf9AQd2nXCx0PGk/OYq7VmHiyNxWFSb5HhU9ATh+i+gHWvVcljFTcTWQ/dyHJCTrzCixde+r/asL2ErDA==", "dev": true, "requires": { - "@types/bluebird": "*", "@types/node": "*" } }, @@ -48220,12 +48213,6 @@ "integrity": "sha512-Anitqkl3+KrzcW2k77lRlg/GfLZLWXBuNgbEcIOU6M92yw42vsd3xV/Z/yAHEj8m+KUjL6bWOVOFqX8PFPJ4LA==", "dev": true }, - "@types/bluebird": { - "version": "3.5.42", - "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.42.tgz", - "integrity": "sha512-Jhy+MWRlro6UjVi578V/4ZGNfeCOcNCp0YaFNIUGFKlImowqwb1O/22wDVk3FDGMLqxdpOV3qQHD5fPEH4hK6A==", - "dev": true - }, "@types/body-parser": { "version": "1.19.6", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz", diff --git a/packages/instrumentation-amqplib/package.json b/packages/instrumentation-amqplib/package.json index 9d4394fa9a..8e041334a4 100644 --- a/packages/instrumentation-amqplib/package.json +++ b/packages/instrumentation-amqplib/package.json @@ -58,7 +58,7 @@ "devDependencies": { "@opentelemetry/api": "^1.3.0", "@opentelemetry/contrib-test-utils": "^0.49.0", - "@types/amqplib": "^0.5.17", + "@types/amqplib": "^0.10.7", "@types/lodash": "4.14.199", "@types/mocha": "10.0.10", "@types/node": "18.18.14", diff --git a/packages/instrumentation-amqplib/src/amqplib.ts b/packages/instrumentation-amqplib/src/amqplib.ts index bcdf9c7acb..886467f326 100644 --- a/packages/instrumentation-amqplib/src/amqplib.ts +++ b/packages/instrumentation-amqplib/src/amqplib.ts @@ -65,7 +65,9 @@ import { CONNECTION_ATTRIBUTES, getConnectionAttributesFromServer, getConnectionAttributesFromUrl, + InstrumentationConnection, InstrumentationConsumeChannel, + InstrumentationConsumeMessage, InstrumentationMessage, InstrumentationPublishChannel, isConfirmChannelTracing, @@ -253,18 +255,11 @@ export class AmqplibInstrumentation extends InstrumentationBase { const product = conn.serverProperties.product?.toLowerCase?.(); if (product) { diff --git a/packages/instrumentation-amqplib/test/amqplib-promise.test.ts b/packages/instrumentation-amqplib/test/amqplib-promise.test.ts index bd9277b995..edbe71b4c2 100644 --- a/packages/instrumentation-amqplib/test/amqplib-promise.test.ts +++ b/packages/instrumentation-amqplib/test/amqplib-promise.test.ts @@ -68,7 +68,7 @@ const CHANNEL_CLOSED_IN_TEST = Symbol( ); describe('amqplib instrumentation promise model', () => { - let conn: amqp.Connection; + let conn: amqp.ChannelModel; before(async function () { if (!shouldTest) { this.skip(); diff --git a/packages/instrumentation-amqplib/test/utils.test.ts b/packages/instrumentation-amqplib/test/utils.test.ts index 6369398969..9e538942ec 100644 --- a/packages/instrumentation-amqplib/test/utils.test.ts +++ b/packages/instrumentation-amqplib/test/utils.test.ts @@ -33,7 +33,7 @@ import { rabbitMqUrl } from './config'; describe('utils', () => { describe('getConnectionAttributesFromServer', () => { - let conn: amqp.Connection; + let conn: amqp.ChannelModel; before(async function () { if (!shouldTest) { this.skip();