Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(aws-sdk): set spanKind to CLIENT by default in v3 #1177

Merged
merged 10 commits into from
Sep 21, 2022
Merged

fix(aws-sdk): set spanKind to CLIENT by default in v3 #1177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7b1fca8
fix(aws-sdk): set soanKind to CLIENT by default
haddasbronfman Sep 15, 2022
c7144ee
fix(aws-sdk): assert in v2 and v3 test the spanKind is CLIENT
haddasbronfman Sep 15, 2022
c017019
Merge branch 'main' into aws-span-kind
haddasbronfman Sep 15, 2022
740a008
Merge branch 'main' into aws-span-kind
haddasbronfman Sep 18, 2022
9f694e2
fix(aws-sdk): lint
haddasbronfman Sep 18, 2022
f45ab80
Merge branch 'aws-span-kind' of github.com:epsagon/opentelemetry-js-c…
haddasbronfman Sep 18, 2022
02dc8c6
Merge branch 'main' into aws-span-kind
haddasbronfman Sep 18, 2022
caa7711
Merge branch 'main' into aws-span-kind
haddasbronfman Sep 19, 2022
a6ff109
Merge branch 'main' into aws-span-kind
haddasbronfman Sep 19, 2022
7f58ca6
Merge branch 'main' into aws-span-kind
haddasbronfman Sep 21, 2022
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
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-aws-sdk/src/aws-sdk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ export class AwsInstrumentation extends InstrumentationBase<any> {
metadata.spanName ??
`${normalizedRequest.serviceName}.${normalizedRequest.commandName}`;
const newSpan = this.tracer.startSpan(name, {
kind: metadata.spanKind,
kind: metadata.spanKind ?? SpanKind.CLIENT,
attributes: {
...extractAttributesFromNormalizedRequest(normalizedRequest),
...metadata.spanAttributes,
Expand Down
4 changes: 2 additions & 2 deletions plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v2.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const instrumentation = registerInstrumentationTesting(
import * as AWS from 'aws-sdk';

import { ReadableSpan } from '@opentelemetry/sdk-trace-base';
import { SpanStatusCode, Span } from '@opentelemetry/api';
import { SpanStatusCode, Span, SpanKind } from '@opentelemetry/api';
import { AttributeNames } from '../src/enums';
import { mockV2AwsSend } from './testing-utils';
import * as expect from 'expect';
Expand Down Expand Up @@ -123,7 +123,7 @@ describe('instrumentation-aws-sdk-v2', () => {
).toBe(200);

expect(spanCreateBucket.name).toBe('S3.CreateBucket');

expect(spanCreateBucket.kind).toEqual(SpanKind.CLIENT);
expect(spanPutObject.attributes[AttributeNames.AWS_OPERATION]).toBe(
'putObject'
);
Expand Down
2 changes: 2 additions & 0 deletions plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v3.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import {
S3Client,
} from '@aws-sdk/client-s3';
import { SQS } from '@aws-sdk/client-sqs';
import { SpanKind } from '@opentelemetry/api';

// set aws environment variables, so tests in non aws environment are able to run
process.env.AWS_ACCESS_KEY_ID = 'testing';
Expand Down Expand Up @@ -78,6 +79,7 @@ describe('instrumentation-aws-sdk-v3', () => {
expect(span.attributes[SemanticAttributes.RPC_SERVICE]).toEqual('S3');
expect(span.attributes[AttributeNames.AWS_REGION]).toEqual(region);
expect(span.name).toEqual('S3.PutObject');
expect(span.kind).toEqual(SpanKind.CLIENT);
expect(span.attributes[SemanticAttributes.HTTP_STATUS_CODE]).toEqual(200);
});

Expand Down