Skip to content
Merged
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
51 changes: 29 additions & 22 deletions package-lock.json

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

6 changes: 2 additions & 4 deletions packages/core/lib/env/aws_lambda.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@ var LambdaUtils = require('../utils').LambdaUtils;
var Segment = require('../segments/segment');
var SegmentEmitter = require('../segment_emitter');
var SegmentUtils = require('../segments/segment_utils');

var logger = require('../logger');
const TraceID = require('../segments/attributes/trace_id');

const { InvokeStore } = require('@aws/lambda-invoke-store');

/**
* @namespace
* @ignore
Expand Down Expand Up @@ -82,7 +79,8 @@ var facadeSegment = function facadeSegment() {
};

segment.resolveLambdaTraceData = function resolveLambdaTraceData() {
const traceIdFromInvokeStore = InvokeStore.getXRayTraceId();
const invokeStore = globalThis.awslambda?.InvokeStore;
const traceIdFromInvokeStore = invokeStore?.getXRayTraceId();
const traceIdFromEnv = process.env._X_AMZN_TRACE_ID;
var xAmznLambda = traceIdFromInvokeStore ?? traceIdFromEnv;

Expand Down
4 changes: 3 additions & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,15 @@
"//": "@types/cls-hooked is exposed in API so must be in dependencies, not devDependencies",
"dependencies": {
"@aws-sdk/types": "^3.4.1",
"@aws/lambda-invoke-store": "^0.0.1",
"@smithy/service-error-classification": "^2.0.4",
"@types/cls-hooked": "^4.3.3",
"atomic-batcher": "^1.0.2",
"cls-hooked": "^4.2.2",
"semver": "^7.5.3"
},
"devDependencies": {
"@aws/lambda-invoke-store": "^0.2.0"
},
"scripts": {
"prepare": "npm run compile",
"compile": "tsc && npm run copy-lib && npm run copy-test",
Expand Down
Loading
Loading