-
Notifications
You must be signed in to change notification settings - Fork 513
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into graphql-example
- Loading branch information
Showing
46 changed files
with
521 additions
and
199 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| {"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.26.0","detectors/node/opentelemetry-resource-detector-aws":"1.0.1","detectors/node/opentelemetry-resource-detector-gcp":"0.26.0","detectors/node/opentelemetry-resource-detector-github":"0.26.0","metapackages/auto-instrumentations-node":"0.26.0","metapackages/auto-instrumentations-web":"0.26.0","packages/opentelemetry-browser-extension-autoinjection":"0.26.0","packages/opentelemetry-host-metrics":"0.26.0","packages/opentelemetry-id-generator-aws-xray":"1.0.0","packages/opentelemetry-test-utils":"0.27.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.27.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.1.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.26.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.26.0","plugins/node/opentelemetry-instrumentation-connect":"0.26.0","plugins/node/opentelemetry-instrumentation-dns":"0.26.0","plugins/node/opentelemetry-instrumentation-express":"0.26.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.26.0","plugins/node/opentelemetry-instrumentation-graphql":"0.26.0","plugins/node/opentelemetry-instrumentation-hapi":"0.26.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.26.0","plugins/node/opentelemetry-instrumentation-knex":"0.26.0","plugins/node/opentelemetry-instrumentation-koa":"0.26.0","plugins/node/opentelemetry-instrumentation-memcached":"0.26.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.26.0","plugins/node/opentelemetry-instrumentation-mysql":"0.26.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.26.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.26.0","plugins/node/opentelemetry-instrumentation-net":"0.26.0","plugins/node/opentelemetry-instrumentation-pg":"0.26.0","plugins/node/opentelemetry-instrumentation-pino":"0.26.0","plugins/node/opentelemetry-instrumentation-redis":"0.26.0","plugins/node/opentelemetry-instrumentation-restify":"0.26.0","plugins/node/opentelemetry-instrumentation-router":"0.26.0","plugins/node/opentelemetry-instrumentation-winston":"0.26.0","plugins/web/opentelemetry-instrumentation-document-load":"0.26.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.26.0","plugins/web/opentelemetry-plugin-react-load":"0.26.0","propagators/opentelemetry-propagator-aws-xray":"1.0.0","propagators/opentelemetry-propagator-grpc-census-binary":"0.25.0","propagators/opentelemetry-propagator-ot-trace":"0.25.0"} | ||
| {"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.26.0","detectors/node/opentelemetry-resource-detector-aws":"1.0.1","detectors/node/opentelemetry-resource-detector-gcp":"0.26.0","detectors/node/opentelemetry-resource-detector-github":"0.26.0","metapackages/auto-instrumentations-node":"0.26.1","metapackages/auto-instrumentations-web":"0.26.0","packages/opentelemetry-browser-extension-autoinjection":"0.26.0","packages/opentelemetry-host-metrics":"0.26.0","packages/opentelemetry-id-generator-aws-xray":"1.0.0","packages/opentelemetry-test-utils":"0.27.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.27.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.2.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.26.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.26.0","plugins/node/opentelemetry-instrumentation-connect":"0.26.0","plugins/node/opentelemetry-instrumentation-dns":"0.26.0","plugins/node/opentelemetry-instrumentation-express":"0.26.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.26.0","plugins/node/opentelemetry-instrumentation-graphql":"0.26.1","plugins/node/opentelemetry-instrumentation-hapi":"0.26.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.26.0","plugins/node/opentelemetry-instrumentation-knex":"0.26.0","plugins/node/opentelemetry-instrumentation-koa":"0.26.0","plugins/node/opentelemetry-instrumentation-memcached":"0.26.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.26.0","plugins/node/opentelemetry-instrumentation-mysql":"0.26.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.26.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.27.0","plugins/node/opentelemetry-instrumentation-net":"0.26.0","plugins/node/opentelemetry-instrumentation-pg":"0.26.0","plugins/node/opentelemetry-instrumentation-pino":"0.26.0","plugins/node/opentelemetry-instrumentation-redis":"0.26.0","plugins/node/opentelemetry-instrumentation-restify":"0.26.0","plugins/node/opentelemetry-instrumentation-router":"0.26.0","plugins/node/opentelemetry-instrumentation-winston":"0.26.0","plugins/web/opentelemetry-instrumentation-document-load":"0.26.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.26.0","plugins/web/opentelemetry-plugin-react-load":"0.26.0","propagators/opentelemetry-propagator-aws-xray":"1.0.0","propagators/opentelemetry-propagator-grpc-census-binary":"0.25.0","propagators/opentelemetry-propagator-ot-trace":"0.25.0"} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
plugins/node/opentelemetry-instrumentation-aws-sdk/doc/sns.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # SNS | ||
|
|
||
| SNS is amazon's managed pub/sub system. Thus, it should follow the [OpenTelemetry specification for Messaging systems](https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/semantic_conventions/messaging.md). | ||
|
|
||
| ## Specific trace semantic | ||
|
|
||
| The following methods are automatically enhanced: | ||
|
|
||
| ### Publish messages | ||
|
|
||
| - [Messaging Attributes](https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/semantic_conventions/messaging.md#messaging-attributes) are added by this instrumentation according to the spec. | ||
| - OpenTelemetry trace context is injected as SNS MessageAttributes, so the service receiving the message can link cascading spans to the trace which created the message. | ||
|
|
||
| ### Consumers | ||
| There are many potential consumers: SQS, Lambda, HTTP/S, Email, SMS, mobile notifications. each one of them will received the propagated context in its own way. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 75 additions & 0 deletions
75
plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/MessageAttributes.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| import { | ||
| TextMapGetter, | ||
| TextMapSetter, | ||
| context, | ||
| propagation, | ||
| diag, | ||
| } from '@opentelemetry/api'; | ||
| import type { SQS, SNS } from 'aws-sdk'; | ||
|
|
||
| // https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-quotas.html | ||
| export const MAX_MESSAGE_ATTRIBUTES = 10; | ||
| class ContextSetter | ||
| implements | ||
| TextMapSetter<SQS.MessageBodyAttributeMap | SNS.MessageAttributeMap> | ||
| { | ||
| set( | ||
| carrier: SQS.MessageBodyAttributeMap | SNS.MessageAttributeMap, | ||
| key: string, | ||
| value: string | ||
| ) { | ||
| carrier[key] = { | ||
| DataType: 'String', | ||
| StringValue: value as string, | ||
| }; | ||
| } | ||
| } | ||
| export const contextSetter = new ContextSetter(); | ||
|
|
||
| class ContextGetter | ||
| implements | ||
| TextMapGetter<SQS.MessageBodyAttributeMap | SNS.MessageAttributeMap> | ||
| { | ||
| keys( | ||
| carrier: SQS.MessageBodyAttributeMap | SNS.MessageAttributeMap | ||
| ): string[] { | ||
| return Object.keys(carrier); | ||
| } | ||
|
|
||
| get( | ||
| carrier: SQS.MessageBodyAttributeMap | SNS.MessageAttributeMap, | ||
| key: string | ||
| ): undefined | string | string[] { | ||
| return carrier?.[key]?.StringValue; | ||
| } | ||
| } | ||
| export const contextGetter = new ContextGetter(); | ||
|
|
||
| export const injectPropagationContext = ( | ||
| attributesMap?: SQS.MessageBodyAttributeMap | SNS.MessageAttributeMap | ||
| ): SQS.MessageBodyAttributeMap | SNS.MessageAttributeMap => { | ||
| const attributes = attributesMap ?? {}; | ||
| if (Object.keys(attributes).length < MAX_MESSAGE_ATTRIBUTES) { | ||
| propagation.inject(context.active(), attributes, contextSetter); | ||
| } else { | ||
| diag.warn( | ||
| 'aws-sdk instrumentation: cannot set context propagation on SQS/SNS message due to maximum amount of MessageAttributes' | ||
| ); | ||
| } | ||
| return attributes; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.