Skip to content

Commit 096f46e

Browse files
committed
Format and changelog
1 parent fee11bb commit 096f46e

File tree

16 files changed

+54
-22
lines changed

16 files changed

+54
-22
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2323
([#4637](https://github.com/open-telemetry/opentelemetry-python/pull/4637))
2424
- Logging API accepts optional `context`; deprecates `trace_id`, `span_id`, `trace_flags`.
2525
([#4597](https://github.com/open-telemetry/opentelemetry-python/pull/4597))
26+
- Rename several classes from Log to LogRecord
27+
([#4647](https://github.com/open-telemetry/opentelemetry-python/pull/4647))
2628

2729
## Version 1.34.0/0.55b0 (2025-06-04)
2830

docs/conf.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,10 @@
133133
"opentelemetry.proto.collector.metrics.v1.metrics_service_pb2.ExportMetricsServiceRequest",
134134
),
135135
("py:class", "opentelemetry.sdk._logs._internal.export.LogRecordExporter"),
136-
("py:class", "opentelemetry.sdk._logs._internal.export.LogRecordExportResult"),
136+
(
137+
"py:class",
138+
"opentelemetry.sdk._logs._internal.export.LogRecordExportResult",
139+
),
137140
(
138141
"py:class",
139142
"opentelemetry.proto.collector.logs.v1.logs_service_pb2.ExportLogsServiceRequest",

exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/_internal/_log_encoder/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ def _encode_log(log_data: LogRecordData) -> PB2LogRecord:
6565
)
6666

6767

68-
def _encode_resource_logs(batch: Sequence[LogRecordData]) -> List[ResourceLogs]:
68+
def _encode_resource_logs(
69+
batch: Sequence[LogRecordData],
70+
) -> List[ResourceLogs]:
6971
sdk_resource_logs = defaultdict(lambda: defaultdict(list))
7072

7173
for sdk_log in batch:

exporter/opentelemetry-exporter-otlp-proto-common/tests/test_log_encoder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
from opentelemetry.proto.resource.v1.resource_pb2 import (
4646
Resource as PB2Resource,
4747
)
48-
from opentelemetry.sdk._logs import LogRecordData, LogRecordLimits
4948
from opentelemetry.sdk._logs import LogRecord as SDKLogRecord
49+
from opentelemetry.sdk._logs import LogRecordData, LogRecordLimits
5050
from opentelemetry.sdk.resources import Resource as SDKResource
5151
from opentelemetry.sdk.util.instrumentation import InstrumentationScope
5252
from opentelemetry.trace import TraceFlags

exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/_log_exporter/__init__.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,12 @@
2828
from opentelemetry.proto.collector.logs.v1.logs_service_pb2_grpc import (
2929
LogsServiceStub,
3030
)
31-
from opentelemetry.sdk._logs import LogRecordData
3231
from opentelemetry.sdk._logs import LogRecord as SDKLogRecord
33-
from opentelemetry.sdk._logs.export import LogRecordExporter, LogRecordExportResult
32+
from opentelemetry.sdk._logs import LogRecordData
33+
from opentelemetry.sdk._logs.export import (
34+
LogRecordExporter,
35+
LogRecordExportResult,
36+
)
3437
from opentelemetry.sdk.environment_variables import (
3538
OTEL_EXPORTER_OTLP_LOGS_CERTIFICATE,
3639
OTEL_EXPORTER_OTLP_LOGS_CLIENT_CERTIFICATE,
@@ -45,7 +48,9 @@
4548

4649
class OTLPLogExporter(
4750
LogRecordExporter,
48-
OTLPExporterMixin[SDKLogRecord, ExportLogsServiceRequest, LogRecordExportResult],
51+
OTLPExporterMixin[
52+
SDKLogRecord, ExportLogsServiceRequest, LogRecordExportResult
53+
],
4954
):
5055
_result = LogRecordExportResult
5156
_stub = LogsServiceStub

exporter/opentelemetry-exporter-otlp-proto-grpc/tests/logs/test_otlp_logs_exporter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
from opentelemetry.proto.resource.v1.resource_pb2 import (
4040
Resource as OTLPResource,
4141
)
42-
from opentelemetry.sdk._logs import LogRecordData, LogRecord
42+
from opentelemetry.sdk._logs import LogRecord, LogRecordData
4343
from opentelemetry.sdk.environment_variables import (
4444
OTEL_EXPORTER_OTLP_LOGS_CERTIFICATE,
4545
OTEL_EXPORTER_OTLP_LOGS_CLIENT_CERTIFICATE,

exporter/opentelemetry-exporter-otlp-proto-http/tests/test_proto_log_exporter.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
from opentelemetry.proto.collector.logs.v1.logs_service_pb2 import (
3939
ExportLogsServiceRequest,
4040
)
41-
from opentelemetry.sdk._logs import LogRecordData
4241
from opentelemetry.sdk._logs import LogRecord as SDKLogRecord
42+
from opentelemetry.sdk._logs import LogRecordData
4343
from opentelemetry.sdk._logs.export import LogRecordExportResult
4444
from opentelemetry.sdk.environment_variables import (
4545
OTEL_EXPORTER_OTLP_CERTIFICATE,
@@ -347,7 +347,8 @@ def test_2xx_status_code(self, mock_otlp_metric_exporter):
347347
"""
348348

349349
self.assertEqual(
350-
OTLPLogExporter().export(MagicMock()), LogRecordExportResult.SUCCESS
350+
OTLPLogExporter().export(MagicMock()),
351+
LogRecordExportResult.SUCCESS,
351352
)
352353

353354
@patch.object(Session, "post")

opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@
3838
from opentelemetry.metrics import set_meter_provider
3939
from opentelemetry.sdk._events import EventLoggerProvider
4040
from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler
41-
from opentelemetry.sdk._logs.export import BatchLogRecordProcessor, LogRecordExporter
41+
from opentelemetry.sdk._logs.export import (
42+
BatchLogRecordProcessor,
43+
LogRecordExporter,
44+
)
4245
from opentelemetry.sdk.environment_variables import (
4346
_OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED,
4447
OTEL_EXPORTER_OTLP_LOGS_PROTOCOL,

opentelemetry-sdk/src/opentelemetry/sdk/_logs/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
Logger,
1818
LoggerProvider,
1919
LoggingHandler,
20+
LogRecord,
2021
LogRecordData,
2122
LogRecordDeprecatedInitWarning,
2223
LogRecordDroppedAttributesWarning,
2324
LogRecordLimits,
24-
LogRecord,
2525
LogRecordProcessor,
2626
)
2727

opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/export/__init__.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@
2626
detach,
2727
set_value,
2828
)
29-
from opentelemetry.sdk._logs import LogRecordData, LogRecord, LogRecordProcessor
29+
from opentelemetry.sdk._logs import (
30+
LogRecord,
31+
LogRecordData,
32+
LogRecordProcessor,
33+
)
3034
from opentelemetry.sdk._shared_internal import BatchProcessor
3135
from opentelemetry.sdk.environment_variables import (
3236
OTEL_BLRP_EXPORT_TIMEOUT,

0 commit comments

Comments
 (0)