Skip to content

Commit 8318f01

Browse files
authored
Update log symbol names (#2943)
1 parent 4c740f9 commit 8318f01

File tree

12 files changed

+291
-295
lines changed

12 files changed

+291
-295
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.13.0...HEAD)
99

10+
- Update log symbol names
11+
([#2943](https://github.com/open-telemetry/opentelemetry-python/pull/2943))
1012
- Update explicit histogram bucket boundaries
1113
([#2947](https://github.com/open-telemetry/opentelemetry-python/pull/2947))
1214
- `exporter-otlp-proto-http`: add user agent string
@@ -17,7 +19,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1719
## [1.13.0-0.34b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.13.0) - 2022-09-26
1820

1921

20-
2122
- Add a configurable max_export_batch_size to the gRPC metrics exporter
2223
([#2809](https://github.com/open-telemetry/opentelemetry-python/pull/2809))
2324
- Remove support for 3.6

docs/examples/logs/example.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
OTLPLogExporter,
66
)
77
from opentelemetry.sdk._logs import (
8-
LogEmitterProvider,
8+
LoggerProvider,
99
LoggingHandler,
10-
set_log_emitter_provider,
10+
set_logger_provider,
1111
)
12-
from opentelemetry.sdk._logs.export import BatchLogProcessor
12+
from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
1313
from opentelemetry.sdk.resources import Resource
1414
from opentelemetry.sdk.trace import TracerProvider
1515
from opentelemetry.sdk.trace.export import (
@@ -22,21 +22,19 @@
2222
BatchSpanProcessor(ConsoleSpanExporter())
2323
)
2424

25-
log_emitter_provider = LogEmitterProvider(
25+
logger_provider = LoggerProvider(
2626
resource=Resource.create(
2727
{
2828
"service.name": "shoppingcart",
2929
"service.instance.id": "instance-12",
3030
}
3131
),
3232
)
33-
set_log_emitter_provider(log_emitter_provider)
33+
set_logger_provider(logger_provider)
3434

3535
exporter = OTLPLogExporter(insecure=True)
36-
log_emitter_provider.add_log_processor(BatchLogProcessor(exporter))
37-
handler = LoggingHandler(
38-
level=logging.NOTSET, log_emitter_provider=log_emitter_provider
39-
)
36+
logger_provider.add_log_record_processor(BatchLogRecordProcessor(exporter))
37+
handler = LoggingHandler(level=logging.NOTSET, logger_provider=logger_provider)
4038

4139
# Attach OTLP handler to root logger
4240
logging.getLogger().addHandler(handler)
@@ -60,4 +58,4 @@
6058
# Do something
6159
logger2.error("Hyderabad, we have a major problem.")
6260

63-
log_emitter_provider.shutdown()
61+
logger_provider.shutdown()

opentelemetry-sdk/pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ sdk = "opentelemetry.sdk.environment_variables"
4040
[project.entry-points.opentelemetry_id_generator]
4141
random = "opentelemetry.sdk.trace.id_generator:RandomIdGenerator"
4242

43-
[project.entry-points.opentelemetry_log_emitter_provider]
44-
sdk_log_emitter_provider = "opentelemetry.sdk._logs:LogEmitterProvider"
43+
[project.entry-points.opentelemetry_logger_provider]
44+
sdk_logger_provider = "opentelemetry.sdk._logs:LoggerProvider"
4545

4646
[project.entry-points.opentelemetry_logs_exporter]
4747
console = "opentelemetry.sdk._logs.export:ConsoleLogExporter"

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
)
3535
from opentelemetry.metrics import set_meter_provider
3636
from opentelemetry.sdk._logs import (
37-
LogEmitterProvider,
37+
LoggerProvider,
3838
LoggingHandler,
39-
set_log_emitter_provider,
39+
set_logger_provider,
4040
)
41-
from opentelemetry.sdk._logs.export import BatchLogProcessor, LogExporter
41+
from opentelemetry.sdk._logs.export import BatchLogRecordProcessor, LogExporter
4242
from opentelemetry.sdk.environment_variables import (
4343
_OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED,
4444
OTEL_EXPORTER_OTLP_LOGS_PROTOCOL,
@@ -212,18 +212,16 @@ def _init_logging(
212212
auto_resource[
213213
ResourceAttributes.TELEMETRY_AUTO_VERSION
214214
] = auto_instrumentation_version
215-
provider = LogEmitterProvider(resource=Resource.create(auto_resource))
216-
set_log_emitter_provider(provider)
215+
provider = LoggerProvider(resource=Resource.create(auto_resource))
216+
set_logger_provider(provider)
217217

218218
for _, exporter_class in exporters.items():
219219
exporter_args = {}
220-
provider.add_log_processor(
221-
BatchLogProcessor(exporter_class(**exporter_args))
220+
provider.add_log_record_processor(
221+
BatchLogRecordProcessor(exporter_class(**exporter_args))
222222
)
223223

224-
handler = LoggingHandler(
225-
level=logging.NOTSET, log_emitter_provider=provider
226-
)
224+
handler = LoggingHandler(level=logging.NOTSET, logger_provider=provider)
227225

228226
logging.getLogger().addHandler(handler)
229227

0 commit comments

Comments
 (0)