Skip to content
Open
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
5 changes: 4 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import {
setSandboxInit,
setLogger,
setLogLevel,
isManagedInstancesMode,
} from "./utils";
import { getEnhancedMetricTags } from "./metrics/enhanced-metrics";
import { DatadogTraceHeaders } from "./trace/context/extractor";
Expand Down Expand Up @@ -106,7 +107,9 @@ export const _metricsQueue: MetricsQueue = new MetricsQueue();
let currentMetricsListener: MetricsListener | undefined;
let currentTraceListener: TraceListener | undefined;

if (getEnvValue(coldStartTracingEnvVar, "true").toLowerCase() === "true") {
// Skip cold start tracing subscription in managed instances mode
// In managed instances, the tracer library handles cold start independently
if (getEnvValue(coldStartTracingEnvVar, "true").toLowerCase() === "true" && !isManagedInstancesMode()) {
subscribeToDC();
}

Expand Down
37 changes: 22 additions & 15 deletions src/trace/listener.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { patchHttp, unpatchHttp } from "./patch-http";
import { extractTriggerTags, extractHTTPStatusCodeTag, parseEventSource } from "./trigger";
import { ColdStartTracerConfig, ColdStartTracer } from "./cold-start-tracer";
import { logDebug, tagObject } from "../utils";
import { didFunctionColdStart, isProactiveInitialization } from "../utils/cold-start";
import { didFunctionColdStart, isProactiveInitialization, isManagedInstancesMode } from "../utils/cold-start";
import { datadogLambdaVersion } from "../constants";
import { ddtraceVersion, parentSpanFinishTimeHeader, DD_SERVICE_ENV_VAR } from "./constants";
import { patchConsole } from "./patch-console";
Expand Down Expand Up @@ -179,20 +179,27 @@ export class TraceListener {
}
const coldStartNodes = getTraceTree();
if (coldStartNodes.length > 0) {
const coldStartConfig: ColdStartTracerConfig = {
tracerWrapper: this.tracerWrapper,
parentSpan:
didFunctionColdStart() || isProactiveInitialization()
? this.inferredSpan || this.wrappedCurrentSpan
: this.wrappedCurrentSpan,
lambdaFunctionName: this.context?.functionName,
currentSpanStartTime: this.wrappedCurrentSpan?.startTime(),
minDuration: this.config.minColdStartTraceDuration,
ignoreLibs: this.config.coldStartTraceSkipLib,
isColdStart: didFunctionColdStart() || isProactiveInitialization(),
};
const coldStartTracer = new ColdStartTracer(coldStartConfig);
coldStartTracer.trace(coldStartNodes);
// Skip creating cold start spans in managed instances mode
// since the gap between the sandbox init and the function
// invocation might be too large to provide a useful trace and
// experience
if (!isManagedInstancesMode()) {
const coldStartConfig: ColdStartTracerConfig = {
tracerWrapper: this.tracerWrapper,
parentSpan:
didFunctionColdStart() || isProactiveInitialization()
? this.inferredSpan || this.wrappedCurrentSpan
: this.wrappedCurrentSpan,
lambdaFunctionName: this.context?.functionName,
currentSpanStartTime: this.wrappedCurrentSpan?.startTime(),
minDuration: this.config.minColdStartTraceDuration,
ignoreLibs: this.config.coldStartTraceSkipLib,
isColdStart: didFunctionColdStart() || isProactiveInitialization(),
};
const coldStartTracer = new ColdStartTracer(coldStartConfig);
coldStartTracer.trace(coldStartNodes);
}
// Always clear the tree to prevent memory leaks, even if we skip span creation
clearTraceTree();
}
if (this.triggerTags) {
Expand Down
35 changes: 34 additions & 1 deletion src/utils/cold-start.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
import { _resetColdStart, didFunctionColdStart, setSandboxInit, isProactiveInitialization } from "./cold-start";
import {
_resetColdStart,
didFunctionColdStart,
setSandboxInit,
isProactiveInitialization,
isManagedInstancesMode,
} from "./cold-start";

beforeEach(_resetColdStart);
afterAll(_resetColdStart);
Expand Down Expand Up @@ -45,4 +51,31 @@ describe("cold-start", () => {
expect(didFunctionColdStart()).toEqual(false);
expect(isProactiveInitialization()).toEqual(false);
});

it("identifies managed instances mode when AWS_LAMBDA_INITIALIZATION_TYPE is set", () => {
const originalValue = process.env.AWS_LAMBDA_INITIALIZATION_TYPE;

process.env.AWS_LAMBDA_INITIALIZATION_TYPE = "lambda-managed-instances";
expect(isManagedInstancesMode()).toEqual(true);

process.env.AWS_LAMBDA_INITIALIZATION_TYPE = originalValue;
});

it("identifies non-managed instances mode when AWS_LAMBDA_INITIALIZATION_TYPE is not set", () => {
const originalValue = process.env.AWS_LAMBDA_INITIALIZATION_TYPE;

delete process.env.AWS_LAMBDA_INITIALIZATION_TYPE;
expect(isManagedInstancesMode()).toEqual(false);

process.env.AWS_LAMBDA_INITIALIZATION_TYPE = originalValue;
});

it("identifies non-managed instances mode when AWS_LAMBDA_INITIALIZATION_TYPE has different value", () => {
const originalValue = process.env.AWS_LAMBDA_INITIALIZATION_TYPE;

process.env.AWS_LAMBDA_INITIALIZATION_TYPE = "on-demand";
expect(isManagedInstancesMode()).toEqual(false);

process.env.AWS_LAMBDA_INITIALIZATION_TYPE = originalValue;
});
});
10 changes: 10 additions & 0 deletions src/utils/cold-start.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,16 @@ export function getSandboxInitTags(): string[] {
return tags;
}

/**
* Checks if the Lambda function is running in managed instances mode.
* In managed instances mode, we should not create cold start tracing spans
* as the tracer library handles this independently.
* @returns true if running in managed instances mode, false otherwise
*/
export function isManagedInstancesMode(): boolean {
return process.env.AWS_LAMBDA_INITIALIZATION_TYPE === "lambda-managed-instances";
}

// For testing, reset the globals to their original values
export function _resetColdStart() {
functionDidColdStart = true;
Expand Down
8 changes: 7 additions & 1 deletion src/utils/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
export { didFunctionColdStart, getSandboxInitTags, setSandboxInit, isProactiveInitialization } from "./cold-start";
export {
didFunctionColdStart,
getSandboxInitTags,
setSandboxInit,
isProactiveInitialization,
isManagedInstancesMode,
} from "./cold-start";
export { promisifiedHandler } from "./handler";
export { Timer } from "./timer";
export { logWarning, logError, logDebug, Logger, setLogLevel, setLogger, LogLevel } from "./log";
Expand Down
Loading