Skip to content

Commit ea6cf00

Browse files
xrmxxrmx
committed
ExtendedAttributes -> _ExtendedAttributes
1 parent f4f9914 commit ea6cf00

File tree

8 files changed

+30
-30
lines changed

8 files changed

+30
-30
lines changed

‎opentelemetry-api/src/opentelemetry/_events/__init__.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from opentelemetry.trace.span import TraceFlags
2626
from opentelemetry.util._once import Once
2727
from opentelemetry.util._providers import _load_provider
28-
from opentelemetry.util.types import AnyValue, ExtendedAttributes
28+
from opentelemetry.util.types import AnyValue, _ExtendedAttributes
2929

3030
_logger = getLogger(__name__)
3131

@@ -40,7 +40,7 @@ def __init__(
4040
trace_flags: Optional["TraceFlags"] = None,
4141
body: Optional[AnyValue] = None,
4242
severity_number: Optional[SeverityNumber] = None,
43-
attributes: Optional[ExtendedAttributes] = None,
43+
attributes: Optional[_ExtendedAttributes] = None,
4444
):
4545
attributes = attributes or {}
4646
event_attributes = {
@@ -65,7 +65,7 @@ def __init__(
6565
name: str,
6666
version: Optional[str] = None,
6767
schema_url: Optional[str] = None,
68-
attributes: Optional[ExtendedAttributes] = None,
68+
attributes: Optional[_ExtendedAttributes] = None,
6969
):
7070
self._name = name
7171
self._version = version
@@ -88,7 +88,7 @@ def __init__(
8888
name: str,
8989
version: Optional[str] = None,
9090
schema_url: Optional[str] = None,
91-
attributes: Optional[ExtendedAttributes] = None,
91+
attributes: Optional[_ExtendedAttributes] = None,
9292
):
9393
super().__init__(
9494
name=name,
@@ -125,7 +125,7 @@ def get_event_logger(
125125
name: str,
126126
version: Optional[str] = None,
127127
schema_url: Optional[str] = None,
128-
attributes: Optional[ExtendedAttributes] = None,
128+
attributes: Optional[_ExtendedAttributes] = None,
129129
) -> EventLogger:
130130
"""Returns an EventLoggerProvider for use."""
131131

@@ -136,7 +136,7 @@ def get_event_logger(
136136
name: str,
137137
version: Optional[str] = None,
138138
schema_url: Optional[str] = None,
139-
attributes: Optional[ExtendedAttributes] = None,
139+
attributes: Optional[_ExtendedAttributes] = None,
140140
) -> EventLogger:
141141
return NoOpEventLogger(
142142
name, version=version, schema_url=schema_url, attributes=attributes
@@ -149,7 +149,7 @@ def get_event_logger(
149149
name: str,
150150
version: Optional[str] = None,
151151
schema_url: Optional[str] = None,
152-
attributes: Optional[ExtendedAttributes] = None,
152+
attributes: Optional[_ExtendedAttributes] = None,
153153
) -> EventLogger:
154154
if _EVENT_LOGGER_PROVIDER:
155155
return _EVENT_LOGGER_PROVIDER.get_event_logger(
@@ -211,7 +211,7 @@ def get_event_logger(
211211
name: str,
212212
version: Optional[str] = None,
213213
schema_url: Optional[str] = None,
214-
attributes: Optional[ExtendedAttributes] = None,
214+
attributes: Optional[_ExtendedAttributes] = None,
215215
event_logger_provider: Optional[EventLoggerProvider] = None,
216216
) -> "EventLogger":
217217
if event_logger_provider is None:

‎opentelemetry-api/src/opentelemetry/_logs/_internal/__init__.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
from opentelemetry.trace.span import TraceFlags
4545
from opentelemetry.util._once import Once
4646
from opentelemetry.util._providers import _load_provider
47-
from opentelemetry.util.types import AnyValue, ExtendedAttributes
47+
from opentelemetry.util.types import AnyValue, _ExtendedAttributes
4848

4949
_logger = getLogger(__name__)
5050

@@ -67,7 +67,7 @@ def __init__(
6767
severity_text: Optional[str] = None,
6868
severity_number: Optional[SeverityNumber] = None,
6969
body: AnyValue = None,
70-
attributes: Optional[ExtendedAttributes] = None,
70+
attributes: Optional[_ExtendedAttributes] = None,
7171
):
7272
self.timestamp = timestamp
7373
if observed_timestamp is None:
@@ -90,7 +90,7 @@ def __init__(
9090
name: str,
9191
version: Optional[str] = None,
9292
schema_url: Optional[str] = None,
93-
attributes: Optional[ExtendedAttributes] = None,
93+
attributes: Optional[_ExtendedAttributes] = None,
9494
) -> None:
9595
super().__init__()
9696
self._name = name
@@ -119,7 +119,7 @@ def __init__( # pylint: disable=super-init-not-called
119119
name: str,
120120
version: Optional[str] = None,
121121
schema_url: Optional[str] = None,
122-
attributes: Optional[ExtendedAttributes] = None,
122+
attributes: Optional[_ExtendedAttributes] = None,
123123
):
124124
self._name = name
125125
self._version = version
@@ -158,7 +158,7 @@ def get_logger(
158158
name: str,
159159
version: Optional[str] = None,
160160
schema_url: Optional[str] = None,
161-
attributes: Optional[ExtendedAttributes] = None,
161+
attributes: Optional[_ExtendedAttributes] = None,
162162
) -> Logger:
163163
"""Returns a `Logger` for use by the given instrumentation library.
164164
@@ -196,7 +196,7 @@ def get_logger(
196196
name: str,
197197
version: Optional[str] = None,
198198
schema_url: Optional[str] = None,
199-
attributes: Optional[ExtendedAttributes] = None,
199+
attributes: Optional[_ExtendedAttributes] = None,
200200
) -> Logger:
201201
"""Returns a NoOpLogger."""
202202
return NoOpLogger(
@@ -210,7 +210,7 @@ def get_logger(
210210
name: str,
211211
version: Optional[str] = None,
212212
schema_url: Optional[str] = None,
213-
attributes: Optional[ExtendedAttributes] = None,
213+
attributes: Optional[_ExtendedAttributes] = None,
214214
) -> Logger:
215215
if _LOGGER_PROVIDER:
216216
return _LOGGER_PROVIDER.get_logger(
@@ -273,7 +273,7 @@ def get_logger(
273273
instrumenting_library_version: str = "",
274274
logger_provider: Optional[LoggerProvider] = None,
275275
schema_url: Optional[str] = None,
276-
attributes: Optional[ExtendedAttributes] = None,
276+
attributes: Optional[_ExtendedAttributes] = None,
277277
) -> "Logger":
278278
"""Returns a `Logger` for use within a python process.
279279

‎opentelemetry-api/src/opentelemetry/attributes/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ class BoundedAttributes(MutableMapping): # type: ignore
238238
def __init__(
239239
self,
240240
maxlen: Optional[int] = None,
241-
attributes: Optional[types.ExtendedAttributes] = None,
241+
attributes: Optional[types._ExtendedAttributes] = None,
242242
immutable: bool = True,
243243
max_value_len: Optional[int] = None,
244244
extended_attributes: bool = False,

‎opentelemetry-api/src/opentelemetry/util/types.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@
5656
...,
5757
]
5858

59-
ExtendedAttributes = Mapping[str, "AnyValue"]
59+
_ExtendedAttributes = Mapping[str, "AnyValue"]

‎opentelemetry-api/tests/events/test_proxy_event.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import opentelemetry._events as events
66
from opentelemetry.test.globals_test import EventsGlobalsTest
7-
from opentelemetry.util.types import ExtendedAttributes
7+
from opentelemetry.util.types import _ExtendedAttributes
88

99

1010
class TestProvider(events.NoOpEventLoggerProvider):
@@ -13,7 +13,7 @@ def get_event_logger(
1313
name: str,
1414
version: typing.Optional[str] = None,
1515
schema_url: typing.Optional[str] = None,
16-
attributes: typing.Optional[ExtendedAttributes] = None,
16+
attributes: typing.Optional[_ExtendedAttributes] = None,
1717
) -> events.EventLogger:
1818
return LoggerTest(name)
1919

‎opentelemetry-api/tests/logs/test_proxy.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import opentelemetry._logs._internal as _logs_internal
2020
from opentelemetry import _logs
2121
from opentelemetry.test.globals_test import LoggingGlobalsTest
22-
from opentelemetry.util.types import ExtendedAttributes
22+
from opentelemetry.util.types import _ExtendedAttributes
2323

2424

2525
class TestProvider(_logs.NoOpLoggerProvider):
@@ -28,7 +28,7 @@ def get_logger(
2828
name: str,
2929
version: typing.Optional[str] = None,
3030
schema_url: typing.Optional[str] = None,
31-
attributes: typing.Optional[ExtendedAttributes] = None,
31+
attributes: typing.Optional[_ExtendedAttributes] = None,
3232
) -> _logs.Logger:
3333
return LoggerTest(name)
3434

‎opentelemetry-sdk/src/opentelemetry/sdk/_events/__init__.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from opentelemetry._events import EventLoggerProvider as APIEventLoggerProvider
2222
from opentelemetry._logs import NoOpLogger, SeverityNumber, get_logger_provider
2323
from opentelemetry.sdk._logs import Logger, LoggerProvider, LogRecord
24-
from opentelemetry.util.types import ExtendedAttributes
24+
from opentelemetry.util.types import _ExtendedAttributes
2525

2626
_logger = logging.getLogger(__name__)
2727

@@ -33,7 +33,7 @@ def __init__(
3333
name: str,
3434
version: Optional[str] = None,
3535
schema_url: Optional[str] = None,
36-
attributes: Optional[ExtendedAttributes] = None,
36+
attributes: Optional[_ExtendedAttributes] = None,
3737
):
3838
super().__init__(
3939
name=name,
@@ -74,7 +74,7 @@ def get_event_logger(
7474
name: str,
7575
version: Optional[str] = None,
7676
schema_url: Optional[str] = None,
77-
attributes: Optional[ExtendedAttributes] = None,
77+
attributes: Optional[_ExtendedAttributes] = None,
7878
) -> EventLogger:
7979
if not name:
8080
_logger.warning("EventLogger created with invalid name: %s", name)

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
get_current_span,
5353
)
5454
from opentelemetry.trace.span import TraceFlags
55-
from opentelemetry.util.types import AnyValue, ExtendedAttributes
55+
from opentelemetry.util.types import AnyValue, _ExtendedAttributes
5656

5757
_logger = logging.getLogger(__name__)
5858

@@ -182,7 +182,7 @@ def __init__(
182182
severity_number: SeverityNumber | None = None,
183183
body: AnyValue | None = None,
184184
resource: Resource | None = None,
185-
attributes: ExtendedAttributes | None = None,
185+
attributes: _ExtendedAttributes | None = None,
186186
limits: LogLimits | None = _UnsetLogLimits,
187187
):
188188
super().__init__(
@@ -481,7 +481,7 @@ def __init__(
481481
self._logger_provider = logger_provider or get_logger_provider()
482482

483483
@staticmethod
484-
def _get_attributes(record: logging.LogRecord) -> ExtendedAttributes:
484+
def _get_attributes(record: logging.LogRecord) -> _ExtendedAttributes:
485485
attributes = {
486486
k: v for k, v in vars(record).items() if k not in _RESERVED_ATTRS
487487
}
@@ -640,7 +640,7 @@ def _get_logger_no_cache(
640640
name: str,
641641
version: str | None = None,
642642
schema_url: str | None = None,
643-
attributes: ExtendedAttributes | None = None,
643+
attributes: _ExtendedAttributes | None = None,
644644
) -> Logger:
645645
return Logger(
646646
self._resource,
@@ -674,7 +674,7 @@ def get_logger(
674674
name: str,
675675
version: str | None = None,
676676
schema_url: str | None = None,
677-
attributes: ExtendedAttributes | None = None,
677+
attributes: _ExtendedAttributes | None = None,
678678
) -> Logger:
679679
if self._disabled:
680680
return NoOpLogger(

0 commit comments

Comments
 (0)