Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
c34f3b9
add logs pipeline
liustve Jun 18, 2025
010e7df
add logs pipeline
liustve Jun 20, 2025
24f4308
Merge remote-tracking branch 'origin/mainline' into logs-mainline
liustve Jun 20, 2025
b75fe99
linting fix
liustve Jun 20, 2025
d588605
linting fix
liustve Jun 20, 2025
c78aca5
linting fix
liustve Jun 20, 2025
12eca32
linting fix
liustve Jun 20, 2025
83ec370
linting fix
liustve Jun 20, 2025
79bbf46
linting fix
liustve Jun 20, 2025
b6e1b97
remove gen ai handling logic
liustve Jun 23, 2025
17d0f90
fixed linting
liustve Jun 23, 2025
3d12858
refactor _init_logging to 1.33.1 version
liustve Jun 24, 2025
7f90bc7
refactored batch log record processor
liustve Jun 24, 2025
fdddb7a
Merge remote-tracking branch 'upstream/main' into logs-mainline
liustve Jun 24, 2025
4b7bb0e
linting
liustve Jun 24, 2025
8c64adb
lint fix
liustve Jun 24, 2025
01e3fd8
update configuration and tests
liustve Jun 24, 2025
2f0268c
lint fix
liustve Jun 24, 2025
7dbcb7e
linting fix
liustve Jun 24, 2025
886b009
Merge remote-tracking branch 'upstream/main' into logs-mainline
liustve Jun 28, 2025
93e2836
add cycle detection
liustve Jun 28, 2025
cb21d39
add comment about termination of loop
liustve Jun 30, 2025
651f283
Merge branch 'main' into logs-mainline
liustve Jul 1, 2025
ff2fb5d
refactored otlp aws log exporter, add comments aws batch log processor
liustve Jul 1, 2025
153679a
Merge branch 'main' into logs-mainline
liustve Jul 1, 2025
bce91dc
linting fix
liustve Jul 1, 2025
8479ac9
Merge branch 'logs-mainline' of https://github.com/liustve/aws-otel-p…
liustve Jul 1, 2025
76e4b47
remove shut down check before sleep
liustve Jul 1, 2025
6dd6a67
add better estimation for non-ascii characters
liustve Jul 2, 2025
502eb01
linting + formatting fix
liustve Jul 2, 2025
b30ad4f
fix unit test
liustve Jul 2, 2025
8b7e671
linting fix
liustve Jul 2, 2025
dc98cf8
add interruptible shutdown
liustve Jul 2, 2025
3450a11
fix sleep unit tests + renaming aws batch log processor
liustve Jul 2, 2025
7a83e92
linting fix
liustve Jul 2, 2025
a38d43d
fix test
liustve Jul 2, 2025
726a9a8
linting fix
liustve Jul 2, 2025
fc77123
linting fix
liustve Jul 2, 2025
f571ffb
linting fix
liustve Jul 2, 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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import os
import re
from logging import NOTSET, Logger, getLogger
from typing import ClassVar, Dict, List, Type, Union
from typing import ClassVar, Dict, List, Optional, Type, Union

from importlib_metadata import version
from typing_extensions import override
Expand All @@ -22,6 +22,7 @@
AwsMetricAttributesSpanExporterBuilder,
)
from amazon.opentelemetry.distro.aws_span_metrics_processor_builder import AwsSpanMetricsProcessorBuilder
from amazon.opentelemetry.distro.exporter.otlp.aws.logs.aws_batch_log_record_processor import AwsBatchLogRecordProcessor
from amazon.opentelemetry.distro.exporter.otlp.aws.logs.otlp_aws_logs_exporter import OTLPAwsLogExporter
from amazon.opentelemetry.distro.exporter.otlp.aws.traces.otlp_aws_span_exporter import OTLPAwsSpanExporter
from amazon.opentelemetry.distro.otlp_udp_exporter import OTLPUdpSpanExporter
Expand Down Expand Up @@ -179,9 +180,11 @@ def _init_logging(
resource: Resource = None,
):

# Provides a default OTLP log exporter when none is specified.
# Provides a default OTLP log exporter when it's not set.
# This is the behavior for the logs exporters for other languages.
if not exporters:
logs_exporters = os.environ.get("OTEL_LOGS_EXPORTER")

if not exporters and logs_exporters and logs_exporters.lower() != "none":
exporters = {"otlp": OTLPLogExporter}

provider = LoggerProvider(resource=resource)
Expand All @@ -190,7 +193,11 @@ def _init_logging(
for _, exporter_class in exporters.items():
exporter_args: Dict[str, any] = {}
log_exporter = _customize_logs_exporter(exporter_class(**exporter_args), resource)
provider.add_log_record_processor(BatchLogRecordProcessor(exporter=log_exporter))

if isinstance(log_exporter, OTLPAwsLogExporter) and is_agent_observability_enabled():
provider.add_log_record_processor(AwsBatchLogRecordProcessor(exporter=log_exporter))
else:
provider.add_log_record_processor(BatchLogRecordProcessor(exporter=log_exporter))

handler = LoggingHandler(level=NOTSET, logger_provider=provider)

Expand Down Expand Up @@ -532,7 +539,7 @@ def _is_lambda_environment():
return AWS_LAMBDA_FUNCTION_NAME_CONFIG in os.environ


def _is_aws_otlp_endpoint(otlp_endpoint: str = None, service: str = "xray") -> bool:
def _is_aws_otlp_endpoint(otlp_endpoint: Optional[str] = None, service: str = "xray") -> bool:
"""Is the given endpoint an AWS OTLP endpoint?"""

pattern = AWS_TRACES_OTLP_ENDPOINT_PATTERN if service == "xray" else AWS_LOGS_OTLP_ENDPOINT_PATTERN
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0

import logging
from typing import List, Mapping, Optional, Sequence, cast

from amazon.opentelemetry.distro.exporter.otlp.aws.logs.otlp_aws_logs_exporter import OTLPAwsLogExporter
from opentelemetry.context import _SUPPRESS_INSTRUMENTATION_KEY, attach, detach, set_value
from opentelemetry.sdk._logs import LogData
from opentelemetry.sdk._logs._internal.export import BatchLogExportStrategy
from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
from opentelemetry.util.types import AnyValue

_logger = logging.getLogger(__name__)


class AwsBatchLogRecordProcessor(BatchLogRecordProcessor):
_BASE_LOG_BUFFER_BYTE_SIZE = (
1000 # Buffer size in bytes to account for log metadata not included in the body or attribute size calculation
)
_MAX_LOG_REQUEST_BYTE_SIZE = (
1048576 # https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-OTLPEndpoint.html
)

def __init__(
self,
exporter: OTLPAwsLogExporter,
schedule_delay_millis: Optional[float] = None,
max_export_batch_size: Optional[int] = None,
export_timeout_millis: Optional[float] = None,
max_queue_size: Optional[int] = None,
):

super().__init__(
exporter=exporter,
schedule_delay_millis=schedule_delay_millis,
max_export_batch_size=max_export_batch_size,
export_timeout_millis=export_timeout_millis,
max_queue_size=max_queue_size,
)

self._exporter = exporter

# https://github.com/open-telemetry/opentelemetry-python/blob/main/opentelemetry-sdk/src/opentelemetry/sdk/_shared_internal/__init__.py#L143
def _export(self, batch_strategy: BatchLogExportStrategy) -> None:
"""
Preserves existing batching behavior but will intermediarly export small log batches if
the size of the data in the batch is at orabove AWS CloudWatch's maximum request size limit of 1 MB.

- Data size of exported batches will ALWAYS be <= 1 MB except for the case below:
- If the data size of an exported batch is ever > 1 MB then the batch size is guaranteed to be 1
"""
with self._export_lock:
iteration = 0
# We could see concurrent export calls from worker and force_flush. We call _should_export_batch
# once the lock is obtained to see if we still need to make the requested export.
while self._should_export_batch(batch_strategy, iteration):
iteration += 1
token = attach(set_value(_SUPPRESS_INSTRUMENTATION_KEY, True))
try:
batch_length = min(self._max_export_batch_size, len(self._queue))
batch_data_size = 0
batch = []

for _ in range(batch_length):
log_data: LogData = self._queue.pop()
log_size = self._estimate_log_size(log_data)

if batch and (
batch_data_size + log_size > self._MAX_LOG_REQUEST_BYTE_SIZE
): # pylint: disable=too-many-nested-blocks
# if batch_data_size > MAX_LOG_REQUEST_BYTE_SIZE then len(batch) == 1
if batch_data_size > self._MAX_LOG_REQUEST_BYTE_SIZE:
if self._is_gen_ai_log(batch[0]):
self._exporter.set_gen_ai_log_flag()

self._exporter.export(batch)
batch_data_size = 0
batch = []

batch_data_size += log_size
batch.append(log_data)

if batch:
# if batch_data_size > MAX_LOG_REQUEST_BYTE_SIZE then len(batch) == 1
if batch_data_size > self._MAX_LOG_REQUEST_BYTE_SIZE:
if self._is_gen_ai_log(batch[0]):
self._exporter.set_gen_ai_log_flag()

self._exporter.export(batch)
except Exception as exception: # pylint: disable=broad-exception-caught
_logger.exception("Exception while exporting logs: %s", exception)
detach(token)

def _estimate_log_size(self, log: LogData, depth: int = 3) -> int:
"""
Estimates the size in bytes of a log by calculating the size of its body and its attributes
and adding a buffer amount to account for other log metadata information.
Will process complex log structures up to the specified depth limit.
If the depth limit of the log structure is exceeded, returns truncates calculation
to everything up to that point.

Args:
log: The Log object to calculate size for
depth: Maximum depth to traverse in nested structures (default: 3)

Returns:
int: The estimated size of the log object in bytes
"""

# Use a queue to prevent excessive recursive calls.
# We calculate based on the size of the log record body and attributes for the log.
queue: List[tuple[AnyValue, int]] = [(log.log_record.body, 0), (log.log_record.attributes, -1)]

size: int = self._BASE_LOG_BUFFER_BYTE_SIZE

while queue:
new_queue: List[tuple[AnyValue, int]] = []

for data in queue:
# small optimization, can stop calculating the size once it reaches the 1 MB limit.
if size >= self._MAX_LOG_REQUEST_BYTE_SIZE:
return size

next_val, current_depth = data

if isinstance(next_val, (str, bytes)):
size += len(next_val)
continue

if isinstance(next_val, bool):
size += 4 if next_val else 5
continue

if isinstance(next_val, (float, int)):
size += len(str(next_val))
continue

if current_depth <= depth:
if isinstance(next_val, Sequence):
for content in next_val:
new_queue.append((cast(AnyValue, content), current_depth + 1))

if isinstance(next_val, Mapping):
for key, content in next_val.items():
size += len(key)
new_queue.append((content, current_depth + 1))
else:
_logger.debug(
"Max log depth of %s exceeded. Log data size will not be accurately calculated.", depth
)

queue = new_queue

return size

@staticmethod
def _is_gen_ai_log(log: LogData) -> bool:
"""
Is the log a Gen AI log event?
"""
gen_ai_instrumentations = {
"openinference.instrumentation.langchain",
"openinference.instrumentation.crewai",
"opentelemetry.instrumentation.langchain",
"crewai.telemetry",
"openlit.otel.tracing",
}

return log.instrumentation_scope.name in gen_ai_instrumentations
Loading