Skip to content

fix(nodejs): make aws-lambda and aws-sdk instrumentations respect OTEL_NODE_DISABLED_INSTRUMENTATIONS #2012

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(nodejs): make aws-lambda and aws-sdk instrumentations respect OTEL_NODE_DISABLED_INSTRUMENTATIONS #2012

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e43cfd9
fix(nodejs): make aws-lambda and aws-sdk instrumentations respect OTE…
DivMode Nov 3, 2025
f936f9b
fix: apply GTS linting fixes to wrapper.ts
DivMode Nov 12, 2025
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
61 changes: 48 additions & 13 deletions nodejs/packages/layer/src/wrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ import { AWSXRayPropagator } from '@opentelemetry/propagator-aws-xray';
import { AWSXRayLambdaPropagator } from '@opentelemetry/propagator-aws-xray-lambda';

const defaultInstrumentationList = [
'aws-lambda',
'aws-sdk',
'dns',
'express',
'graphql',
Expand Down Expand Up @@ -309,21 +311,41 @@ async function defaultConfigureInstrumentations() {
}

async function createInstrumentations() {
return [
new AwsInstrumentation(
typeof configureAwsInstrumentation === 'function'
? configureAwsInstrumentation({ suppressInternalInstrumentation: true })
: { suppressInternalInstrumentation: true },
),
new AwsLambdaInstrumentation(
typeof configureLambdaInstrumentation === 'function'
? configureLambdaInstrumentation({})
: {},
),
const activeInstrumentations = getActiveInstumentations();
const instrumentations = [];

// Conditionally load AWS SDK instrumentation
if (activeInstrumentations.has('aws-sdk')) {
instrumentations.push(
new AwsInstrumentation(
typeof configureAwsInstrumentation === 'function'
? configureAwsInstrumentation({
suppressInternalInstrumentation: true,
})
: { suppressInternalInstrumentation: true },
),
);
}

// Conditionally load AWS Lambda instrumentation
if (activeInstrumentations.has('aws-lambda')) {
instrumentations.push(
new AwsLambdaInstrumentation(
typeof configureLambdaInstrumentation === 'function'
? configureLambdaInstrumentation({})
: {},
),
);
}

// Load other instrumentations
instrumentations.push(
...(typeof configureInstrumentations === 'function'
? configureInstrumentations()
: await defaultConfigureInstrumentations()),
];
);

return instrumentations;
}

function getPropagator(): TextMapPropagator {
Expand Down Expand Up @@ -465,13 +487,26 @@ async function initializeMeterProvider(
'@opentelemetry/exporter-metrics-otlp-http'
);

// Configure default meter provider (doesn't export metrics)
// Configure default meter provider with configurable export interval
const metricExporter = new OTLPMetricExporter();

// Respect OTEL_METRIC_EXPORT_INTERVAL for Lambda serverless environments
// Default 60s is too long for Lambda (functions finish in ~5s and freeze)
const exportIntervalMillis = process.env.OTEL_METRIC_EXPORT_INTERVAL
? parseInt(process.env.OTEL_METRIC_EXPORT_INTERVAL, 10)
: 60000;

const exportTimeoutMillis = process.env.OTEL_METRIC_EXPORT_TIMEOUT
? parseInt(process.env.OTEL_METRIC_EXPORT_TIMEOUT, 10)
: 30000;

let meterConfig: unknown = {
resource,
readers: [
new PeriodicExportingMetricReader({
exporter: metricExporter,
exportIntervalMillis,
exportTimeoutMillis,
}),
],
};
Expand Down