Skip to content

Commit a924777

Browse files
authored
Point pylint to the package root directories (#2658)
* Point pylint to the root directories Fixes #2657 * Use cd with instrumentations * Do the same for the rest of the components * Specify pylint configuration file * Fix tox lint for sio-pika * Fix commands for util-http and azure detector * Fix lint for sdk-extension-aws * Fix lint for opentelemetry-instrumentation * Fix lint for grpc instrumentation * Fix lint for opentelemetry-instrumentation
1 parent 7da7f55 commit a924777

9 files changed

Lines changed: 98 additions & 135 deletions

File tree

instrumentation/opentelemetry-instrumentation-grpc/tests/protobuf/test_server_pb2_grpc.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ def __init__(self, channel):
1212
Args:
1313
channel: A grpc.Channel.
1414
"""
15+
# pylint: disable=invalid-name
1516
self.SimpleMethod = channel.unary_unary(
1617
"/GRPCTestServer/SimpleMethod",
1718
request_serializer=test__server__pb2.Request.SerializeToString,
@@ -37,6 +38,9 @@ def __init__(self, channel):
3738
class GRPCTestServerServicer:
3839
"""Missing associated documentation comment in .proto file"""
3940

41+
# pylint: disable=invalid-name
42+
# pylint: disable=no-self-use
43+
4044
def SimpleMethod(self, request, context):
4145
"""Missing associated documentation comment in .proto file"""
4246
context.set_code(grpc.StatusCode.UNIMPLEMENTED)
@@ -62,7 +66,9 @@ def BidirectionalStreamingMethod(self, request_iterator, context):
6266
raise NotImplementedError("Method not implemented!")
6367

6468

65-
def add_GRPCTestServerServicer_to_server(servicer, server):
69+
def add_GRPCTestServerServicer_to_server(
70+
servicer, server
71+
): # pylint: disable=invalid-name
6672
rpc_method_handlers = {
6773
"SimpleMethod": grpc.unary_unary_rpc_method_handler(
6874
servicer.SimpleMethod,
@@ -95,6 +101,7 @@ def add_GRPCTestServerServicer_to_server(servicer, server):
95101
class GRPCTestServer:
96102
"""Missing associated documentation comment in .proto file"""
97103

104+
# pylint: disable=invalid-name
98105
@staticmethod
99106
def SimpleMethod(
100107
request,

opentelemetry-instrumentation/tests/auto_instrumentation/test_load.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ class TestLoad(TestCase):
3232
@patch(
3333
"opentelemetry.instrumentation.auto_instrumentation._load.iter_entry_points"
3434
)
35-
def test_load_configurators(self, iter_mock):
35+
def test_load_configurators(
36+
self, iter_mock
37+
): # pylint: disable=no-self-use
3638
# Add multiple entry points but only specify the 2nd in the environment variable.
3739
ep_mock1 = Mock()
3840
ep_mock1.name = "custom_configurator1"
@@ -62,9 +64,8 @@ def test_load_configurators(self, iter_mock):
6264
"opentelemetry.instrumentation.auto_instrumentation._load.iter_entry_points"
6365
)
6466
def test_load_configurators_no_ep(
65-
self,
66-
iter_mock,
67-
):
67+
self, iter_mock
68+
): # pylint: disable=no-self-use
6869
iter_mock.return_value = ()
6970
# Confirm method does not crash if not entry points exist.
7071
_load._load_configurators()
@@ -214,6 +215,7 @@ def test_load_distro_error(self, iter_mock, isinstance_mock):
214215
)
215216
def test_load_instrumentors(self, iter_mock, dep_mock):
216217
# Mock opentelemetry_pre_instrument entry points
218+
# pylint: disable=too-many-locals
217219
pre_ep_mock1 = Mock()
218220
pre_ep_mock1.name = "pre1"
219221
pre_mock1 = Mock()
@@ -285,7 +287,9 @@ def test_load_instrumentors(self, iter_mock, dep_mock):
285287
@patch(
286288
"opentelemetry.instrumentation.auto_instrumentation._load.iter_entry_points"
287289
)
288-
def test_load_instrumentors_dep_conflict(self, iter_mock, dep_mock):
290+
def test_load_instrumentors_dep_conflict(
291+
self, iter_mock, dep_mock
292+
): # pylint: disable=no-self-use
289293
ep_mock1 = Mock()
290294
ep_mock1.name = "instr1"
291295

sdk-extension/opentelemetry-sdk-extension-aws/tests/performance/benchmarks/trace/test_benchmark_aws_xray_ids_generator.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
from opentelemetry.sdk.extension.aws.trace import AwsXRayIdGenerator
15+
from opentelemetry.sdk.extension.aws.trace import ( # pylint: disable=no-name-in-module
16+
AwsXRayIdGenerator,
17+
)
1618

1719
id_generator = AwsXRayIdGenerator()
1820

sdk-extension/opentelemetry-sdk-extension-aws/tests/resource/test__lambda.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from collections import OrderedDict
1717
from unittest.mock import patch
1818

19-
from opentelemetry.sdk.extension.aws.resource._lambda import (
19+
from opentelemetry.sdk.extension.aws.resource._lambda import ( # pylint: disable=no-name-in-module
2020
AwsLambdaResourceDetector,
2121
)
2222
from opentelemetry.semconv.resource import (

sdk-extension/opentelemetry-sdk-extension-aws/tests/resource/test_beanstalk.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from collections import OrderedDict
1717
from unittest.mock import mock_open, patch
1818

19-
from opentelemetry.sdk.extension.aws.resource.beanstalk import (
19+
from opentelemetry.sdk.extension.aws.resource.beanstalk import ( # pylint: disable=no-name-in-module
2020
AwsBeanstalkResourceDetector,
2121
)
2222
from opentelemetry.semconv.resource import (

sdk-extension/opentelemetry-sdk-extension-aws/tests/resource/test_ec2.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
from collections import OrderedDict
1717
from unittest.mock import patch
1818

19-
from opentelemetry.sdk.extension.aws.resource.ec2 import AwsEc2ResourceDetector
19+
from opentelemetry.sdk.extension.aws.resource.ec2 import ( # pylint: disable=no-name-in-module
20+
AwsEc2ResourceDetector,
21+
)
2022
from opentelemetry.semconv.resource import (
2123
CloudPlatformValues,
2224
CloudProviderValues,

sdk-extension/opentelemetry-sdk-extension-aws/tests/resource/test_ecs.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
import os
1615
import unittest
1716
from collections import OrderedDict
17+
from os.path import dirname, join
1818
from unittest.mock import mock_open, patch
1919

20-
from opentelemetry.sdk.extension.aws.resource.ecs import AwsEcsResourceDetector
20+
from opentelemetry.sdk.extension.aws.resource.ecs import ( # pylint: disable=no-name-in-module
21+
AwsEcsResourceDetector,
22+
)
2123
from opentelemetry.semconv.resource import (
2224
CloudPlatformValues,
2325
CloudProviderValues,
@@ -33,8 +35,10 @@
3335

3436

3537
def _read_file(filename: str) -> str:
36-
with open(os.path.join(os.path.dirname(__file__), "ecs", filename)) as f:
37-
return f.read()
38+
with open(
39+
join(dirname(__file__), "ecs", filename), encoding="utf-8"
40+
) as file:
41+
return file.read()
3842

3943

4044
MetadataV4Uri = "mock-uri-4"
@@ -63,13 +67,15 @@ def _http_get_function_ec2(url: str, *args, **kwargs) -> str:
6367
return MetadataV4ContainerResponseEc2
6468
if url == f"{MetadataV4Uri}/task":
6569
return MetadataV4TaskResponseEc2
70+
return None
6671

6772

6873
def _http_get_function_fargate(url: str, *args, **kwargs) -> str:
6974
if url == MetadataV4Uri:
7075
return MetadataV4ContainerResponseFargate
7176
if url == f"{MetadataV4Uri}/task":
7277
return MetadataV4TaskResponseFargate
78+
return None
7379

7480

7581
class AwsEcsResourceDetectorTest(unittest.TestCase):
@@ -150,7 +156,6 @@ def test_simple_create_metadata_v4_launchtype_ec2(
150156
):
151157
mock_http_get_function.side_effect = _http_get_function_ec2
152158
actual = AwsEcsResourceDetector().detect()
153-
self.maxDiff = None
154159
self.assertDictEqual(
155160
actual.attributes.copy(),
156161
OrderedDict(
@@ -215,7 +220,6 @@ def test_simple_create_metadata_v4_launchtype_fargate(
215220
):
216221
mock_http_get_function.side_effect = _http_get_function_fargate
217222
actual = AwsEcsResourceDetector().detect()
218-
self.maxDiff = None
219223
self.assertDictEqual(
220224
actual.attributes.copy(),
221225
OrderedDict(

sdk-extension/opentelemetry-sdk-extension-aws/tests/resource/test_eks.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
from collections import OrderedDict
1717
from unittest.mock import mock_open, patch
1818

19-
from opentelemetry.sdk.extension.aws.resource.eks import AwsEksResourceDetector
19+
from opentelemetry.sdk.extension.aws.resource.eks import ( # pylint: disable=no-name-in-module
20+
AwsEksResourceDetector,
21+
)
2022
from opentelemetry.semconv.resource import (
2123
CloudPlatformValues,
2224
CloudProviderValues,

0 commit comments

Comments
 (0)