Skip to content

Move Sigv4 Log Configuration Message #420

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 3, 2025
Merged

Move Sigv4 Log Configuration Message #420

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55858e9
Move invalid sigv4 log configuration
liustve Jul 3, 2025
51d9cfb
formatting
liustve Jul 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
29 changes: 15 additions & 14 deletions aws-opentelemetry-distro/src/amazon/opentelemetry/distro/aws_opentelemetry_configurator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ def _customize_span_exporter(span_exporter: SpanExporter, resource: Resource) ->
return _create_aws_otlp_exporter(endpoint=endpoint, service=XRAY_SERVICE, region=region)

_logger.warning(
"Improper configuration see: please export/set "
"Improper configuration: please export/set "
"OTEL_EXPORTER_OTLP_TRACES_PROTOCOL=http/protobuf and OTEL_TRACES_EXPORTER=otlp"
)

Expand Down Expand Up @@ -438,15 +438,22 @@ def _customize_logs_exporter(log_exporter: LogExporter) -> LogExporter:

_logger.info("Detected using AWS OTLP Logs Endpoint.")

if isinstance(log_exporter, OTLPLogExporter) and _validate_and_fetch_logs_header().is_valid:
endpoint, region = _extract_endpoint_and_region_from_otlp_endpoint(logs_endpoint)
# Setting default compression mode to Gzip as this is the behavior in upstream's
# collector otlp http exporter:
# https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlphttpexporter
return _create_aws_otlp_exporter(endpoint=endpoint, service=LOGS_SERIVCE, region=region)
if isinstance(log_exporter, OTLPLogExporter):

if _validate_and_fetch_logs_header().is_valid:
endpoint, region = _extract_endpoint_and_region_from_otlp_endpoint(logs_endpoint)
# Setting default compression mode to Gzip as this is the behavior in upstream's
# collector otlp http exporter:
# https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlphttpexporter
return _create_aws_otlp_exporter(endpoint=endpoint, service=LOGS_SERIVCE, region=region)

_logger.warning(
"Improper configuration: Please configure the environment variable OTEL_EXPORTER_OTLP_LOGS_HEADERS "
"to have values for x-aws-log-group and x-aws-log-stream"
)

_logger.warning(
"Improper configuration see: please export/set "
"Improper configuration: please export/set "
"OTEL_EXPORTER_OTLP_LOGS_PROTOCOL=http/protobuf and OTEL_LOGS_EXPORTER=otlp"
)

Expand Down Expand Up @@ -651,12 +658,6 @@ def _validate_and_fetch_logs_header() -> OtlpLogHeaderSetting:

is_valid = log_group is not None and log_stream is not None

if not is_valid:
_logger.warning(
"Improper configuration: Please configure the environment variable OTEL_EXPORTER_OTLP_LOGS_HEADERS "
"to have values for x-aws-log-group and x-aws-log-stream"
)

return OtlpLogHeaderSetting(log_group, log_stream, namespace, is_valid)


Expand Down
Loading