Skip to content
This repository was archived by the owner on Oct 31, 2024. It is now read-only.

Commit 7c1c7cd

Browse files
author
Amir Blum
authored
chore: upgrade otel to v0.14.0 (#49)
1 parent 1d87ad8 commit 7c1c7cd

File tree

12 files changed

+52
-45
lines changed

12 files changed

+52
-45
lines changed

‎packages/plugin-aws-sdk/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
"url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues"
3131
},
3232
"devDependencies": {
33-
"@opentelemetry/api": "^0.13.0",
34-
"@opentelemetry/node": "^0.13.0",
35-
"@opentelemetry/tracing": "^0.13.0",
33+
"@opentelemetry/api": "^0.14.0",
34+
"@opentelemetry/node": "^0.14.0",
35+
"@opentelemetry/tracing": "^0.14.0",
3636
"@types/jest": "^26.0.15",
3737
"@types/shimmer": "^1.0.1",
3838
"aws-sdk": "^2.780.0",
@@ -41,9 +41,9 @@
4141
"typescript": "^4.0.5"
4242
},
4343
"dependencies": {
44-
"@opentelemetry/api": "^0.13.0",
45-
"@opentelemetry/core": "^0.13.0",
46-
"@opentelemetry/semantic-conventions": "^0.13.0",
44+
"@opentelemetry/api": "^0.14.0",
45+
"@opentelemetry/core": "^0.14.0",
46+
"@opentelemetry/semantic-conventions": "^0.14.0",
4747
"opentelemetry-propagation-utils": "0.1.0",
4848
"shimmer": "^1.2.1"
4949
},

‎packages/plugin-aws-sdk/src/services/sqs.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
TextMapSetter,
99
setActiveSpan,
1010
context,
11+
ROOT_CONTEXT,
1112
} from '@opentelemetry/api';
1213
import { pubsubPropagation } from 'opentelemetry-propagation-utils';
1314
import { RequestMetadata, ServiceExtension } from './ServiceExtension';
@@ -147,7 +148,7 @@ export class SqsServiceExtension implements ServiceExtension {
147148
tracer: this.tracer,
148149
messageToSpanDetails: (message: AWS.SQS.Message) => ({
149150
name: queueName,
150-
parentContext: propagation.extract(message.MessageAttributes, sqsContextGetter),
151+
parentContext: propagation.extract(ROOT_CONTEXT, message.MessageAttributes, sqsContextGetter),
151152
attributes: {
152153
[SqsAttributeNames.MESSAGING_SYSTEM]: 'aws.sqs',
153154
[SqsAttributeNames.MESSAGING_DESTINATION]: queueName,
@@ -181,7 +182,7 @@ export class SqsServiceExtension implements ServiceExtension {
181182
InjectPropagationContext(attributesMap?: MessageBodyAttributeMap): MessageBodyAttributeMap {
182183
const attributes = attributesMap ?? {};
183184
if (Object.keys(attributes).length < SQS_MAX_MESSAGE_ATTRIBUTES) {
184-
propagation.inject(attributes, sqsContextSetter);
185+
propagation.inject(context.active(), attributes, sqsContextSetter);
185186
} else {
186187
this.logger.warn(
187188
'OpenTelemetry aws-sdk plugin cannot set context propagation on SQS message due to maximum amount of MessageAttributes'

‎packages/plugin-aws-sdk/src/types.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { PluginConfig, Span } from '@opentelemetry/api';
1+
import { Span } from '@opentelemetry/api';
2+
import { PluginConfig } from '@opentelemetry/core';
23
import AWS from 'aws-sdk';
34

45
export interface AwsSdkRequestCustomAttributeFunction {

‎packages/plugin-kafkajs/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
"url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues"
3131
},
3232
"devDependencies": {
33-
"@opentelemetry/node": "^0.13.0",
34-
"@opentelemetry/tracing": "^0.13.0",
33+
"@opentelemetry/node": "^0.14.0",
34+
"@opentelemetry/tracing": "^0.14.0",
3535
"@types/jest": "^25.2.3",
3636
"@types/shimmer": "^1.0.1",
3737
"jest": "^26.0.1",
@@ -40,8 +40,8 @@
4040
"typescript": "^3.9.5"
4141
},
4242
"dependencies": {
43-
"@opentelemetry/api": "^0.13.0",
44-
"@opentelemetry/core": "^0.13.0",
43+
"@opentelemetry/api": "^0.14.0",
44+
"@opentelemetry/core": "^0.14.0",
4545
"@opentelemetry/semantic-conventions": "^0.14.0",
4646
"shimmer": "^1.2.1"
4747
},

‎packages/plugin-kafkajs/src/kafkajs.ts‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
import { BasePlugin } from '@opentelemetry/core';
2-
import { SpanKind, Span, StatusCode, Context, propagation, Link, getActiveSpan } from '@opentelemetry/api';
2+
import {
3+
SpanKind,
4+
Span,
5+
StatusCode,
6+
Context,
7+
propagation,
8+
Link,
9+
getActiveSpan,
10+
setActiveSpan,
11+
context,
12+
} from '@opentelemetry/api';
313
import { ROOT_CONTEXT } from '@opentelemetry/context-base';
414
import { MessagingAttribute, MessagingOperationName } from '@opentelemetry/semantic-conventions';
515
import * as shimmer from 'shimmer';
@@ -78,9 +88,9 @@ export class KafkaJsPlugin extends BasePlugin<typeof kafkaJs> {
7888
const thisPlugin = this;
7989
return function (payload: EachMessagePayload): Promise<void> {
8090
const propagatedContext: Context = propagation.extract(
91+
ROOT_CONTEXT,
8192
payload.message.headers,
82-
bufferTextMapGetter,
83-
ROOT_CONTEXT
93+
bufferTextMapGetter
8494
);
8595
const span = thisPlugin._startConsumerSpan(
8696
payload.topic,
@@ -109,9 +119,9 @@ export class KafkaJsPlugin extends BasePlugin<typeof kafkaJs> {
109119
return thisPlugin._tracer.withSpan(receivingSpan, () => {
110120
const spans = payload.batch.messages.map((message: KafkaMessage) => {
111121
const propagatedContext: Context = propagation.extract(
122+
ROOT_CONTEXT,
112123
message.headers,
113-
bufferTextMapGetter,
114-
ROOT_CONTEXT
124+
bufferTextMapGetter
115125
);
116126
const spanContext = getActiveSpan(propagatedContext)?.context();
117127
let origSpanLink: Link;
@@ -180,13 +190,7 @@ export class KafkaJsPlugin extends BasePlugin<typeof kafkaJs> {
180190
});
181191
}
182192

183-
private _startConsumerSpan(
184-
topic: string,
185-
message: KafkaMessage,
186-
operation: string,
187-
context: Context,
188-
link?: Link
189-
) {
193+
private _startConsumerSpan(topic: string, message: KafkaMessage, operation: string, context: Context, link?: Link) {
190194
const span = this._tracer.startSpan(
191195
topic,
192196
{
@@ -219,10 +223,8 @@ export class KafkaJsPlugin extends BasePlugin<typeof kafkaJs> {
219223
},
220224
});
221225

222-
this._tracer.withSpan(span, () => {
223-
if (!message.headers) message.headers = {};
224-
propagation.inject(message.headers);
225-
});
226+
message.headers = message.headers ?? {};
227+
propagation.inject(setActiveSpan(context.active(), span), message.headers);
226228

227229
if (this._config?.producerHook) {
228230
this._safeExecute([], () => this._config.producerHook!(span, topic, message), false);

‎packages/plugin-kafkajs/src/types.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { PluginConfig, Span } from '@opentelemetry/api';
1+
import { Span } from '@opentelemetry/api';
2+
import { PluginConfig } from '@opentelemetry/core';
23
import { Message } from 'kafkajs';
34

45
export interface KafkaProducerCustomAttributeFunction {

‎packages/plugin-sequelize/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
"url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues"
3636
},
3737
"dependencies": {
38-
"@opentelemetry/api": "^0.13.0",
39-
"@opentelemetry/core": "^0.13.0",
40-
"@opentelemetry/semantic-conventions": "^0.13.0",
38+
"@opentelemetry/api": "^0.14.0",
39+
"@opentelemetry/core": "^0.14.0",
40+
"@opentelemetry/semantic-conventions": "^0.14.0",
4141
"shimmer": "^1.2.1"
4242
},
4343
"devDependencies": {
44-
"@opentelemetry/node": "^0.13.0",
45-
"@opentelemetry/tracing": "^0.13.0",
44+
"@opentelemetry/node": "^0.14.0",
45+
"@opentelemetry/tracing": "^0.14.0",
4646
"@types/jest": "^25.2.3",
4747
"@types/shimmer": "^1.0.1",
4848
"jest": "^26.4.2",

‎packages/plugin-sequelize/src/types.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { PluginConfig, Span } from '@opentelemetry/api';
1+
import { Span } from '@opentelemetry/api';
2+
import { PluginConfig } from '@opentelemetry/core';
23

34
export type SequelizeResponseCustomAttributesFunction = (span: Span, response: any) => void;
45

‎packages/plugin-typeorm/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
"url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues"
3131
},
3232
"dependencies": {
33-
"@opentelemetry/core": "^0.13.0",
34-
"@opentelemetry/semantic-conventions": "^0.13.0",
33+
"@opentelemetry/core": "^0.14.0",
34+
"@opentelemetry/semantic-conventions": "^0.14.0",
3535
"shimmer": "^1.2.1"
3636
},
3737
"devDependencies": {
38-
"@opentelemetry/node": "^0.13.0",
39-
"@opentelemetry/tracing": "^0.13.0",
38+
"@opentelemetry/node": "^0.14.0",
39+
"@opentelemetry/tracing": "^0.14.0",
4040
"@types/jest": "^25.2.3",
4141
"@types/shimmer": "^1.0.1",
4242
"jest": "^26.4.2",

‎packages/plugin-typeorm/src/types.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { PluginConfig, Span } from '@opentelemetry/api';
1+
import { Span } from '@opentelemetry/api';
2+
import { PluginConfig } from '@opentelemetry/core';
23

34
export type TypeormResponseCustomAttributesFunction = (span: Span, response: any) => void;
45

0 commit comments

Comments
 (0)