Skip to content

Commit 8bca278

Browse files
author
Girish Chandrashekar
committed
lint files
1 parent 3a91378 commit 8bca278

File tree

4 files changed

+69
-57
lines changed

4 files changed

+69
-57
lines changed

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

+22-22
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,15 @@ def _translate_key_values(key: str, value: Any) -> KeyValue:
131131

132132

133133
def get_resource_data(
134-
sdk_resource_scope_data: Dict[SDKResource, ResourceDataT],
135-
resource_class: Callable[..., TypingResourceT],
136-
name: str,
134+
sdk_resource_scope_data: Dict[SDKResource, ResourceDataT],
135+
resource_class: Callable[..., TypingResourceT],
136+
name: str,
137137
) -> List[TypingResourceT]:
138138
resource_data = []
139139

140140
for (
141-
sdk_resource,
142-
scope_data,
141+
sdk_resource,
142+
scope_data,
143143
) in sdk_resource_scope_data.items():
144144

145145
collector_resource = Resource()
@@ -214,15 +214,15 @@ class OTLPExporterMixin(
214214
"""
215215

216216
def __init__(
217-
self,
218-
endpoint: Optional[str] = None,
219-
insecure: Optional[bool] = None,
220-
credentials: Optional[ChannelCredentials] = None,
221-
headers: Optional[
222-
Union[TypingSequence[Tuple[str, str]], Dict[str, str], str]
223-
] = None,
224-
timeout: Optional[int] = None,
225-
compression: Optional[Compression] = None,
217+
self,
218+
endpoint: Optional[str] = None,
219+
insecure: Optional[bool] = None,
220+
credentials: Optional[ChannelCredentials] = None,
221+
headers: Optional[
222+
Union[TypingSequence[Tuple[str, str]], Dict[str, str], str]
223+
] = None,
224+
timeout: Optional[int] = None,
225+
compression: Optional[Compression] = None,
226226
):
227227
super().__init__()
228228

@@ -264,10 +264,10 @@ def __init__(
264264
self._collector_kwargs = None
265265

266266
compression = (
267-
environ_to_compression(OTEL_EXPORTER_OTLP_COMPRESSION)
268-
if compression is None
269-
else compression
270-
) or Compression.NoCompression
267+
environ_to_compression(OTEL_EXPORTER_OTLP_COMPRESSION)
268+
if compression is None
269+
else compression
270+
) or Compression.NoCompression
271271

272272
if insecure:
273273
self._client = self._stub(
@@ -286,7 +286,7 @@ def __init__(
286286

287287
@abstractmethod
288288
def _translate_data(
289-
self, data: TypingSequence[SDKDataT]
289+
self, data: TypingSequence[SDKDataT]
290290
) -> ExportServiceRequestT:
291291
pass
292292

@@ -302,7 +302,7 @@ def _translate_attributes(self, attributes) -> TypingSequence[KeyValue]:
302302
return output
303303

304304
def _export(
305-
self, data: Union[TypingSequence[ReadableSpan], MetricsData]
305+
self, data: Union[TypingSequence[ReadableSpan], MetricsData]
306306
) -> ExportResultT:
307307
# After the call to shutdown, subsequent calls to Export are
308308
# not allowed and should return a Failure result.
@@ -356,8 +356,8 @@ def _export(
356356
retry_info = RetryInfo()
357357
retry_info.ParseFromString(retry_info_bin)
358358
delay = (
359-
retry_info.retry_delay.seconds
360-
+ retry_info.retry_delay.nanos / 1.0e9
359+
retry_info.retry_delay.seconds
360+
+ retry_info.retry_delay.nanos / 1.0e9
361361
)
362362

363363
logger.warning(

exporter/opentelemetry-exporter-otlp-proto-grpc/tests/test_otlp_exporter_mixin.py

+23-16
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@
3636
class TestOTLPExporterMixin(TestCase):
3737
def test_environ_to_compression(self):
3838
with patch.dict(
39-
"os.environ",
40-
{
41-
"test_gzip": "gzip",
42-
"test_gzip_caseinsensitive_with_whitespace": " GzIp ",
43-
"test_invalid": "some invalid compression",
44-
},
39+
"os.environ",
40+
{
41+
"test_gzip": "gzip",
42+
"test_gzip_caseinsensitive_with_whitespace": " GzIp ",
43+
"test_invalid": "some invalid compression",
44+
},
4545
):
4646
self.assertEqual(
4747
environ_to_compression("test_gzip"), Compression.Gzip
@@ -76,7 +76,7 @@ class OTLPMockExporter(OTLPExporterMixin):
7676
)
7777

7878
def _translate_data(
79-
self, data: Sequence[SDKDataT]
79+
self, data: Sequence[SDKDataT]
8080
) -> ExportServiceRequestT:
8181
pass
8282

@@ -119,12 +119,10 @@ def test_shutdown(self):
119119

120120
class OTLPMockExporter(OTLPExporterMixin):
121121
_result = result_mock
122-
_stub = Mock(
123-
**{"return_value": Mock()}
124-
)
122+
_stub = Mock(**{"return_value": Mock()})
125123

126124
def _translate_data(
127-
self, data: Sequence[SDKDataT]
125+
self, data: Sequence[SDKDataT]
128126
) -> ExportServiceRequestT:
129127
pass
130128

@@ -136,9 +134,13 @@ def _exporting(self) -> str:
136134

137135
with self.assertLogs(level=WARNING) as warning:
138136
# pylint: disable=protected-access
139-
self.assertEqual(otlp_mock_exporter._export(data={}), result_mock.SUCCESS)
137+
self.assertEqual(
138+
otlp_mock_exporter._export(data={}), result_mock.SUCCESS
139+
)
140140
otlp_mock_exporter.shutdown()
141-
self.assertEqual(otlp_mock_exporter._export(data={}), result_mock.FAILURE)
141+
self.assertEqual(
142+
otlp_mock_exporter._export(data={}), result_mock.FAILURE
143+
)
142144
self.assertEqual(
143145
warning.records[0].message,
144146
"Exporter already shutdown, ignoring batch",
@@ -147,6 +149,7 @@ def _exporting(self) -> str:
147149
def test_shutdown_wait_last_export(self):
148150
import threading
149151
import time
152+
150153
result_mock = Mock()
151154
rpc_error = RpcError()
152155

@@ -155,7 +158,9 @@ def code(self):
155158

156159
def trailing_metadata(self):
157160
return {
158-
"google.rpc.retryinfo-bin": RetryInfo(retry_delay=Duration(seconds=1)).SerializeToString()
161+
"google.rpc.retryinfo-bin": RetryInfo(
162+
retry_delay=Duration(seconds=1)
163+
).SerializeToString()
159164
}
160165

161166
rpc_error.code = MethodType(code, rpc_error)
@@ -168,7 +173,7 @@ class OTLPMockExporter(OTLPExporterMixin):
168173
)
169174

170175
def _translate_data(
171-
self, data: Sequence[SDKDataT]
176+
self, data: Sequence[SDKDataT]
172177
) -> ExportServiceRequestT:
173178
pass
174179

@@ -178,7 +183,9 @@ def _exporting(self) -> str:
178183

179184
otlp_mock_exporter = OTLPMockExporter()
180185

181-
export_thread = threading.Thread(target=otlp_mock_exporter._export, args=({},))
186+
export_thread = threading.Thread(
187+
target=otlp_mock_exporter._export, args=({},)
188+
)
182189
export_thread.start()
183190
try:
184191
self.assertTrue(otlp_mock_exporter._export_lock.locked())

exporter/opentelemetry-exporter-otlp-proto-grpc/tests/test_otlp_metrics_exporter.py

+10-7
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# limitations under the License.
1414

1515
from concurrent.futures import ThreadPoolExecutor
16+
1617
# pylint: disable=too-many-lines
1718
from logging import WARNING
1819
from os.path import dirname
@@ -23,7 +24,6 @@
2324
from google.protobuf.duration_pb2 import Duration
2425
from google.rpc.error_details_pb2 import RetryInfo
2526
from grpc import ChannelCredentials, Compression, StatusCode, server
26-
from opentelemetry.test.metrictestutil import _generate_gauge, _generate_sum
2727

2828
from opentelemetry.exporter.otlp.proto.grpc.metric_exporter import (
2929
OTLPMetricExporter,
@@ -79,6 +79,7 @@
7979
from opentelemetry.sdk.util.instrumentation import (
8080
InstrumentationScope as SDKInstrumentationScope,
8181
)
82+
from opentelemetry.test.metrictestutil import _generate_gauge, _generate_sum
8283

8384
THIS_DIR = dirname(__file__)
8485

@@ -366,7 +367,7 @@ def test_preferred_temporality(self):
366367
{
367368
OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: "collector:4317",
368369
OTEL_EXPORTER_OTLP_METRICS_CERTIFICATE: THIS_DIR
369-
+ "/fixtures/test.cert",
370+
+ "/fixtures/test.cert",
370371
OTEL_EXPORTER_OTLP_METRICS_HEADERS: " key1=value1,KEY2 = value=2",
371372
OTEL_EXPORTER_OTLP_METRICS_TIMEOUT: "10",
372373
OTEL_EXPORTER_OTLP_METRICS_COMPRESSION: "gzip",
@@ -397,7 +398,7 @@ def test_env_variables(self, mock_exporter_mixin):
397398
)
398399
# pylint: disable=unused-argument
399400
def test_no_credentials_error(
400-
self, mock_ssl_channel, mock_secure, mock_stub
401+
self, mock_ssl_channel, mock_secure, mock_stub
401402
):
402403
OTLPMetricExporter(insecure=False)
403404
self.assertTrue(mock_ssl_channel.called)
@@ -527,7 +528,7 @@ def test_otlp_exporter_endpoint(self, mock_secure, mock_insecure):
527528
@patch("opentelemetry.exporter.otlp.proto.grpc.exporter.insecure_channel")
528529
@patch.dict("os.environ", {OTEL_EXPORTER_OTLP_COMPRESSION: "gzip"})
529530
def test_otlp_exporter_otlp_compression_envvar(
530-
self, mock_insecure_channel, mock_expo
531+
self, mock_insecure_channel, mock_expo
531532
):
532533
"""Just OTEL_EXPORTER_OTLP_COMPRESSION should work"""
533534
OTLPMetricExporter(insecure=True)
@@ -551,7 +552,7 @@ def test_otlp_exporter_otlp_compression_kwarg(self, mock_insecure_channel):
551552
@patch("opentelemetry.exporter.otlp.proto.grpc.exporter.insecure_channel")
552553
@patch.dict("os.environ", {})
553554
def test_otlp_exporter_otlp_compression_unspecified(
554-
self, mock_insecure_channel
555+
self, mock_insecure_channel
555556
):
556557
"""No env or kwarg should be NoCompression"""
557558
OTLPMetricExporter(insecure=True)
@@ -1385,7 +1386,9 @@ def test_shutdown_wait_last_export(self):
13851386
MetricsServiceServicerUNAVAILABLEDelay(), self.server
13861387
)
13871388

1388-
export_thread = threading.Thread(target=self.exporter.export, args=(self.metrics["sum_int"],))
1389+
export_thread = threading.Thread(
1390+
target=self.exporter.export, args=(self.metrics["sum_int"],)
1391+
)
13891392
export_thread.start()
13901393
try:
13911394
self.assertTrue(self.exporter._export_lock.locked())
@@ -1401,7 +1404,7 @@ def test_shutdown_wait_last_export(self):
14011404

14021405

14031406
def _resource_metrics(
1404-
index: int, scope_metrics: List[ScopeMetrics]
1407+
index: int, scope_metrics: List[ScopeMetrics]
14051408
) -> ResourceMetrics:
14061409
return ResourceMetrics(
14071410
resource=Resource(

exporter/opentelemetry-exporter-otlp-proto-grpc/tests/test_otlp_trace_exporter.py

+14-12
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
from google.protobuf.duration_pb2 import Duration
2323
from google.rpc.error_details_pb2 import RetryInfo
2424
from grpc import ChannelCredentials, Compression, StatusCode, server
25-
from opentelemetry.test.spantestutil import (
26-
get_span_with_dropped_attributes_events_links,
27-
)
2825

2926
from opentelemetry.attributes import BoundedAttributes
3027
from opentelemetry.exporter.otlp.proto.grpc.exporter import (
@@ -72,6 +69,9 @@
7269
SpanExportResult,
7370
)
7471
from opentelemetry.sdk.util.instrumentation import InstrumentationScope
72+
from opentelemetry.test.spantestutil import (
73+
get_span_with_dropped_attributes_events_links,
74+
)
7575

7676
THIS_DIR = os.path.dirname(__file__)
7777

@@ -229,7 +229,7 @@ def test_exporting(self):
229229
{
230230
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: "collector:4317",
231231
OTEL_EXPORTER_OTLP_TRACES_CERTIFICATE: THIS_DIR
232-
+ "/fixtures/test.cert",
232+
+ "/fixtures/test.cert",
233233
OTEL_EXPORTER_OTLP_TRACES_HEADERS: " key1=value1,KEY2 = value=2",
234234
OTEL_EXPORTER_OTLP_TRACES_TIMEOUT: "10",
235235
OTEL_EXPORTER_OTLP_TRACES_COMPRESSION: "gzip",
@@ -260,7 +260,7 @@ def test_env_variables(self, mock_exporter_mixin):
260260
)
261261
# pylint: disable=unused-argument
262262
def test_no_credentials_error(
263-
self, mock_ssl_channel, mock_secure, mock_stub
263+
self, mock_ssl_channel, mock_secure, mock_stub
264264
):
265265
OTLPSpanExporter(insecure=False)
266266
self.assertTrue(mock_ssl_channel.called)
@@ -397,7 +397,7 @@ def test_otlp_exporter_endpoint(self, mock_secure, mock_insecure):
397397
@patch("opentelemetry.exporter.otlp.proto.grpc.exporter.insecure_channel")
398398
@patch.dict("os.environ", {OTEL_EXPORTER_OTLP_COMPRESSION: "gzip"})
399399
def test_otlp_exporter_otlp_compression_envvar(
400-
self, mock_insecure_channel
400+
self, mock_insecure_channel
401401
):
402402
"""Just OTEL_EXPORTER_OTLP_COMPRESSION should work"""
403403
OTLPSpanExporter(insecure=True)
@@ -419,7 +419,7 @@ def test_otlp_exporter_otlp_compression_kwarg(self, mock_insecure_channel):
419419
@patch("opentelemetry.exporter.otlp.proto.grpc.exporter.insecure_channel")
420420
@patch.dict("os.environ", {})
421421
def test_otlp_exporter_otlp_compression_unspecified(
422-
self, mock_insecure_channel
422+
self, mock_insecure_channel
423423
):
424424
"""No env or kwarg should be NoCompression"""
425425
OTLPSpanExporter(insecure=True)
@@ -434,7 +434,7 @@ def test_otlp_exporter_otlp_compression_unspecified(
434434
{OTEL_EXPORTER_OTLP_TRACES_COMPRESSION: "gzip"},
435435
)
436436
def test_otlp_exporter_otlp_compression_precendence(
437-
self, mock_insecure_channel
437+
self, mock_insecure_channel
438438
):
439439
"""OTEL_EXPORTER_OTLP_TRACES_COMPRESSION as higher priority than
440440
OTEL_EXPORTER_OTLP_COMPRESSION
@@ -798,9 +798,9 @@ def test_translate_spans_multi(self):
798798
)
799799

800800
def _check_translated_status(
801-
self,
802-
translated: ExportTraceServiceRequest,
803-
code_expected: Status,
801+
self,
802+
translated: ExportTraceServiceRequest,
803+
code_expected: Status,
804804
):
805805
status = translated.resource_spans[0].scope_spans[0].spans[0].status
806806

@@ -955,7 +955,9 @@ def test_shutdown_wait_last_export(self):
955955
TraceServiceServicerUNAVAILABLEDelay(), self.server
956956
)
957957

958-
export_thread = threading.Thread(target=self.exporter.export, args=([self.span],))
958+
export_thread = threading.Thread(
959+
target=self.exporter.export, args=([self.span],)
960+
)
959961
export_thread.start()
960962
try:
961963
self.assertTrue(self.exporter._export_lock.locked())

0 commit comments

Comments
 (0)