Skip to content

Commit 29630b5

Browse files
authored
fix(tracer): modify aws-xray-sdk-core import for js (#2164)
1 parent 303428a commit 29630b5

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

Diff for: packages/tracer/src/Tracer.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ import type {
1717
} from './types/Tracer.js';
1818
import { ProviderService } from './provider/ProviderService.js';
1919
import type { ProviderServiceInterface } from './types/ProviderServiceInterface.js';
20-
import { type Segment, Subsegment } from 'aws-xray-sdk-core';
20+
import type { Segment, Subsegment } from 'aws-xray-sdk-core';
21+
import xraySdk from 'aws-xray-sdk-core';
22+
const { Subsegment: XraySubsegment } = xraySdk;
2123

2224
/**
2325
* ## Intro
@@ -578,7 +580,7 @@ class Tracer extends Utility implements TracerInterface {
578580
*/
579581
public getSegment(): Segment | Subsegment | undefined {
580582
if (!this.isTracingEnabled()) {
581-
return new Subsegment('## Dummy segment');
583+
return new XraySubsegment('## Dummy segment');
582584
}
583585
const segment = this.provider.getSegment();
584586
if (segment === undefined) {

Diff for: packages/tracer/src/provider/ProviderService.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ import type {
33
ProviderServiceInterface,
44
ContextMissingStrategy,
55
} from '../types/ProviderServiceInterface.js';
6-
import {
6+
import type { Segment, Subsegment, Logger } from 'aws-xray-sdk-core';
7+
import xraySdk from 'aws-xray-sdk-core';
8+
const {
79
captureAWS,
810
captureAWSClient,
911
captureAWSv3Client,
@@ -13,13 +15,11 @@ import {
1315
getNamespace,
1416
getSegment,
1517
setSegment,
16-
Segment,
17-
Subsegment,
18+
Segment: XraySegment,
1819
setContextMissingStrategy,
1920
setDaemonAddress,
2021
setLogger,
21-
Logger,
22-
} from 'aws-xray-sdk-core';
22+
} = xraySdk;
2323
import { addUserAgentMiddleware } from '@aws-lambda-powertools/commons';
2424

2525
class ProviderService implements ProviderServiceInterface {
@@ -79,7 +79,7 @@ class ProviderService implements ProviderServiceInterface {
7979

8080
return;
8181
}
82-
if (segment instanceof Segment) {
82+
if (segment instanceof XraySegment) {
8383
console.warn(
8484
'You cannot annotate the main segment in a Lambda execution environment'
8585
);
@@ -98,7 +98,7 @@ class ProviderService implements ProviderServiceInterface {
9898

9999
return;
100100
}
101-
if (segment instanceof Segment) {
101+
if (segment instanceof XraySegment) {
102102
console.warn(
103103
'You cannot add metadata to the main segment in a Lambda execution environment'
104104
);

0 commit comments

Comments
 (0)