Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#4840](https://github.com/open-telemetry/opentelemetry-python/pull/4840))
- Add python 3.14 support
([#4798](https://github.com/open-telemetry/opentelemetry-python/pull/4798))
- Silence events API warnings for internal users
([#4847](https://github.com/open-telemetry/opentelemetry-python/pull/4847))

## Version 1.39.0/0.60b0 (2025-12-03)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
import logging
import logging.config
import os
import warnings
from abc import ABC, abstractmethod
from os import environ
from typing import Any, Callable, Mapping, Sequence, Type, Union

from typing_extensions import Literal

from opentelemetry._events import set_event_logger_provider
from opentelemetry._logs import set_logger_provider
from opentelemetry.environment_variables import (
OTEL_LOGS_EXPORTER,
Expand All @@ -37,7 +37,6 @@
OTEL_TRACES_EXPORTER,
)
from opentelemetry.metrics import set_meter_provider
from opentelemetry.sdk._events import EventLoggerProvider
from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler
from opentelemetry.sdk._logs.export import (
BatchLogRecordProcessor,
Expand Down Expand Up @@ -268,8 +267,19 @@ def _init_logging(
BatchLogRecordProcessor(exporter_class(**exporter_args))
)

event_logger_provider = EventLoggerProvider(logger_provider=provider)
set_event_logger_provider(event_logger_provider)
# silence warnings from internal users until we drop the deprecated Events API
with warnings.catch_warnings():
warnings.simplefilter("ignore", category=DeprecationWarning)
# pylint: disable=import-outside-toplevel
from opentelemetry._events import ( # noqa: PLC0415
set_event_logger_provider,
)
from opentelemetry.sdk._events import ( # noqa: PLC0415
EventLoggerProvider,
)

event_logger_provider = EventLoggerProvider(logger_provider=provider)
set_event_logger_provider(event_logger_provider)

if setup_logging_handler:
# Add OTel handler
Expand Down
4 changes: 2 additions & 2 deletions opentelemetry-sdk/tests/test_configurator.py
Original file line number Diff line number Diff line change
Expand Up @@ -614,11 +614,11 @@ def setUp(self):

self.event_logger_provider_instance_mock = Mock()
self.event_logger_provider_patch = patch(
"opentelemetry.sdk._configuration.EventLoggerProvider",
"opentelemetry.sdk._events.EventLoggerProvider",
return_value=self.event_logger_provider_instance_mock,
)
self.set_event_logger_provider_patch = patch(
"opentelemetry.sdk._configuration.set_event_logger_provider"
"opentelemetry._events.set_event_logger_provider"
)

self.processor_mock = self.processor_patch.start()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

import unittest

from opentelemetry import _events as events_api
from opentelemetry import trace as trace_api
from opentelemetry._logs import _internal as logging_api
from opentelemetry.metrics import _internal as metrics_api
Expand Down Expand Up @@ -49,6 +48,10 @@ def reset_logging_globals() -> None:
# pylint: disable=protected-access
def reset_event_globals() -> None:
"""WARNING: only use this for tests."""
from opentelemetry import ( # pylint: disable=import-outside-toplevel # noqa: PLC0415
_events as events_api,
)

events_api._EVENT_LOGGER_PROVIDER_SET_ONCE = Once() # type: ignore[attr-defined]
events_api._EVENT_LOGGER_PROVIDER = None # type: ignore[attr-defined]
events_api._PROXY_EVENT_LOGGER_PROVIDER = (
Expand Down
Loading