Skip to content

Commit 2ac40dd

Browse files
committed
chore: replace "deprecated" packages with PEP702
1 parent 48fc3bf commit 2ac40dd

File tree

57 files changed

+155
-288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+155
-288
lines changed
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
Deprecated==1.2.13
21
opentelemetry-api==1.15.0
32
opentelemetry-sdk==1.15.0
43
opentelemetry-semantic-conventions==0.36b0
5-
typing_extensions==4.3.0
4+
typing_extensions==4.5.0
65
wrapt==1.14.1
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
Deprecated==1.2.13
21
opentelemetry-api==1.12.0
32
opentelemetry-sdk==1.12.0
43
opentelemetry-semantic-conventions==0.33b0
5-
typing_extensions==4.3.0
4+
typing_extensions==4.5.0
65
wrapt==1.14.1

docs/getting_started/tests/requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ attrs==23.1.0
33
certifi==2024.7.4
44
charset-normalizer==2.0.12
55
click==8.1.7
6-
Deprecated==1.2.14
76
Flask==2.3.3
87
idna==3.7
98
importlib-metadata==6.8.0

exporter/opentelemetry-exporter-opencensus/test-requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
asgiref==3.7.2
2-
Deprecated==1.2.14
32
grpcio==1.66.2
43
importlib-metadata==6.11.0
54
iniconfig==2.0.0

exporter/opentelemetry-exporter-otlp-proto-common/test-requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
asgiref==3.7.2
2-
Deprecated==1.2.14
32
importlib-metadata==6.11.0
43
iniconfig==2.0.0
54
packaging==24.0

exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ classifiers = [
2828
"Programming Language :: Python :: 3.13",
2929
]
3030
dependencies = [
31-
"Deprecated >= 1.2.6",
3231
"googleapis-common-protos ~= 1.52",
3332
"grpcio >= 1.63.2, < 2.0.0; python_version < '3.13'",
3433
"grpcio >= 1.66.2, < 2.0.0; python_version >= '3.13'",
3534
"opentelemetry-api ~= 1.15",
3635
"opentelemetry-proto == 1.32.0.dev",
3736
"opentelemetry-sdk ~= 1.32.0.dev",
3837
"opentelemetry-exporter-otlp-proto-common == 1.32.0.dev",
38+
"typing-extensions >= 4.5.0",
3939
]
4040

4141
[project.entry-points.opentelemetry_logs_exporter]

exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/exporter.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
from typing import Sequence as TypingSequence
3535
from urllib.parse import urlparse
3636

37-
from deprecated import deprecated
3837
from google.rpc.error_details_pb2 import RetryInfo
38+
from typing_extensions import deprecated
3939

4040
from grpc import (
4141
ChannelCredentials,
@@ -108,8 +108,7 @@ def environ_to_compression(environ_key: str) -> Optional[Compression]:
108108

109109

110110
@deprecated(
111-
version="1.18.0",
112-
reason="Use one of the encoders from opentelemetry-exporter-otlp-proto-common instead",
111+
"Use one of the encoders from opentelemetry-exporter-otlp-proto-common instead. Deprecated since version 1.18.0.",
113112
)
114113
def get_resource_data(
115114
sdk_resource_scope_data: Dict[SDKResource, ResourceDataT],

exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
asgiref==3.7.2
2-
Deprecated==1.2.14
32
googleapis-common-protos==1.63.2
43
grpcio==1.66.2
54
importlib-metadata==6.11.0

exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ classifiers = [
2828
"Programming Language :: Python :: 3.13",
2929
]
3030
dependencies = [
31-
"Deprecated >= 1.2.6",
3231
"googleapis-common-protos ~= 1.52",
3332
"opentelemetry-api ~= 1.15",
3433
"opentelemetry-proto == 1.32.0.dev",
3534
"opentelemetry-sdk ~= 1.32.0.dev",
3635
"opentelemetry-exporter-otlp-proto-common == 1.32.0.dev",
3736
"requests ~= 2.7",
37+
"typing-extensions >= 4.5.0",
3838
]
3939

4040
[project.entry-points.opentelemetry_traces_exporter]

exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/metric_exporter/__init__.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
)
2929

3030
import requests
31-
from deprecated import deprecated
31+
from typing_extensions import deprecated
3232

3333
from opentelemetry.exporter.otlp.proto.common._internal import (
3434
_create_exp_backoff_generator,
@@ -238,8 +238,7 @@ def force_flush(self, timeout_millis: float = 10_000) -> bool:
238238

239239

240240
@deprecated(
241-
version="1.18.0",
242-
reason="Use one of the encoders from opentelemetry-exporter-otlp-proto-common instead",
241+
"Use one of the encoders from opentelemetry-exporter-otlp-proto-common instead. Deprecated since version 1.18.0.",
243242
)
244243
def get_resource_data(
245244
sdk_resource_scope_data: Dict[SDKResource, Any], # ResourceDataT?

exporter/opentelemetry-exporter-otlp-proto-http/test-requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
asgiref==3.7.2
22
certifi==2024.7.4
33
charset-normalizer==3.3.2
4-
Deprecated==1.2.14
54
googleapis-common-protos==1.63.2
65
idna==3.7
76
importlib-metadata==6.11.0

exporter/opentelemetry-exporter-otlp/test-requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
asgiref==3.7.2
2-
Deprecated==1.2.14
32
importlib-metadata==6.11.0
43
iniconfig==2.0.0
54
packaging==24.0

exporter/opentelemetry-exporter-prometheus/test-requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
asgiref==3.7.2
2-
Deprecated==1.2.14
32
importlib-metadata==6.11.0
43
iniconfig==2.0.0
54
packaging==24.0

exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
asgiref==3.7.2
22
certifi==2024.7.4
33
charset-normalizer==3.3.2
4-
Deprecated==1.2.14
54
idna==3.7
65
importlib-metadata==6.11.0
76
iniconfig==2.0.0

exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
asgiref==3.7.2
22
certifi==2024.7.4
33
charset-normalizer==3.3.2
4-
Deprecated==1.2.14
54
idna==3.7
65
importlib-metadata==6.11.0
76
iniconfig==2.0.0

exporter/opentelemetry-exporter-zipkin/test-requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
asgiref==3.7.2
2-
Deprecated==1.2.14
32
importlib-metadata==6.11.0
43
iniconfig==2.0.0
54
packaging==24.0

opentelemetry-api/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ classifiers = [
2727
"Typing :: Typed",
2828
]
2929
dependencies = [
30-
"Deprecated >= 1.2.6",
30+
"typing-extensions >= 4.5.0",
3131
# FIXME This should be able to be removed after 3.12 is released if there is a reliable API
3232
# in importlib.metadata.
3333
"importlib-metadata >= 6.0, < 8.7.0",

opentelemetry-api/src/opentelemetry/propagators/composite.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import logging
1515
import typing
1616

17-
from deprecated import deprecated
17+
from typing_extensions import deprecated
1818

1919
from opentelemetry.context.context import Context
2020
from opentelemetry.propagators import textmap
@@ -84,7 +84,9 @@ def fields(self) -> typing.Set[str]:
8484
return composite_fields
8585

8686

87-
@deprecated(version="1.2.0", reason="You should use CompositePropagator") # type: ignore
87+
@deprecated(
88+
"You should use CompositePropagator. Deprecated since version 1.2.0."
89+
)
8890
class CompositeHTTPPropagator(CompositePropagator):
8991
"""CompositeHTTPPropagator provides a mechanism for combining multiple
9092
propagators into a single one.

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
from logging import getLogger
8181
from typing import Iterator, Optional, Sequence, cast
8282

83-
from deprecated import deprecated
83+
from typing_extensions import deprecated
8484

8585
from opentelemetry import context as context_api
8686
from opentelemetry.attributes import BoundedAttributes
@@ -244,7 +244,9 @@ def get_tracer(
244244
return NoOpTracer()
245245

246246

247-
@deprecated(version="1.9.0", reason="You should use NoOpTracerProvider") # type: ignore
247+
@deprecated(
248+
"You should use NoOpTracerProvider. Deprecated since version 1.9.0."
249+
)
248250
class _DefaultTracerProvider(NoOpTracerProvider):
249251
"""The default TracerProvider, used when no implementation is available.
250252
@@ -487,7 +489,7 @@ def start_as_current_span(
487489
yield INVALID_SPAN
488490

489491

490-
@deprecated(version="1.9.0", reason="You should use NoOpTracer") # type: ignore
492+
@deprecated("You should use NoOpTracer. Deprecated since version 1.9.0.")
491493
class _DefaultTracer(NoOpTracer):
492494
"""The default Tracer, used when no Tracer implementation is available.
493495

opentelemetry-api/src/opentelemetry/util/re.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from typing import Dict, List, Mapping
1818
from urllib.parse import unquote
1919

20-
from deprecated import deprecated
20+
from typing_extensions import deprecated
2121

2222
_logger = getLogger(__name__)
2323

@@ -59,7 +59,9 @@
5959
# pylint: disable=invalid-name
6060

6161

62-
@deprecated(version="1.15.0", reason="You should use parse_env_headers") # type: ignore
62+
@deprecated(
63+
"You should use parse_env_headers. Deprecated since version 1.15.0."
64+
)
6365
def parse_headers(s: str) -> Mapping[str, str]:
6466
return parse_env_headers(s)
6567

opentelemetry-api/test-requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
asgiref==3.7.2
2-
Deprecated==1.2.14
32
importlib-metadata==8.5.0 ; python_version < "3.9"
43
importlib-metadata==8.6.1 ; python_version >= "3.9"
54
iniconfig==2.0.0

opentelemetry-proto/test-requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
asgiref==3.7.2
2-
Deprecated==1.2.14
32
importlib-metadata==6.11.0
43
iniconfig==2.0.0
54
packaging==24.0

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
)
4141
from warnings import filterwarnings
4242

43-
from deprecated import deprecated
43+
from typing_extensions import deprecated
4444

4545
from opentelemetry import context as context_api
4646
from opentelemetry import trace as trace_api
@@ -474,7 +474,7 @@ def resource(self) -> Resource:
474474

475475
@property
476476
@deprecated(
477-
version="1.11.1", reason="You should use instrumentation_scope"
477+
"You should use instrumentation_scope. Deprecated since version 1.11.1."
478478
)
479479
def instrumentation_info(self) -> Optional[InstrumentationInfo]:
480480
return self._instrumentation_info
@@ -1239,8 +1239,7 @@ def get_tracer(
12391239
filterwarnings(
12401240
"ignore",
12411241
message=(
1242-
r"Call to deprecated method __init__. \(You should use "
1243-
r"InstrumentationScope\) -- Deprecated since version 1.11.1."
1242+
r"You should use InstrumentationScope. Deprecated since version 1.11.1."
12441243
),
12451244
category=DeprecationWarning,
12461245
module="opentelemetry.sdk.trace",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from collections.abc import MutableMapping, Sequence
1919
from typing import Optional
2020

21-
from deprecated import deprecated
21+
from typing_extensions import deprecated
2222

2323

2424
def ns_to_iso_str(nanoseconds):
@@ -93,7 +93,7 @@ def from_seq(cls, maxlen, seq):
9393
return bounded_list
9494

9595

96-
@deprecated(version="1.4.0") # type: ignore
96+
@deprecated("Deprecated since version 1.4.0.")
9797
class BoundedDict(MutableMapping):
9898
"""An ordered dict with a fixed max capacity.
9999

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from json import dumps
1515
from typing import Optional
1616

17-
from deprecated import deprecated
17+
from typing_extensions import deprecated
1818

1919
from opentelemetry.attributes import BoundedAttributes
2020
from opentelemetry.util.types import Attributes
@@ -29,7 +29,9 @@ class InstrumentationInfo:
2929

3030
__slots__ = ("_name", "_version", "_schema_url")
3131

32-
@deprecated(version="1.11.1", reason="You should use InstrumentationScope")
32+
@deprecated(
33+
"You should use InstrumentationScope. Deprecated since version 1.11.1."
34+
)
3335
def __init__(
3436
self,
3537
name: str,

opentelemetry-sdk/test-requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
asgiref==3.7.2
2-
Deprecated==1.2.14
32
flaky==3.7.0
43
importlib-metadata==6.11.0
54
iniconfig==2.0.0

opentelemetry-semantic-conventions/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ classifiers = [
2929

3030
dependencies = [
3131
"opentelemetry-api == 1.32.0.dev",
32-
"Deprecated >= 1.2.6",
32+
"typing-extensions >= 4.5.0",
3333
]
3434

3535
[project.urls]

opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/attributes/container_attributes.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from enum import Enum
1616
from typing import Final
1717

18-
from deprecated import deprecated
18+
from typing_extensions import deprecated
1919

2020
CONTAINER_COMMAND: Final = "container.command"
2121
"""
@@ -101,8 +101,8 @@
101101

102102

103103
@deprecated(
104-
reason="The attribute container.cpu.state is deprecated - Replaced by `cpu.mode`"
105-
) # type: ignore
104+
"The attribute container.cpu.state is deprecated - Replaced by `cpu.mode`"
105+
)
106106
class ContainerCpuStateValues(Enum):
107107
USER = "user"
108108
"""When tasks of the cgroup are in user mode (Linux). When all container processes are in user mode (Windows)."""

0 commit comments

Comments
 (0)