Skip to content

Commit 3bf832b

Browse files
committed
add fix for proper header config
1 parent 87b6f01 commit 3bf832b

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

aws-distro-opentelemetry-node-autoinstrumentation/src/aws-opentelemetry-configurator.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -853,21 +853,24 @@ function validateLogsHeaders() {
853853
return false;
854854
}
855855

856-
let filteredLogHeadersCount = 0;
856+
let hasLogGroup = false;
857+
let hasLogStream = false;
857858

858859
for (const pair of logsHeaders.split(',')) {
859860
if (pair.includes('=')) {
860861
const [key, value] = pair.split('=', 2);
861-
if ((key === AWS_OTLP_LOGS_GROUP_HEADER || key === AWS_OTLP_LOGS_STREAM_HEADER) && value) {
862-
filteredLogHeadersCount += 1;
862+
if (key === AWS_OTLP_LOGS_GROUP_HEADER && value) {
863+
hasLogGroup = true;
864+
} else if (key === AWS_OTLP_LOGS_STREAM_HEADER && value) {
865+
hasLogStream = true;
863866
}
864867
}
865868
}
866869

867-
if (filteredLogHeadersCount !== 2) {
870+
if (!hasLogGroup || !hasLogStream) {
868871
diag.warn(
869-
'Improper configuration: Please configure the environment variable OTEL_EXPORTER_OTLP_LOGS_HEADERS ' +
870-
'to have values for x-aws-log-group and x-aws-log-stream'
872+
`Improper configuration: Please configure the environment variable OTEL_EXPORTER_OTLP_LOGS_HEADERS ' +
873+
'to have values for ${AWS_OTLP_LOGS_GROUP_HEADER} and ${AWS_OTLP_LOGS_STREAM_HEADER}`
871874
);
872875
return false;
873876
}

0 commit comments

Comments
 (0)