Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .github/workflows/application-signals-e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,13 @@ jobs:
with:
node-version: 22
staging-instrumentation-name: ${{ inputs.staging-instrumentation-name }}
caller-workflow-name: 'main-build'
caller-workflow-name: 'main-build'

adot-genesis:
needs: [ upload-main-build ]
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/node-ec2-adot-genesis-test.yml@main
secrets: inherit
with:
node-version: 22
staging-instrumentation-name: ${{ inputs.staging-instrumentation-name }}
caller-workflow-name: 'main-build'
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws/aws-distro-opentelemetry-node-autoinstrumentation",
"version": "0.6.0-dev0",
"version": "0.7.0",
"description": "This package provides Amazon Web Services distribution of the OpenTelemetry Node Instrumentation, which allows for auto-instrumentation of NodeJS applications.",
"author": {
"name": "Amazon Web Services",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@ function patchAwsLambdaInstrumentation(instrumentation: Instrumentation): void {

// Override the upstream private _getV3SmithyClientSendPatch method to add middleware to inject X-Ray Trace Context into HTTP Headers
// https://github.com/open-telemetry/opentelemetry-js-contrib/blob/instrumentation-aws-sdk-v0.48.0/plugins/node/opentelemetry-instrumentation-aws-sdk/src/aws-sdk.ts#L373-L384
const awsXrayPropagator = new AWSXRayPropagator();
const V3_CLIENT_CONFIG_KEY = Symbol('opentelemetry.instrumentation.aws-sdk.client.config');
type V3PluginCommand = AwsV3Command<any, any, any, any, any> & {
[V3_CLIENT_CONFIG_KEY]?: any;
Expand All @@ -308,7 +307,7 @@ function patchAwsSdkInstrumentation(instrumentation: Instrumentation): void {
return function send(this: any, command: V3PluginCommand, ...args: unknown[]): Promise<any> {
this.middlewareStack?.add(
(next: any, context: any) => async (middlewareArgs: any) => {
awsXrayPropagator.inject(otelContext.active(), middlewareArgs.request.headers, defaultTextMapSetter);
propagation.inject(otelContext.active(), middlewareArgs.request.headers, defaultTextMapSetter);
// Need to set capitalized version of the trace id to ensure that the Recursion Detection Middleware
// of aws-sdk-js-v3 will detect the propagated X-Ray Context
// See: https://github.com/aws/aws-sdk-js-v3/blob/v3.768.0/packages/middleware-recursion-detection/src/index.ts#L13
Expand Down
2 changes: 1 addition & 1 deletion docker-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws/aws-distro-opentelemetry-node-autoinstrumentation",
"version": "0.6.0-dev0",
"version": "0.7.0",
"private": true,
"scripts": {
"clean": "rimraf build/*",
Expand Down
2 changes: 1 addition & 1 deletion lambda-layer/packages/layer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"instrumentation"
],
"dependencies": {
"@aws/aws-distro-opentelemetry-node-autoinstrumentation": "file:../../../aws-distro-opentelemetry-node-autoinstrumentation/aws-aws-distro-opentelemetry-node-autoinstrumentation-0.6.0-dev0.tgz"
"@aws/aws-distro-opentelemetry-node-autoinstrumentation": "file:../../../aws-distro-opentelemetry-node-autoinstrumentation/aws-aws-distro-opentelemetry-node-autoinstrumentation-0.7.0.tgz"
},
"devDependencies": {
"ts-loader": "^9.5.2",
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aws-otel-js-instrumentation",
"version": "0.6.0-dev0",
"version": "0.7.0",
"description": "This is a repository for AWS Distro of OpenTelemetry JavaScript SDK.",
"repository": {
"type": "git",
Expand Down
Loading