More typing

Author: xrmx

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

@@ -25,7 +25,7 @@
 from opentelemetry.trace.span import TraceFlags
 from opentelemetry.util._once import Once
 from opentelemetry.util._providers import _load_provider
-from opentelemetry.util.types import Attributes
+from opentelemetry.util.types import ExtendedAttributes
 
 _logger = getLogger(__name__)
 
@@ -40,7 +40,7 @@ def __init__(
         trace_flags: Optional["TraceFlags"] = None,
         body: Optional[Any] = None,
         severity_number: Optional[SeverityNumber] = None,
-        attributes: Optional[Attributes] = None,
+        attributes: Optional[ExtendedAttributes] = None,
     ):
         attributes = attributes or {}
         event_attributes = {**attributes, "event.name": name}
@@ -62,7 +62,7 @@ def __init__(
         name: str,
         version: Optional[str] = None,
         schema_url: Optional[str] = None,
-        attributes: Optional[Attributes] = None,
+        attributes: Optional[ExtendedAttributes] = None,
     ):
         self._name = name
         self._version = version
@@ -85,7 +85,7 @@ def __init__(
         name: str,
         version: Optional[str] = None,
         schema_url: Optional[str] = None,
-        attributes: Optional[Attributes] = None,
+        attributes: Optional[ExtendedAttributes] = None,
     ):
         super().__init__(
             name=name,
@@ -122,7 +122,7 @@ def get_event_logger(
         name: str,
         version: Optional[str] = None,
         schema_url: Optional[str] = None,
-        attributes: Optional[Attributes] = None,
+        attributes: Optional[ExtendedAttributes] = None,
     ) -> EventLogger:
         """Returns an EventLoggerProvider for use."""
 
@@ -133,7 +133,7 @@ def get_event_logger(
         name: str,
         version: Optional[str] = None,
         schema_url: Optional[str] = None,
-        attributes: Optional[Attributes] = None,
+        attributes: Optional[ExtendedAttributes] = None,
     ) -> EventLogger:
         return NoOpEventLogger(
             name, version=version, schema_url=schema_url, attributes=attributes
@@ -146,7 +146,7 @@ def get_event_logger(
         name: str,
         version: Optional[str] = None,
         schema_url: Optional[str] = None,
-        attributes: Optional[Attributes] = None,
+        attributes: Optional[ExtendedAttributes] = None,
     ) -> EventLogger:
         if _EVENT_LOGGER_PROVIDER:
             return _EVENT_LOGGER_PROVIDER.get_event_logger(
@@ -208,7 +208,7 @@ def get_event_logger(
     name: str,
     version: Optional[str] = None,
     schema_url: Optional[str] = None,
-    attributes: Optional[Attributes] = None,
+    attributes: Optional[ExtendedAttributes] = None,
     event_logger_provider: Optional[EventLoggerProvider] = None,
 ) -> "EventLogger":
     if event_logger_provider is None:

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

@@ -40,6 +40,7 @@
 from typing import Optional, cast
 
 from opentelemetry._logs.severity import SeverityNumber
+from opentelemetry.attributes import BoundedAttributes
 from opentelemetry.environment_variables import _OTEL_PYTHON_LOGGER_PROVIDER
 from opentelemetry.trace.span import TraceFlags
 from opentelemetry.util._once import Once
@@ -67,7 +68,7 @@ def __init__(
         severity_text: Optional[str] = None,
         severity_number: Optional[SeverityNumber] = None,
         body: AnyValue = None,
-        attributes: Optional[ExtendedAttributes] = None,
+        attributes: Optional[BoundedAttributes] = None,
     ):
         self.timestamp = timestamp
         if observed_timestamp is None:
@@ -79,7 +80,7 @@ def __init__(
         self.severity_text = severity_text
         self.severity_number = severity_number
         self.body = body
-        self.attributes = attributes
+        self.attributes: Optional[BoundedAttributes] = attributes
 
 
 class Logger(ABC):

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

@@ -238,7 +238,7 @@ class BoundedAttributes(MutableMapping):  # type: ignore
     def __init__(
         self,
         maxlen: Optional[int] = None,
-        attributes: types.Attributes = None,
+        attributes: Optional[types.ExtendedAttributes] = None,
         immutable: bool = True,
         max_value_len: Optional[int] = None,
         extended_attributes: bool = False,

opentelemetry-api/tests/events/test_proxy_event.py

@@ -4,7 +4,7 @@
 
 import opentelemetry._events as events
 from opentelemetry.test.globals_test import EventsGlobalsTest
-from opentelemetry.util.types import Attributes
+from opentelemetry.util.types import ExtendedAttributes
 
 
 class TestProvider(events.NoOpEventLoggerProvider):
@@ -13,7 +13,7 @@ def get_event_logger(
         name: str,
         version: typing.Optional[str] = None,
         schema_url: typing.Optional[str] = None,
-        attributes: typing.Optional[Attributes] = None,
+        attributes: typing.Optional[ExtendedAttributes] = None,
     ) -> events.EventLogger:
         return LoggerTest(name)
 

opentelemetry-sdk/src/opentelemetry/sdk/util/instrumentation.py

@@ -17,7 +17,7 @@
 from deprecated import deprecated
 
 from opentelemetry.attributes import BoundedAttributes
-from opentelemetry.util.types import Attributes
+from opentelemetry.util.types import ExtendedAttributes
 
 
 class InstrumentationInfo:
@@ -92,7 +92,7 @@ def __init__(
         name: str,
         version: Optional[str] = None,
         schema_url: Optional[str] = None,
-        attributes: Optional[Attributes] = None,
+        attributes: Optional[ExtendedAttributes] = None,
     ) -> None:
         self._name = name
         self._version = version
@@ -150,7 +150,7 @@ def name(self) -> str:
         return self._name
 
     @property
-    def attributes(self) -> Attributes:
+    def attributes(self) -> ExtendedAttributes:
         return self._attributes
 
     def to_json(self, indent: Optional[int] = 4) -> str: