Skip to content

Commit 64e884a

Browse files
Alex Botenlzchen
authored andcommitted
move log_exporter to _log_exporter as it's still experimental (#2252)
1 parent c315039 commit 64e884a

File tree

7 files changed

+21
-10
lines changed

7 files changed

+21
-10
lines changed

docs/examples/logs/example.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import logging
22

33
from opentelemetry import trace
4-
from opentelemetry.exporter.otlp.proto.grpc.log_exporter import OTLPLogExporter
4+
from opentelemetry.exporter.otlp.proto.grpc._log_exporter import (
5+
OTLPLogExporter,
6+
)
57
from opentelemetry.sdk._logs import (
68
LogEmitterProvider,
79
OTLPHandler,

docs/sdk/logs.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
opentelemetry.sdk._logs package
22
===============================
33

4+
.. warning::
5+
OpenTelemetry Python logs are in an experimental state. The APIs within
6+
:mod:`opentelemetry.sdk._logs` are subject to change in minor/patch releases and make no
7+
backward compatability guarantees at this time.
8+
9+
Once logs become stable, this package will be be renamed to ``opentelemetry.sdk.logs``.
10+
411
Submodules
512
----------
613

File renamed without changes.

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
from google.rpc.error_details_pb2 import RetryInfo
2222
from grpc import StatusCode, server
2323

24+
from opentelemetry.exporter.otlp.proto.grpc._log_exporter import (
25+
OTLPLogExporter,
26+
)
2427
from opentelemetry.exporter.otlp.proto.grpc.exporter import _translate_value
25-
from opentelemetry.exporter.otlp.proto.grpc.log_exporter import OTLPLogExporter
2628
from opentelemetry.proto.collector.logs.v1.logs_service_pb2 import (
2729
ExportLogsServiceRequest,
2830
ExportLogsServiceResponse,
@@ -168,7 +170,7 @@ def tearDown(self):
168170
)
169171
@patch("opentelemetry.exporter.otlp.proto.grpc.exporter.secure_channel")
170172
@patch(
171-
"opentelemetry.exporter.otlp.proto.grpc.log_exporter.OTLPLogExporter._stub"
173+
"opentelemetry.exporter.otlp.proto.grpc._log_exporter.OTLPLogExporter._stub"
172174
)
173175
# pylint: disable=unused-argument
174176
def test_no_credentials_error(

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
from opentelemetry.sdk._logs.severity import SeverityNumber, std_to_otlp
2525
from opentelemetry.sdk.environment_variables import (
26-
OTEL_PYTHON_LOG_EMITTER_PROVIDER,
26+
_OTEL_PYTHON_LOG_EMITTER_PROVIDER,
2727
)
2828
from opentelemetry.sdk.resources import Resource
2929
from opentelemetry.sdk.util import ns_to_iso_str
@@ -450,14 +450,14 @@ def get_log_emitter_provider() -> LogEmitterProvider:
450450
"""Gets the current global :class:`~.LogEmitterProvider` object."""
451451
global _LOG_EMITTER_PROVIDER # pylint: disable=global-statement
452452
if _LOG_EMITTER_PROVIDER is None:
453-
if OTEL_PYTHON_LOG_EMITTER_PROVIDER not in os.environ:
453+
if _OTEL_PYTHON_LOG_EMITTER_PROVIDER not in os.environ:
454454
_LOG_EMITTER_PROVIDER = LogEmitterProvider()
455455
return _LOG_EMITTER_PROVIDER
456456

457457
_LOG_EMITTER_PROVIDER = cast(
458458
"LogEmitterProvider",
459459
_load_provider(
460-
OTEL_PYTHON_LOG_EMITTER_PROVIDER, "log_emitter_provider"
460+
_OTEL_PYTHON_LOG_EMITTER_PROVIDER, "log_emitter_provider"
461461
),
462462
)
463463

opentelemetry-sdk/src/opentelemetry/sdk/environment_variables.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@
370370
If both are set, :envvar:`OTEL_SERVICE_NAME` takes precedence.
371371
"""
372372

373-
OTEL_PYTHON_LOG_EMITTER_PROVIDER = "OTEL_PYTHON_LOG_EMITTER_PROVIDER"
373+
_OTEL_PYTHON_LOG_EMITTER_PROVIDER = "OTEL_PYTHON_LOG_EMITTER_PROVIDER"
374374
"""
375375
.. envvar:: OTEL_PYTHON_LOG_EMITTER_PROVIDER
376376

opentelemetry-sdk/tests/logs/test_global_provider.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
set_log_emitter_provider,
2626
)
2727
from opentelemetry.sdk.environment_variables import (
28-
OTEL_PYTHON_LOG_EMITTER_PROVIDER,
28+
_OTEL_PYTHON_LOG_EMITTER_PROVIDER,
2929
)
3030

3131

@@ -62,13 +62,13 @@ def test_tracer_provider_override_warning(self):
6262

6363
@patch.dict(
6464
"os.environ",
65-
{OTEL_PYTHON_LOG_EMITTER_PROVIDER: "sdk_log_emitter_provider"},
65+
{_OTEL_PYTHON_LOG_EMITTER_PROVIDER: "sdk_log_emitter_provider"},
6666
)
6767
def test_sdk_log_emitter_provider(self):
6868
reload(_logs)
6969
self.check_override_not_allowed()
7070

71-
@patch.dict("os.environ", {OTEL_PYTHON_LOG_EMITTER_PROVIDER: "unknown"})
71+
@patch.dict("os.environ", {_OTEL_PYTHON_LOG_EMITTER_PROVIDER: "unknown"})
7272
def test_unknown_log_emitter_provider(self):
7373
reload(_logs)
7474
with self.assertRaises(Exception):

0 commit comments

Comments
 (0)