From ec5f94d908485943f4061836ce11c35805a88e39 Mon Sep 17 00:00:00 2001 From: nirsky Date: Mon, 14 Jun 2021 11:01:44 +0300 Subject: [PATCH 1/7] update versions in package.json --- packages/instrumentation-amqplib/package.json | 11 +++++++---- .../test/amqplib-callbacks.spec.ts | 6 +++--- packages/instrumentation-aws-sdk/package.json | 13 ++++++++----- .../instrumentation-elasticsearch/package.json | 11 +++++++---- packages/instrumentation-express/package.json | 15 +++++++++------ packages/instrumentation-kafkajs/package.json | 11 +++++++---- packages/instrumentation-mongoose/package.json | 13 ++++++++----- packages/instrumentation-neo4j/package.json | 11 +++++++---- packages/instrumentation-sequelize/package.json | 13 ++++++++----- packages/instrumentation-socket.io/package.json | 13 ++++++++----- .../instrumentation-testing-utils/package.json | 13 +++++++++---- packages/instrumentation-typeorm/package.json | 11 +++++++---- packages/propagation-utils/package.json | 4 ++-- 13 files changed, 90 insertions(+), 55 deletions(-) diff --git a/packages/instrumentation-amqplib/package.json b/packages/instrumentation-amqplib/package.json index c5005252..dcf52d72 100644 --- a/packages/instrumentation-amqplib/package.json +++ b/packages/instrumentation-amqplib/package.json @@ -36,13 +36,16 @@ "bugs": { "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues" }, + "peerDependencies": { + "@opentelemetry/api": "^0.21.0" + }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0" + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0" }, "devDependencies": { - "@opentelemetry/core": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/core": "^0.21.0", "@types/amqplib": "^0.5.17", "@types/lodash": "^4.14.168", "@types/mocha": "^8.2.2", diff --git a/packages/instrumentation-amqplib/test/amqplib-callbacks.spec.ts b/packages/instrumentation-amqplib/test/amqplib-callbacks.spec.ts index 479d062f..77a3bfd6 100644 --- a/packages/instrumentation-amqplib/test/amqplib-callbacks.spec.ts +++ b/packages/instrumentation-amqplib/test/amqplib-callbacks.spec.ts @@ -32,7 +32,7 @@ describe('amqplib instrumentation callback model', function () { beforeEach((done) => { instrumentation.enable(); conn.createChannel( - context.bind((err, c) => { + context.bind(context.active(), (err, c) => { channel = c; // install an error handler, otherwise when we have tests that create error on the channel, // it throws and crash process @@ -40,10 +40,10 @@ describe('amqplib instrumentation callback model', function () { channel.assertQueue( queueName, { durable: false }, - context.bind((err, ok) => { + context.bind(context.active(), (err, ok) => { channel.purgeQueue( queueName, - context.bind((err, ok) => { + context.bind(context.active(), (err, ok) => { done(); }) ); diff --git a/packages/instrumentation-aws-sdk/package.json b/packages/instrumentation-aws-sdk/package.json index 564b8481..452558b4 100644 --- a/packages/instrumentation-aws-sdk/package.json +++ b/packages/instrumentation-aws-sdk/package.json @@ -34,18 +34,21 @@ "bugs": { "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues" }, + "peerDependencies": { + "@opentelemetry/api": "^0.21.0" + }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/core": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0", + "@opentelemetry/core": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0", "opentelemetry-propagation-utils": "^0.7.0" }, "devDependencies": { "@aws-sdk/client-s3": "3.13.1", "@aws-sdk/client-sqs": "3.13.1", "@aws-sdk/types": "3.13.1", - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "@types/mocha": "^8.2.2", "aws-sdk": "^2.780.0", "expect": "^26.6.2", diff --git a/packages/instrumentation-elasticsearch/package.json b/packages/instrumentation-elasticsearch/package.json index a27fce00..47b92372 100644 --- a/packages/instrumentation-elasticsearch/package.json +++ b/packages/instrumentation-elasticsearch/package.json @@ -40,14 +40,17 @@ "bugs": { "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues" }, + "peerDependencies": { + "@opentelemetry/api": "^0.21.0" + }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/core": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0" + "@opentelemetry/core": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0" }, "devDependencies": { "@elastic/elasticsearch": "^7.8.0", + "@opentelemetry/api": "^0.21.0", "@types/chai": "^4.2.15", "@types/mocha": "^8.2.2", "chai": "^4.3.0", diff --git a/packages/instrumentation-express/package.json b/packages/instrumentation-express/package.json index 9ea9fadb..b39cd4b2 100644 --- a/packages/instrumentation-express/package.json +++ b/packages/instrumentation-express/package.json @@ -30,15 +30,18 @@ "publishConfig": { "access": "public" }, + "peerDependencies": { + "@opentelemetry/api": "^0.21.0" + }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/core": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0" + "@opentelemetry/core": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0" }, "devDependencies": { - "@opentelemetry/instrumentation-http": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/instrumentation-http": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "@types/express": "4.17.8", "@types/mocha": "^8.2.2", "axios": "0.21.1", diff --git a/packages/instrumentation-kafkajs/package.json b/packages/instrumentation-kafkajs/package.json index 4297af51..5a8a4191 100644 --- a/packages/instrumentation-kafkajs/package.json +++ b/packages/instrumentation-kafkajs/package.json @@ -33,13 +33,16 @@ "bugs": { "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues" }, + "peerDependencies": { + "@opentelemetry/api": "^0.21.0" + }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0" + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0" }, "devDependencies": { - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "@types/mocha": "^8.2.2", "expect": "^26.6.2", "kafkajs": "^1.12.0", diff --git a/packages/instrumentation-mongoose/package.json b/packages/instrumentation-mongoose/package.json index 8cab09f8..b0687ac9 100644 --- a/packages/instrumentation-mongoose/package.json +++ b/packages/instrumentation-mongoose/package.json @@ -40,14 +40,17 @@ "bugs": { "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues" }, + "peerDependencies": { + "@opentelemetry/api": "^0.21.0" + }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/core": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0" + "@opentelemetry/core": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0" }, "devDependencies": { - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "@types/mocha": "^8.2.2", "expect": "^26.6.2", "mocha": "^8.4.0", diff --git a/packages/instrumentation-neo4j/package.json b/packages/instrumentation-neo4j/package.json index 5d3ef9ec..cb63e229 100644 --- a/packages/instrumentation-neo4j/package.json +++ b/packages/instrumentation-neo4j/package.json @@ -40,13 +40,16 @@ "bugs": { "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues" }, + "peerDependencies": { + "@opentelemetry/api": "^0.21.0" + }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0" + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0" }, "devDependencies": { - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "@types/mocha": "^8.2.2", "expect": "^26.6.2", "mocha": "^8.4.0", diff --git a/packages/instrumentation-sequelize/package.json b/packages/instrumentation-sequelize/package.json index f43dbe2b..ca0d5bbf 100644 --- a/packages/instrumentation-sequelize/package.json +++ b/packages/instrumentation-sequelize/package.json @@ -38,14 +38,17 @@ "bugs": { "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues" }, + "peerDependencies": { + "@opentelemetry/api": "^0.21.0" + }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/core": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0" + "@opentelemetry/core": "^0.21.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0" }, "devDependencies": { - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "@types/mocha": "^8.2.2", "expect": "^26.6.2", "mocha": "^8.4.0", diff --git a/packages/instrumentation-socket.io/package.json b/packages/instrumentation-socket.io/package.json index 4456c636..d3bdf869 100644 --- a/packages/instrumentation-socket.io/package.json +++ b/packages/instrumentation-socket.io/package.json @@ -39,15 +39,18 @@ "bugs": { "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues" }, + "peerDependencies": { + "@opentelemetry/api": "^0.21.0" + }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0", + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0", "is-promise": "^4.0.0" }, "devDependencies": { - "@opentelemetry/instrumentation-http": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/instrumentation-http": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "@types/mocha": "^8.2.2", "expect": "^26.6.2", "mocha": "^8.4.0", diff --git a/packages/instrumentation-testing-utils/package.json b/packages/instrumentation-testing-utils/package.json index 9f4e96cf..98c6ff1e 100644 --- a/packages/instrumentation-testing-utils/package.json +++ b/packages/instrumentation-testing-utils/package.json @@ -28,10 +28,15 @@ "bugs": { "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues" }, + "peerDependencies": { + "@opentelemetry/api": "^0.21.0" + }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/exporter-jaeger": "^0.20.0", - "@opentelemetry/node": "^0.20.0", - "@opentelemetry/tracing": "^0.20.0" + "@opentelemetry/exporter-jaeger": "^0.21.0", + "@opentelemetry/node": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0" + }, + "devDependencies": { + "@opentelemetry/api": "^0.21.0" } } diff --git a/packages/instrumentation-typeorm/package.json b/packages/instrumentation-typeorm/package.json index e52c248d..d060cdb7 100644 --- a/packages/instrumentation-typeorm/package.json +++ b/packages/instrumentation-typeorm/package.json @@ -33,13 +33,16 @@ "bugs": { "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues" }, + "peerDependencies": { + "@opentelemetry/api": "^0.21.0" + }, "dependencies": { - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/instrumentation": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0" + "@opentelemetry/instrumentation": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0" }, "devDependencies": { - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/tracing": "^0.21.0", "@types/mocha": "^8.2.2", "expect": "^26.6.2", "mocha": "^8.4.0", diff --git a/packages/propagation-utils/package.json b/packages/propagation-utils/package.json index 954e4acb..3533c4e0 100644 --- a/packages/propagation-utils/package.json +++ b/packages/propagation-utils/package.json @@ -34,11 +34,11 @@ "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues" }, "devDependencies": { - "@opentelemetry/api": "^0.20.0", + "@opentelemetry/api": "^0.21.0", "@types/node": "^14.14.8", "typescript": "^4.0.3" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" } } From 616b653dd9c7a6c311f9c1ddf05821b3a76a3b71 Mon Sep 17 00:00:00 2001 From: nirsky Date: Mon, 14 Jun 2021 11:09:49 +0300 Subject: [PATCH 2/7] added namespace to loggings --- packages/instrumentation-aws-sdk/src/aws-sdk.ts | 12 ++++++------ packages/instrumentation-aws-sdk/src/services/sqs.ts | 2 +- packages/instrumentation-aws-sdk/src/utils.ts | 4 ++-- packages/instrumentation-sequelize/src/sequelize.ts | 4 ++-- packages/instrumentation-socket.io/src/socket.io.ts | 8 ++++---- packages/instrumentation-typeorm/src/typeorm.ts | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/instrumentation-aws-sdk/src/aws-sdk.ts b/packages/instrumentation-aws-sdk/src/aws-sdk.ts index b49ff315..fecb9943 100644 --- a/packages/instrumentation-aws-sdk/src/aws-sdk.ts +++ b/packages/instrumentation-aws-sdk/src/aws-sdk.ts @@ -99,31 +99,31 @@ export class AwsInstrumentation extends InstrumentationBase { } protected patchV3ConstructStack(moduleExports, moduleVersion: string) { - diag.debug(`applying patch to aws-sdk v3 constructStack`); + diag.debug(`aws-sdk instrumentation: applying patch to aws-sdk v3 constructStack`); this._wrap(moduleExports, 'constructStack', this._getV3ConstructStackPatch.bind(this, moduleVersion)); return moduleExports; } protected unpatchV3ConstructStack(moduleExports) { - diag.debug(`applying unpatch to aws-sdk v3 constructStack`); + diag.debug(`aws-sdk instrumentation: applying unpatch to aws-sdk v3 constructStack`); this._unwrap(moduleExports, 'constructStack'); return moduleExports; } protected patchV3SmithyClient(moduleExports) { - diag.debug(`applying patch to aws-sdk v3 client send`); + diag.debug(`aws-sdk instrumentation: applying patch to aws-sdk v3 client send`); this._wrap(moduleExports.Client.prototype, 'send', this._getV3SmithyClientSendPatch.bind(this)); return moduleExports; } protected unpatchV3SmithyClient(moduleExports) { - diag.debug(`applying patch to aws-sdk v3 constructStack`); + diag.debug(`aws-sdk instrumentation: applying patch to aws-sdk v3 constructStack`); this._unwrap(moduleExports.Client.prototype, 'send'); return moduleExports; } protected patchV2(moduleExports: typeof AWS, moduleVersion: string) { - diag.debug(`applying patch to ${AwsInstrumentation.component}`); + diag.debug(`aws-sdk instrumentation: applying patch to ${AwsInstrumentation.component}`); this.unpatchV2(moduleExports); this._wrap(moduleExports?.Request.prototype, 'send', this._getRequestSendPatch.bind(this, moduleVersion)); this._wrap(moduleExports?.Request.prototype, 'promise', this._getRequestPromisePatch.bind(this, moduleVersion)); @@ -405,7 +405,7 @@ export class AwsInstrumentation extends InstrumentationBase { const span = self._startAwsV2Span(awsV2Request, requestMetadata, normalizedRequest, moduleVersion); awsV2Request[self.REQUEST_SPAN_KEY] = span; const activeContextWithSpan = trace.setSpan(context.active(), span); - const callbackWithContext = context.bind(callback, activeContextWithSpan); + const callbackWithContext = context.bind(activeContextWithSpan, callback); self._callUserPreRequestHook(span, normalizedRequest); self._registerV2CompletedEvent(span, awsV2Request, normalizedRequest, activeContextWithSpan); diff --git a/packages/instrumentation-aws-sdk/src/services/sqs.ts b/packages/instrumentation-aws-sdk/src/services/sqs.ts index 7df92b0c..b5b733bf 100644 --- a/packages/instrumentation-aws-sdk/src/services/sqs.ts +++ b/packages/instrumentation-aws-sdk/src/services/sqs.ts @@ -160,7 +160,7 @@ export class SqsServiceExtension implements ServiceExtension { propagation.inject(context.active(), attributes, sqsContextSetter); } else { diag.warn( - 'OpenTelemetry aws-sdk instrumentation cannot set context propagation on SQS message due to maximum amount of MessageAttributes' + 'aws-sdk instrumentation: cannot set context propagation on SQS message due to maximum amount of MessageAttributes' ); } return attributes; diff --git a/packages/instrumentation-aws-sdk/src/utils.ts b/packages/instrumentation-aws-sdk/src/utils.ts index 121b9102..7f0ac0d8 100644 --- a/packages/instrumentation-aws-sdk/src/utils.ts +++ b/packages/instrumentation-aws-sdk/src/utils.ts @@ -53,8 +53,8 @@ export const bindPromise = ( ): Promise => { const origThen = target.then; target.then = function (onFulfilled, onRejected) { - const newOnFulfilled = context.bind(onFulfilled, contextForCallbacks); - const newOnRejected = context.bind(onRejected, contextForCallbacks); + const newOnFulfilled = context.bind(contextForCallbacks, onFulfilled); + const newOnRejected = context.bind(contextForCallbacks, onRejected); const patchedPromise = origThen.call(this, newOnFulfilled, newOnRejected); return rebindCount > 1 ? bindPromise(patchedPromise, contextForCallbacks, rebindCount - 1) : patchedPromise; }; diff --git a/packages/instrumentation-sequelize/src/sequelize.ts b/packages/instrumentation-sequelize/src/sequelize.ts index 6160e4e7..85245790 100644 --- a/packages/instrumentation-sequelize/src/sequelize.ts +++ b/packages/instrumentation-sequelize/src/sequelize.ts @@ -48,7 +48,7 @@ export class SequelizeInstrumentation extends InstrumentationBase { if (moduleExports === undefined || moduleExports === null) { return moduleExports; } - diag.debug(`applying patch to socket.io Socket`); + diag.debug(`socket.io instrumentation: applying patch to socket.io Socket`); if (isWrapped(moduleExports?.Socket?.prototype?.on)) { this._unwrap(moduleExports.Socket.prototype, 'on'); } @@ -72,7 +72,7 @@ export class SocketIoInstrumentation extends InstrumentationBase { if (moduleExports === undefined || moduleExports === null) { return moduleExports; } - diag.debug(`applying patch to socket.io StrictEventEmitter`); + diag.debug(`socket.io instrumentation: applying patch to socket.io StrictEventEmitter`); if (isWrapped(moduleExports?.BroadcastOperator?.prototype?.emit)) { this._unwrap(moduleExports.BroadcastOperator.prototype, 'emit'); } @@ -93,7 +93,7 @@ export class SocketIoInstrumentation extends InstrumentationBase { if (moduleExports === undefined || moduleExports === null) { return moduleExports; } - diag.debug(`applying patch to socket.io Namespace`); + diag.debug(`socket.io instrumentation: applying patch to socket.io Namespace`); if (isWrapped(moduleExports?.Namespace?.prototype?.emit)) { this._unwrap(moduleExports.Namespace.prototype, 'emit'); } @@ -113,7 +113,7 @@ export class SocketIoInstrumentation extends InstrumentationBase { if (moduleExports === undefined || moduleExports === null) { return moduleExports; } - diag.debug(`applying patch to socket.io Server`); + diag.debug(`socket.io instrumentation: applying patch to socket.io Server`); if (isWrapped(moduleExports?.Server?.prototype?.on)) { this._unwrap(moduleExports.Server.prototype, 'on'); } diff --git a/packages/instrumentation-typeorm/src/typeorm.ts b/packages/instrumentation-typeorm/src/typeorm.ts index b77a452b..f4fa5de1 100644 --- a/packages/instrumentation-typeorm/src/typeorm.ts +++ b/packages/instrumentation-typeorm/src/typeorm.ts @@ -40,7 +40,7 @@ export class TypeormInstrumentation extends InstrumentationBase if (moduleExports === undefined || moduleExports === null) { return moduleExports; } - diag.debug(`applying patch to typeorm`); + diag.debug(`typeorm instrumentation: applying patch to typeorm`); this.unpatch(moduleExports); this._wrap(moduleExports.ConnectionManager.prototype, 'create', this._createConnectionManagerPatch.bind(this)); From 14fc113889dcdc59a9c033b2843b78daa705d2ed Mon Sep 17 00:00:00 2001 From: nirsky Date: Mon, 14 Jun 2021 11:13:03 +0300 Subject: [PATCH 3/7] update readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e8e0bdf3..d82dc453 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ The instrumentations in this repo are: - strictly complies with [open telemetry semantic conventions](https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/trace/semantic_conventions) - up to date with latest SDK version -**Compatible with [SDK v0.20.0](https://github.com/open-telemetry/opentelemetry-js/releases/tag/v0.20.0)** +**Compatible with [SDK v0.21.0](https://github.com/open-telemetry/opentelemetry-js/releases/tag/v0.21.0)** ## Instrumentations | Instrumentation Package | Instrumented Lib | NPM | | --- | --- | --- | @@ -45,10 +45,10 @@ The instrumentations in this repo are: |[opentelemetry-instrumentation-socket.io](./packages/instrumentation-socket.io) | [`socket.io`](https://github.com/socketio/socket.io) | [![NPM version](https://img.shields.io/npm/v/opentelemetry-instrumentation-socket.io.svg)](https://www.npmjs.com/package/opentelemetry-instrumentation-socket.io) ## Compatability Table -**Tested and verified against otel v0.20.0** | Instrumentations Version | OpenTelemetry Version | | --- | --- | +| 0.6.x | 0.21.0 | | 0.5.x | 0.20.0 | | 0.4.x | 0.19.0 | | 0.3.x | 0.18.0 | From 5e1f67ff228ec8013aa3214956337131cbcfc2e2 Mon Sep 17 00:00:00 2001 From: nirsky Date: Mon, 14 Jun 2021 11:29:18 +0300 Subject: [PATCH 4/7] update mocha instrumentation --- packages/instrumentation-amqplib/package.json | 2 +- packages/instrumentation-aws-sdk/package.json | 2 +- packages/instrumentation-elasticsearch/package.json | 2 +- packages/instrumentation-express/package.json | 2 +- packages/instrumentation-kafkajs/package.json | 2 +- packages/instrumentation-mongoose/package.json | 2 +- packages/instrumentation-neo4j/package.json | 2 +- packages/instrumentation-sequelize/package.json | 2 +- packages/instrumentation-socket.io/package.json | 2 +- packages/instrumentation-typeorm/package.json | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/instrumentation-amqplib/package.json b/packages/instrumentation-amqplib/package.json index dcf52d72..b7bab519 100644 --- a/packages/instrumentation-amqplib/package.json +++ b/packages/instrumentation-amqplib/package.json @@ -54,7 +54,7 @@ "expect": "^26.6.2", "lodash": "^4.17.21", "mocha": "^8.4.0", - "opentelemetry-instrumentation-mocha": "^0.0.1-rc.1", + "opentelemetry-instrumentation-mocha": "^0.0.1-rc.2", "opentelemetry-instrumentation-testing-utils": "^0.5.0", "sinon": "^9.2.4", "test-all-versions": "^5.0.1", diff --git a/packages/instrumentation-aws-sdk/package.json b/packages/instrumentation-aws-sdk/package.json index 452558b4..84a340e5 100644 --- a/packages/instrumentation-aws-sdk/package.json +++ b/packages/instrumentation-aws-sdk/package.json @@ -54,7 +54,7 @@ "expect": "^26.6.2", "mocha": "^8.4.0", "nock": "^13.0.11", - "opentelemetry-instrumentation-mocha": "^0.0.1-rc.1", + "opentelemetry-instrumentation-mocha": "^0.0.1-rc.2", "opentelemetry-instrumentation-testing-utils": "^0.5.0", "test-all-versions": "^5.0.1", "ts-node": "^9.1.1", diff --git a/packages/instrumentation-elasticsearch/package.json b/packages/instrumentation-elasticsearch/package.json index 47b92372..0c40cc5d 100644 --- a/packages/instrumentation-elasticsearch/package.json +++ b/packages/instrumentation-elasticsearch/package.json @@ -57,7 +57,7 @@ "expect": "^26.6.2", "mocha": "^8.4.0", "nock": "^13.0.9", - "opentelemetry-instrumentation-mocha": "^0.0.1-rc.1", + "opentelemetry-instrumentation-mocha": "^0.0.1-rc.2", "opentelemetry-instrumentation-testing-utils": "^0.5.0", "sinon": "^9.2.4", "test-all-versions": "^5.0.1", diff --git a/packages/instrumentation-express/package.json b/packages/instrumentation-express/package.json index b39cd4b2..94884a13 100644 --- a/packages/instrumentation-express/package.json +++ b/packages/instrumentation-express/package.json @@ -49,7 +49,7 @@ "expect": "^26.6.2", "express": "4.17.1", "mocha": "^8.4.0", - "opentelemetry-instrumentation-mocha": "^0.0.1-rc.1", + "opentelemetry-instrumentation-mocha": "^0.0.1-rc.2", "opentelemetry-instrumentation-testing-utils": "^0.5.0", "test-all-versions": "^5.0.1" }, diff --git a/packages/instrumentation-kafkajs/package.json b/packages/instrumentation-kafkajs/package.json index 5a8a4191..4827eb54 100644 --- a/packages/instrumentation-kafkajs/package.json +++ b/packages/instrumentation-kafkajs/package.json @@ -47,7 +47,7 @@ "expect": "^26.6.2", "kafkajs": "^1.12.0", "mocha": "^8.4.0", - "opentelemetry-instrumentation-mocha": "^0.0.1-rc.1", + "opentelemetry-instrumentation-mocha": "^0.0.1-rc.2", "opentelemetry-instrumentation-testing-utils": "^0.5.0", "ts-node": "^9.1.1", "typescript": "^3.9.5" diff --git a/packages/instrumentation-mongoose/package.json b/packages/instrumentation-mongoose/package.json index b0687ac9..17143496 100644 --- a/packages/instrumentation-mongoose/package.json +++ b/packages/instrumentation-mongoose/package.json @@ -56,7 +56,7 @@ "mocha": "^8.4.0", "mongodb": "^3.6.4", "mongoose": "5.11.15", - "opentelemetry-instrumentation-mocha": "^0.0.1-rc.1", + "opentelemetry-instrumentation-mocha": "^0.0.1-rc.2", "opentelemetry-instrumentation-testing-utils": "^0.5.0", "ts-node": "^9.1.1", "typescript": "^4.0.3" diff --git a/packages/instrumentation-neo4j/package.json b/packages/instrumentation-neo4j/package.json index cb63e229..4546a58c 100644 --- a/packages/instrumentation-neo4j/package.json +++ b/packages/instrumentation-neo4j/package.json @@ -54,7 +54,7 @@ "expect": "^26.6.2", "mocha": "^8.4.0", "neo4j-driver": "^4.2.2", - "opentelemetry-instrumentation-mocha": "^0.0.1-rc.1", + "opentelemetry-instrumentation-mocha": "^0.0.1-rc.2", "opentelemetry-instrumentation-testing-utils": "^0.5.0", "test-all-versions": "^5.0.1", "ts-node": "^9.1.1", diff --git a/packages/instrumentation-sequelize/package.json b/packages/instrumentation-sequelize/package.json index ca0d5bbf..0f0d9802 100644 --- a/packages/instrumentation-sequelize/package.json +++ b/packages/instrumentation-sequelize/package.json @@ -53,7 +53,7 @@ "expect": "^26.6.2", "mocha": "^8.4.0", "mysql2": "^2.2.5", - "opentelemetry-instrumentation-mocha": "^0.0.1-rc.1", + "opentelemetry-instrumentation-mocha": "^0.0.1-rc.2", "opentelemetry-instrumentation-testing-utils": "^0.5.0", "pg": "^8.4.2", "sequelize": "^5.22.0", diff --git a/packages/instrumentation-socket.io/package.json b/packages/instrumentation-socket.io/package.json index d3bdf869..601c2e0b 100644 --- a/packages/instrumentation-socket.io/package.json +++ b/packages/instrumentation-socket.io/package.json @@ -54,7 +54,7 @@ "@types/mocha": "^8.2.2", "expect": "^26.6.2", "mocha": "^8.4.0", - "opentelemetry-instrumentation-mocha": "^0.0.1-rc.1", + "opentelemetry-instrumentation-mocha": "^0.0.1-rc.2", "opentelemetry-instrumentation-testing-utils": "^0.5.0", "socket.io": "^4.1.2", "socket.io-client": "^4.1.1", diff --git a/packages/instrumentation-typeorm/package.json b/packages/instrumentation-typeorm/package.json index d060cdb7..3da2a9a7 100644 --- a/packages/instrumentation-typeorm/package.json +++ b/packages/instrumentation-typeorm/package.json @@ -46,7 +46,7 @@ "@types/mocha": "^8.2.2", "expect": "^26.6.2", "mocha": "^8.4.0", - "opentelemetry-instrumentation-mocha": "^0.0.1-rc.1", + "opentelemetry-instrumentation-mocha": "^0.0.1-rc.2", "opentelemetry-instrumentation-testing-utils": "^0.5.0", "reflect-metadata": "^0.1.13", "ts-node": "^9.1.1", From f50c3115b990cd9aaa6331509e704bb3308c9487 Mon Sep 17 00:00:00 2001 From: nirsky Date: Mon, 14 Jun 2021 11:36:55 +0300 Subject: [PATCH 5/7] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d82dc453..1ba7940a 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ The instrumentations in this repo are: | Instrumentations Version | OpenTelemetry Version | | --- | --- | -| 0.6.x | 0.21.0 | +| 0.21.x | 0.21.0 | | 0.5.x | 0.20.0 | | 0.4.x | 0.19.0 | | 0.3.x | 0.18.0 | From 99244591c55840b2a3ec2f8769833c83304ff677 Mon Sep 17 00:00:00 2001 From: nirsky Date: Sun, 20 Jun 2021 12:07:23 +0300 Subject: [PATCH 6/7] update dependencies --- .../node/resource-detector-deployment/package.json | 10 +++++----- detectors/node/resource-detector-service/package.json | 10 +++++----- detectors/resource-detector-sync-api/package.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/detectors/node/resource-detector-deployment/package.json b/detectors/node/resource-detector-deployment/package.json index 579473b3..3a5ac436 100644 --- a/detectors/node/resource-detector-deployment/package.json +++ b/detectors/node/resource-detector-deployment/package.json @@ -32,19 +32,19 @@ "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "dependencies": { - "@opentelemetry/resources": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0", + "@opentelemetry/resources": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0", "opentelemetry-resource-detector-sync-api": "^0.5.0" }, "devDependencies": { - "@opentelemetry/api": "^0.20.0", + "@opentelemetry/api": "^0.21.0", "@types/mocha": "^8.2.2", "expect": "^26.6.2", "mocha": "^8.4.0", - "opentelemetry-instrumentation-mocha": "0.0.1-rc.1", + "opentelemetry-instrumentation-mocha": "0.0.1-rc.2", "ts-node": "^9.1.1", "typescript": "^4.0.5" }, diff --git a/detectors/node/resource-detector-service/package.json b/detectors/node/resource-detector-service/package.json index 77417792..a8d2a6b8 100644 --- a/detectors/node/resource-detector-service/package.json +++ b/detectors/node/resource-detector-service/package.json @@ -32,20 +32,20 @@ "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "dependencies": { - "@opentelemetry/resources": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0", + "@opentelemetry/resources": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0", "opentelemetry-resource-detector-sync-api": "^0.5.0", "uuid": "^8.3.2" }, "devDependencies": { - "@opentelemetry/api": "^0.20.0", + "@opentelemetry/api": "^0.21.0", "@types/mocha": "^8.2.2", "expect": "^26.6.2", "mocha": "^8.4.0", - "opentelemetry-instrumentation-mocha": "0.0.1-rc.1", + "opentelemetry-instrumentation-mocha": "0.0.1-rc.2", "ts-node": "^9.1.1", "typescript": "^4.0.5" }, diff --git a/detectors/resource-detector-sync-api/package.json b/detectors/resource-detector-sync-api/package.json index cc255214..372e404b 100644 --- a/detectors/resource-detector-sync-api/package.json +++ b/detectors/resource-detector-sync-api/package.json @@ -29,10 +29,10 @@ "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues" }, "peerDependencies": { - "@opentelemetry/api": "^0.20.0" + "@opentelemetry/api": "^0.21.0" }, "dependencies": { - "@opentelemetry/resources": "^0.20.0" + "@opentelemetry/resources": "^0.21.0" }, "devDependencies": { "ts-node": "^9.1.1", From 11a18124a3603736c98ad48af53707f84cb64d06 Mon Sep 17 00:00:00 2001 From: nirsky Date: Sun, 20 Jun 2021 12:10:07 +0300 Subject: [PATCH 7/7] fix: bump version --- packages/instrumentation-aws-sdk/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/instrumentation-aws-sdk/package.json b/packages/instrumentation-aws-sdk/package.json index cc71256a..091b3ed4 100644 --- a/packages/instrumentation-aws-sdk/package.json +++ b/packages/instrumentation-aws-sdk/package.json @@ -41,7 +41,7 @@ "@opentelemetry/core": "^0.21.0", "@opentelemetry/instrumentation": "^0.21.0", "@opentelemetry/semantic-conventions": "^0.21.0", - "opentelemetry-propagation-utils": "^0.7.0" + "opentelemetry-propagation-utils": "^0.7.1" }, "devDependencies": { "@aws-sdk/client-s3": "3.13.1",