Skip to content

Remove old SigV4 headers before signing #159

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 5 commits into from
Mar 3, 2025
Merged

Remove old SigV4 headers before signing #159

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
162906e
fixed issue where sigv4 headers were not cleaned after each export re…
liustve Mar 1, 2025
6e88d0f
linting fix
liustve Mar 1, 2025
c5a875c
hardcoded sigv4 headers
liustve Mar 3, 2025
87f1ffb
Merge branch 'main' into sigv4_bug_fix
liustve Mar 3, 2025
52e114c
clarifying comment
liustve Mar 3, 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
2 changes: 2 additions & 0 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 @@ -448,6 +448,7 @@ export class AwsSpanProcessorProvider {
return new OTLPHttpTraceExporter();
case 'http/protobuf':
if (otlp_exporter_traces_endpoint && isXrayOtlpEndpoint(otlp_exporter_traces_endpoint)) {
diag.debug('Detected XRay OTLP Traces endpoint. Switching exporter to OtlpAwsSpanExporter');
return new OTLPAwsSpanExporter(otlp_exporter_traces_endpoint);
}
return new OTLPProtoTraceExporter();
Expand All @@ -457,6 +458,7 @@ export class AwsSpanProcessorProvider {
default:
diag.warn(`Unsupported OTLP traces protocol: ${protocol}. Using http/protobuf.`);
if (otlp_exporter_traces_endpoint && isXrayOtlpEndpoint(otlp_exporter_traces_endpoint)) {
diag.debug('Detected XRay OTLP Traces endpoint. Switching exporter to OtlpAwsSpanExporter');
return new OTLPAwsSpanExporter(otlp_exporter_traces_endpoint);
}
return new OTLPProtoTraceExporter();
Expand Down
15 changes: 14 additions & 1 deletion aws-distro-opentelemetry-node-autoinstrumentation/src/otlp-aws-span-exporter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export class OTLPAwsSpanExporter extends OTLPProtoTraceExporter {
path: url.pathname,
body: serializedSpans,
headers: {
...oldHeaders,
...this.removeSigV4Headers(oldHeaders),
host: url.hostname,
},
});
Expand All @@ -93,6 +93,19 @@ export class OTLPAwsSpanExporter extends OTLPProtoTraceExporter {
await super.export(items, resultCallback);
}

// Need to ensure old SigV4 headers do not remain when we inject new SigV4 authorization headers.
private removeSigV4Headers(headers: Record<string, string>) {
const newHeaders: Record<string, string> = {};
const sigV4Headers = ['x-amz-date', 'authorization', 'x-amz-content-sha256', 'x-amz-security-token'];

for (const key in headers) {
if (!sigV4Headers.includes(key.toLowerCase())) {
newHeaders[key] = headers[key];
}
}
return newHeaders;
}

private initDependencies(): any {
if (getNodeVersion() < 16) {
diag.error('SigV4 signing requires atleast Node major version 16');
Expand Down
Loading