Skip to content

Move Sigv4 Log Configuration Message #232

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

Merged
merged 2 commits into from
Jul 25, 2025
Merged

Move Sigv4 Log Configuration Message #232

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
595b3f6
Move Sigv4 Log Configuration Message
jj22ee Jul 25, 2025
bf103ff
remove filteredLogHeadersCount
jj22ee Jul 25, 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
69 changes: 35 additions & 34 deletions aws-distro-opentelemetry-node-autoinstrumentation/src/aws-opentelemetry-configurator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,42 +561,52 @@ export class AwsLoggerProcessorProvider {
case 'http/json':
exporters.push(new OTLPHttpLogExporter());
break;
case 'http/protobuf':
if (
otlpExporterLogsEndpoint &&
isAwsOtlpEndpoint(otlpExporterLogsEndpoint, 'logs') &&
validateAndFetchLogsHeader().isValid
) {
case 'http/protobuf': {
let logExporter: LogRecordExporter | undefined = undefined;
if (otlpExporterLogsEndpoint && isAwsOtlpEndpoint(otlpExporterLogsEndpoint, 'logs')) {
diag.debug('Detected CloudWatch Logs OTLP endpoint. Switching exporter to OTLPAwsLogExporter');
exporters.push(
new OTLPAwsLogExporter(otlpExporterLogsEndpoint.toLowerCase(), {
if (validateAndFetchLogsHeader().isValid) {
logExporter = new OTLPAwsLogExporter(otlpExporterLogsEndpoint.toLowerCase(), {
compression: CompressionAlgorithm.GZIP,
})
);
} else {
exporters.push(new OTLPProtoLogExporter());
});
} else {
diag.warn(
`Invalid configuration for OTLPAwsLogExporter, please configure the environment variable OTEL_EXPORTER_OTLP_LOGS_HEADERS to have values for ${AWS_OTLP_LOGS_GROUP_HEADER} and ${AWS_OTLP_LOGS_STREAM_HEADER}. Falling back to OTLPProtoLogExporter`
);
}
}

if (!logExporter) {
logExporter = new OTLPProtoLogExporter();
}
exporters.push(logExporter);
break;
}
case undefined:
case '':
exporters.push(new OTLPProtoLogExporter());
break;
default:
default: {
diag.warn(`Unsupported OTLP logs protocol: "${protocol}". Using http/protobuf.`);
if (
otlpExporterLogsEndpoint &&
isAwsOtlpEndpoint(otlpExporterLogsEndpoint, 'logs') &&
validateAndFetchLogsHeader().isValid
) {
let logExporter: LogRecordExporter | undefined = undefined;
if (otlpExporterLogsEndpoint && isAwsOtlpEndpoint(otlpExporterLogsEndpoint, 'logs')) {
diag.debug('Detected CloudWatch Logs OTLP endpoint. Switching exporter to OTLPAwsLogExporter');
exporters.push(
new OTLPAwsLogExporter(otlpExporterLogsEndpoint.toLowerCase(), {
if (validateAndFetchLogsHeader().isValid) {
logExporter = new OTLPAwsLogExporter(otlpExporterLogsEndpoint.toLowerCase(), {
compression: CompressionAlgorithm.GZIP,
})
);
} else {
exporters.push(new OTLPProtoLogExporter());
});
} else {
diag.warn(
`Invalid configuration for OTLPAwsLogExporter, please configure the environment variable OTEL_EXPORTER_OTLP_LOGS_HEADERS to have values for ${AWS_OTLP_LOGS_GROUP_HEADER} and ${AWS_OTLP_LOGS_STREAM_HEADER}. Falling back to OTLPProtoLogExporter`
);
}
}

if (!logExporter) {
logExporter = new OTLPProtoLogExporter();
}
exporters.push(logExporter);
}
}
} else if (exporter === 'console') {
exporters.push(new ConsoleLogRecordExporter());
Expand Down Expand Up @@ -967,7 +977,6 @@ export function validateAndFetchLogsHeader(): OtlpLogHeaderSetting {
let logGroup: string | undefined = undefined;
let logStream: string | undefined = undefined;
let namespace: string | undefined = undefined;
let filteredLogHeadersCount: number = 0;

for (const pair of logHeaders.split(',')) {
const splitIndex = pair.indexOf('=');
Expand All @@ -977,23 +986,15 @@ export function validateAndFetchLogsHeader(): OtlpLogHeaderSetting {

if (key === AWS_OTLP_LOGS_GROUP_HEADER && value) {
logGroup = value;
filteredLogHeadersCount++;
} else if (key === AWS_OTLP_LOGS_STREAM_HEADER && value) {
logStream = value;
filteredLogHeadersCount++;
} else if (key === AWS_EMF_METRICS_NAMESPACE && value) {
namespace = value;
}
}
}

const isValid = filteredLogHeadersCount === 2 && !!logGroup && !!logStream;
if (!isValid) {
diag.warn(
'Incomplete configuration: Please configure the environment variable OTEL_EXPORTER_OTLP_LOGS_HEADERS ' +
`to have values for ${AWS_OTLP_LOGS_GROUP_HEADER} and ${AWS_OTLP_LOGS_STREAM_HEADER}`
);
}
const isValid = !!logGroup && !!logStream;

return {
logGroup: logGroup,
Expand Down
Loading