Skip to content

Commit aea5392

Browse files
authored
Merge branch 'main' into pr3995
2 parents d467cc8 + b9cadc0 commit aea5392

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1313
([#4084](https://github.com/open-telemetry/opentelemetry-python/pull/4084))
1414
- Drop Final annotation from Enum in semantic conventions
1515
([#4085](https://github.com/open-telemetry/opentelemetry-python/pull/4085))
16+
- Update log export example to not use root logger ([#4090](https://github.com/open-telemetry/opentelemetry-python/pull/4090))
1617

1718
## Version 1.26.0/0.47b0 (2024-07-25)
1819

docs/examples/logs/example.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,9 @@
3636
# Attach OTLP handler to root logger
3737
logging.getLogger().addHandler(handler)
3838

39-
# Log directly
40-
logging.info("Jackdaws love my big sphinx of quartz.")
41-
4239
# Create different namespaced loggers
40+
# It is recommended to not use the root logger with OTLP handler
41+
# so telemetry is collected only for the application
4342
logger1 = logging.getLogger("myapp.area1")
4443
logger2 = logging.getLogger("myapp.area2")
4544

opentelemetry-api/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dependencies = [
2929
"Deprecated >= 1.2.6",
3030
# FIXME This should be able to be removed after 3.12 is released if there is a reliable API
3131
# in importlib.metadata.
32-
"importlib-metadata >= 6.0, <= 8.0.0",
32+
"importlib-metadata >= 6.0, <= 8.2.0",
3333
]
3434
dynamic = [
3535
"version",

opentelemetry-api/test-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
asgiref==3.7.2
22
Deprecated==1.2.14
3-
importlib-metadata==6.11.0
3+
importlib-metadata==8.2.0
44
iniconfig==2.0.0
55
packaging==24.0
66
pluggy==1.5.0

0 commit comments

Comments
 (0)