Skip to content

Commit 9d741fc

Browse files
committed
typecheck: add sdk/resources and drop mypy
Signed-off-by: emdneto <[email protected]>
1 parent 5a821ac commit 9d741fc

File tree

6 files changed

+15
-66
lines changed

6 files changed

+15
-66
lines changed

dev-requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
pylint==3.3.4
22
httpretty==1.1.4
33
pyright==1.1.396
4-
mypy==1.9.0
54
sphinx==7.1.2
65
sphinx-rtd-theme==2.0.0rc4
76
sphinx-autodoc-typehints==1.25.2

mypy-relaxed.ini

Lines changed: 0 additions & 22 deletions
This file was deleted.

mypy.ini

Lines changed: 0 additions & 22 deletions
This file was deleted.

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
from json import dumps
6868
from os import environ
6969
from types import ModuleType
70-
from typing import List, MutableMapping, Optional, cast
70+
from typing import List, Optional, cast
7171
from urllib import parse
7272

7373
from opentelemetry.attributes import BoundedAttributes
@@ -77,7 +77,10 @@
7777
OTEL_SERVICE_NAME,
7878
)
7979
from opentelemetry.semconv.resource import ResourceAttributes
80-
from opentelemetry.util._importlib_metadata import entry_points, version
80+
from opentelemetry.util._importlib_metadata import (
81+
entry_points, # type: ignore[reportUnknownVariableType]
82+
version,
83+
)
8184
from opentelemetry.util.types import AttributeValue
8285

8386
psutil: Optional[ModuleType] = None
@@ -210,7 +213,7 @@ def create(
210213
entry_points(
211214
group="opentelemetry_resource_detector",
212215
name=resource_detector.strip(),
213-
) # type: ignore
216+
) # type: ignore[reportUnknownArgumentType]
214217
)
215218
).load()()
216219
)
@@ -266,8 +269,8 @@ def merge(self, other: "Resource") -> "Resource":
266269
Returns:
267270
The newly-created Resource.
268271
"""
269-
merged_attributes = self.attributes.copy() # type: ignore
270-
merged_attributes.update(other.attributes) # type: ignore
272+
merged_attributes = dict(self.attributes).copy()
273+
merged_attributes.update(other.attributes)
271274

272275
if self.schema_url == "":
273276
schema_url = other.schema_url
@@ -282,7 +285,7 @@ def merge(self, other: "Resource") -> "Resource":
282285
other.schema_url,
283286
)
284287
return self
285-
return Resource(merged_attributes, schema_url) # type: ignore
288+
return Resource(merged_attributes, schema_url)
286289

287290
def __eq__(self, other: object) -> bool:
288291
if not isinstance(other, Resource):
@@ -294,16 +297,13 @@ def __eq__(self, other: object) -> bool:
294297

295298
def __hash__(self) -> int:
296299
return hash(
297-
f"{dumps(self._attributes.copy(), sort_keys=True)}|{self._schema_url}" # type: ignore
300+
f"{dumps(self._attributes.copy(), sort_keys=True)}|{self._schema_url}"
298301
)
299302

300303
def to_json(self, indent: Optional[int] = 4) -> str:
301-
attributes: MutableMapping[str, AttributeValue] = dict(
302-
self._attributes
303-
)
304304
return dumps(
305305
{
306-
"attributes": attributes, # type: ignore
306+
"attributes": dict(self._attributes),
307307
"schema_url": self._schema_url,
308308
},
309309
indent=indent,
@@ -334,7 +334,7 @@ class OTELResourceDetector(ResourceDetector):
334334
# pylint: disable=no-self-use
335335
def detect(self) -> "Resource":
336336
env_resources_items = environ.get(OTEL_RESOURCE_ATTRIBUTES)
337-
env_resource_map = {}
337+
env_resource_map: dict[str, AttributeValue] = {}
338338

339339
if env_resources_items:
340340
for item in env_resources_items.split(","):
@@ -392,7 +392,7 @@ def detect(self) -> "Resource":
392392
resource_info[PROCESS_PARENT_PID] = os.getppid()
393393

394394
if psutil is not None:
395-
process: psutil_module.Process = psutil.Process()
395+
process = psutil.Process()
396396
username = process.username()
397397
resource_info[PROCESS_OWNER] = username
398398

@@ -483,7 +483,7 @@ def detect(self) -> "Resource":
483483
)
484484

485485

486-
class _HostResourceDetector(ResourceDetector):
486+
class _HostResourceDetector(ResourceDetector): # type: ignore[reportUnusedClass]
487487
"""
488488
The HostResourceDetector detects the hostname and architecture attributes.
489489
"""

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ exclude = [
112112
"opentelemetry-sdk/src/opentelemetry/sdk/_configuration",
113113
"opentelemetry-sdk/src/opentelemetry/sdk/_events",
114114
"opentelemetry-sdk/src/opentelemetry/sdk/_logs",
115-
"opentelemetry-sdk/src/opentelemetry/sdk/error_handler",
116-
"opentelemetry-sdk/src/opentelemetry/sdk/resources",
117115
"opentelemetry-sdk/src/opentelemetry/sdk/metrics",
118116
"opentelemetry-sdk/src/opentelemetry/sdk/trace",
119117
"opentelemetry-sdk/src/opentelemetry/sdk/util",
@@ -124,4 +122,5 @@ exclude = [
124122
strict = [
125123
"opentelemetry-semantic-conventions",
126124
"opentelemetry-sdk/src/opentelemetry/sdk/environment_variables",
125+
"opentelemetry-sdk/src/opentelemetry/sdk/resources",
127126
]

tox.ini

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ envlist =
8888

8989
spellcheck
9090
tracecontext
91-
mypy,mypyinstalled
9291
typecheck
9392
docs
9493
docker-tests-{otlpexporter,opencensus}
@@ -103,9 +102,6 @@ deps =
103102
coverage: pytest
104103
coverage: pytest-cov
105104

106-
mypy,mypyinstalled: -c {toxinidir}/dev-requirements.txt
107-
mypy,mypyinstalled: mypy
108-
109105
api: -r {toxinidir}/opentelemetry-api/test-requirements.txt
110106

111107
sdk: -r {toxinidir}/opentelemetry-sdk/test-requirements.txt
@@ -145,7 +141,6 @@ deps =
145141

146142
propagator-jaeger: -r {toxinidir}/propagator/opentelemetry-propagator-jaeger/test-requirements.txt
147143

148-
mypyinstalled: -e {toxinidir}/opentelemetry-api
149144

150145
getting-started: -r {toxinidir}/docs/getting_started/tests/requirements.txt
151146
getting-started: {env:CONTRIB_REPO}\#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http

0 commit comments

Comments
 (0)