Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 02863de

Browse files
owaisowais
authored
Upgraded black to 22.1.0 (open-telemetry#2427)
1 parent f772260 commit 02863de

File tree

18 files changed

+115
-119
lines changed

18 files changed

+115
-119
lines changed

‎dev-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pylint==2.11.0
22
flake8~=3.7
33
isort~=5.8
4-
black~=21.7b0
4+
black~=22.1.0
55
httpretty~=1.0
66
mypy==0.812
77
sphinx~=3.5.4

‎exporter/opentelemetry-exporter-jaeger-proto-grpc/src/opentelemetry/exporter/jaeger/proto/grpc/translate/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
def _nsec_to_usec_round(nsec: int) -> int:
4141
"""Round nanoseconds to microseconds"""
42-
return (nsec + 500) // 10 ** 3
42+
return (nsec + 500) // 10**3
4343

4444

4545
def _convert_int_to_i64(val):

‎exporter/opentelemetry-exporter-jaeger-proto-grpc/tests/test_jaeger_exporter_protobuf.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,13 @@ def test_translate_to_jaeger(self):
108108
parent_id = 0x1111111111111111
109109
other_id = 0x2222222222222222
110110

111-
base_time = 683647322 * 10 ** 9 # in ns
111+
base_time = 683647322 * 10**9 # in ns
112112
start_times = (
113113
base_time,
114-
base_time + 150 * 10 ** 6,
115-
base_time + 300 * 10 ** 6,
114+
base_time + 150 * 10**6,
115+
base_time + 300 * 10**6,
116116
)
117-
durations = (50 * 10 ** 6, 100 * 10 ** 6, 200 * 10 ** 6)
117+
durations = (50 * 10**6, 100 * 10**6, 200 * 10**6)
118118
end_times = (
119119
start_times[0] + durations[0],
120120
start_times[1] + durations[1],
@@ -139,7 +139,7 @@ def test_translate_to_jaeger(self):
139139
]
140140
)
141141

142-
event_timestamp = base_time + 50 * 10 ** 6
142+
event_timestamp = base_time + 50 * 10**6
143143
# pylint:disable=protected-access
144144
event_timestamp_proto = (
145145
pb_translator._proto_timestamp_from_epoch_nanos(event_timestamp)

‎exporter/opentelemetry-exporter-jaeger-thrift/src/opentelemetry/exporter/jaeger/thrift/translate/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
def _nsec_to_usec_round(nsec: int) -> int:
3838
"""Round nanoseconds to microseconds"""
39-
return (nsec + 500) // 10 ** 3
39+
return (nsec + 500) // 10**3
4040

4141

4242
def _convert_int_to_i64(val):

‎exporter/opentelemetry-exporter-jaeger-thrift/tests/test_jaeger_exporter_thrift.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -230,13 +230,13 @@ def test_translate_to_jaeger(self):
230230
parent_id = 0x1111111111111111
231231
other_id = 0x2222222222222222
232232

233-
base_time = 683647322 * 10 ** 9 # in ns
233+
base_time = 683647322 * 10**9 # in ns
234234
start_times = (
235235
base_time,
236-
base_time + 150 * 10 ** 6,
237-
base_time + 300 * 10 ** 6,
236+
base_time + 150 * 10**6,
237+
base_time + 300 * 10**6,
238238
)
239-
durations = (50 * 10 ** 6, 100 * 10 ** 6, 200 * 10 ** 6)
239+
durations = (50 * 10**6, 100 * 10**6, 200 * 10**6)
240240
end_times = (
241241
start_times[0] + durations[0],
242242
start_times[1] + durations[1],
@@ -259,7 +259,7 @@ def test_translate_to_jaeger(self):
259259
"key_float": 0.3,
260260
}
261261

262-
event_timestamp = base_time + 50 * 10 ** 6
262+
event_timestamp = base_time + 50 * 10**6
263263
event = trace.Event(
264264
name="event0",
265265
timestamp=event_timestamp,
@@ -338,8 +338,8 @@ def test_translate_to_jaeger(self):
338338
traceIdLow=trace_id_low,
339339
spanId=span_id,
340340
parentSpanId=parent_id,
341-
startTime=start_times[0] // 10 ** 3,
342-
duration=durations[0] // 10 ** 3,
341+
startTime=start_times[0] // 10**3,
342+
duration=durations[0] // 10**3,
343343
flags=0,
344344
tags=[
345345
jaeger.Tag(
@@ -394,7 +394,7 @@ def test_translate_to_jaeger(self):
394394
],
395395
logs=[
396396
jaeger.Log(
397-
timestamp=event_timestamp // 10 ** 3,
397+
timestamp=event_timestamp // 10**3,
398398
fields=[
399399
jaeger.Tag(
400400
key="annotation_bool",
@@ -426,8 +426,8 @@ def test_translate_to_jaeger(self):
426426
traceIdLow=trace_id_low,
427427
spanId=parent_id,
428428
parentSpanId=0,
429-
startTime=start_times[1] // 10 ** 3,
430-
duration=durations[1] // 10 ** 3,
429+
startTime=start_times[1] // 10**3,
430+
duration=durations[1] // 10**3,
431431
flags=0,
432432
tags=default_tags,
433433
),
@@ -437,8 +437,8 @@ def test_translate_to_jaeger(self):
437437
traceIdLow=trace_id_low,
438438
spanId=other_id,
439439
parentSpanId=0,
440-
startTime=start_times[2] // 10 ** 3,
441-
duration=durations[2] // 10 ** 3,
440+
startTime=start_times[2] // 10**3,
441+
duration=durations[2] // 10**3,
442442
flags=0,
443443
tags=[
444444
jaeger.Tag(

‎exporter/opentelemetry-exporter-opencensus/tests/test_otcollector_trace_exporter.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ def test_translate_to_collector(self):
8484
trace_id = 0x6E0C63257DE34C926F9EFCD03927272E
8585
span_id = 0x34BF92DEEFC58C92
8686
parent_id = 0x1111111111111111
87-
base_time = 683647322 * 10 ** 9 # in ns
87+
base_time = 683647322 * 10**9 # in ns
8888
start_times = (
8989
base_time,
90-
base_time + 150 * 10 ** 6,
91-
base_time + 300 * 10 ** 6,
90+
base_time + 150 * 10**6,
91+
base_time + 300 * 10**6,
9292
)
93-
durations = (50 * 10 ** 6, 100 * 10 ** 6, 200 * 10 ** 6)
93+
durations = (50 * 10**6, 100 * 10**6, 200 * 10**6)
9494
end_times = (
9595
start_times[0] + durations[0],
9696
start_times[1] + durations[1],
@@ -114,7 +114,7 @@ def test_translate_to_collector(self):
114114
"annotation_string": "annotation_test",
115115
"key_float": 0.3,
116116
}
117-
event_timestamp = base_time + 50 * 10 ** 6
117+
event_timestamp = base_time + 50 * 10**6
118118
event = trace.Event(
119119
name="event0",
120120
timestamp=event_timestamp,

‎exporter/opentelemetry-exporter-otlp-proto-http/tests/test_protobuf_encoder.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,18 +80,18 @@ def test_content_type(self):
8080
def get_exhaustive_otel_span_list() -> List[SDKSpan]:
8181
trace_id = 0x3E0C63257DE34C926F9EFCD03927272E
8282

83-
base_time = 683647322 * 10 ** 9 # in ns
83+
base_time = 683647322 * 10**9 # in ns
8484
start_times = (
8585
base_time,
86-
base_time + 150 * 10 ** 6,
87-
base_time + 300 * 10 ** 6,
88-
base_time + 400 * 10 ** 6,
86+
base_time + 150 * 10**6,
87+
base_time + 300 * 10**6,
88+
base_time + 400 * 10**6,
8989
)
9090
end_times = (
91-
start_times[0] + (50 * 10 ** 6),
92-
start_times[1] + (100 * 10 ** 6),
93-
start_times[2] + (200 * 10 ** 6),
94-
start_times[3] + (300 * 10 ** 6),
91+
start_times[0] + (50 * 10**6),
92+
start_times[1] + (100 * 10**6),
93+
start_times[2] + (200 * 10**6),
94+
start_times[3] + (300 * 10**6),
9595
)
9696

9797
parent_span_context = SDKSpanContext(
@@ -114,7 +114,7 @@ def get_exhaustive_otel_span_list() -> List[SDKSpan]:
114114
events=(
115115
SDKEvent(
116116
name="event0",
117-
timestamp=base_time + 50 * 10 ** 6,
117+
timestamp=base_time + 50 * 10**6,
118118
attributes={
119119
"annotation_bool": True,
120120
"annotation_string": "annotation_test",

‎exporter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/encoder/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ def _nsec_to_usec_round(nsec: int) -> int:
256256
Timestamp in zipkin spans is int of microseconds.
257257
See: https://zipkin.io/pages/instrumenting.html
258258
"""
259-
return (nsec + 500) // 10 ** 3
259+
return (nsec + 500) // 10**3
260260

261261

262262
class JsonEncoder(Encoder):

‎exporter/opentelemetry-exporter-zipkin-json/tests/encoder/common_tests.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@ def test_constructor_max_tag_value_length(self):
9696
)
9797

9898
def test_nsec_to_usec_round(self):
99-
base_time_nsec = 683647322 * 10 ** 9
99+
base_time_nsec = 683647322 * 10**9
100100
for nsec in (
101101
base_time_nsec,
102-
base_time_nsec + 150 * 10 ** 6,
103-
base_time_nsec + 300 * 10 ** 6,
104-
base_time_nsec + 400 * 10 ** 6,
102+
base_time_nsec + 150 * 10**6,
103+
base_time_nsec + 300 * 10**6,
104+
base_time_nsec + 400 * 10**6,
105105
):
106106
self.assertEqual(
107-
(nsec + 500) // 10 ** 3,
107+
(nsec + 500) // 10**3,
108108
self.get_encoder_default()._nsec_to_usec_round(nsec),
109109
)
110110

@@ -168,8 +168,8 @@ def test_get_parent_id_from_span_context(self):
168168
def get_data_for_max_tag_length_test(
169169
max_tag_length: int,
170170
) -> (trace._Span, Dict):
171-
start_time = 683647322 * 10 ** 9 # in ns
172-
duration = 50 * 10 ** 6
171+
start_time = 683647322 * 10**9 # in ns
172+
duration = 50 * 10**6
173173
end_time = start_time + duration
174174

175175
span = trace._Span(
@@ -332,18 +332,18 @@ def get_data_for_max_tag_length_test(
332332
def get_exhaustive_otel_span_list() -> List[trace._Span]:
333333
trace_id = 0x6E0C63257DE34C926F9EFCD03927272E
334334

335-
base_time = 683647322 * 10 ** 9 # in ns
335+
base_time = 683647322 * 10**9 # in ns
336336
start_times = (
337337
base_time,
338-
base_time + 150 * 10 ** 6,
339-
base_time + 300 * 10 ** 6,
340-
base_time + 400 * 10 ** 6,
338+
base_time + 150 * 10**6,
339+
base_time + 300 * 10**6,
340+
base_time + 400 * 10**6,
341341
)
342342
end_times = (
343-
start_times[0] + (50 * 10 ** 6),
344-
start_times[1] + (100 * 10 ** 6),
345-
start_times[2] + (200 * 10 ** 6),
346-
start_times[3] + (300 * 10 ** 6),
343+
start_times[0] + (50 * 10**6),
344+
start_times[1] + (100 * 10**6),
345+
start_times[2] + (200 * 10**6),
346+
start_times[3] + (300 * 10**6),
347347
)
348348

349349
parent_span_context = trace_api.SpanContext(
@@ -366,7 +366,7 @@ def get_exhaustive_otel_span_list() -> List[trace._Span]:
366366
events=(
367367
trace.Event(
368368
name="event0",
369-
timestamp=base_time + 50 * 10 ** 6,
369+
timestamp=base_time + 50 * 10**6,
370370
attributes={
371371
"annotation_bool": True,
372372
"annotation_string": "annotation_test",
@@ -429,14 +429,14 @@ def get_exhaustive_otel_span_list() -> List[trace._Span]:
429429
# pylint: disable=W0223
430430
class CommonJsonEncoderTest(CommonEncoderTest, abc.ABC):
431431
def test_encode_trace_id(self):
432-
for trace_id in (1, 1024, 2 ** 32, 2 ** 64, 2 ** 65):
432+
for trace_id in (1, 1024, 2**32, 2**64, 2**65):
433433
self.assertEqual(
434434
format(trace_id, "032x"),
435435
self.get_encoder_default()._encode_trace_id(trace_id),
436436
)
437437

438438
def test_encode_span_id(self):
439-
for span_id in (1, 1024, 2 ** 8, 2 ** 16, 2 ** 32, 2 ** 64):
439+
for span_id in (1, 1024, 2**8, 2**16, 2**32, 2**64):
440440
self.assertEqual(
441441
format(span_id, "016x"),
442442
self.get_encoder_default()._encode_span_id(span_id),

‎exporter/opentelemetry-exporter-zipkin-json/tests/encoder/test_v1_json.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ def test_encode(self):
4848
otel_spans[0].context.span_id
4949
),
5050
"name": otel_spans[0].name,
51-
"timestamp": otel_spans[0].start_time // 10 ** 3,
52-
"duration": (otel_spans[0].end_time // 10 ** 3)
53-
- (otel_spans[0].start_time // 10 ** 3),
51+
"timestamp": otel_spans[0].start_time // 10**3,
52+
"duration": (otel_spans[0].end_time // 10**3)
53+
- (otel_spans[0].start_time // 10**3),
5454
"annotations": [
5555
{
5656
"timestamp": otel_spans[0].events[0].timestamp
57-
// 10 ** 3,
57+
// 10**3,
5858
"value": json.dumps(
5959
{
6060
"event0": {
@@ -101,9 +101,9 @@ def test_encode(self):
101101
otel_spans[1].context.span_id
102102
),
103103
"name": otel_spans[1].name,
104-
"timestamp": otel_spans[1].start_time // 10 ** 3,
105-
"duration": (otel_spans[1].end_time // 10 ** 3)
106-
- (otel_spans[1].start_time // 10 ** 3),
104+
"timestamp": otel_spans[1].start_time // 10**3,
105+
"duration": (otel_spans[1].end_time // 10**3)
106+
- (otel_spans[1].start_time // 10**3),
107107
"binaryAnnotations": [
108108
{
109109
"key": "key_resource",
@@ -128,9 +128,9 @@ def test_encode(self):
128128
otel_spans[2].context.span_id
129129
),
130130
"name": otel_spans[2].name,
131-
"timestamp": otel_spans[2].start_time // 10 ** 3,
132-
"duration": (otel_spans[2].end_time // 10 ** 3)
133-
- (otel_spans[2].start_time // 10 ** 3),
131+
"timestamp": otel_spans[2].start_time // 10**3,
132+
"duration": (otel_spans[2].end_time // 10**3)
133+
- (otel_spans[2].start_time // 10**3),
134134
"binaryAnnotations": [
135135
{
136136
"key": "key_string",
@@ -150,9 +150,9 @@ def test_encode(self):
150150
otel_spans[3].context.span_id
151151
),
152152
"name": otel_spans[3].name,
153-
"timestamp": otel_spans[3].start_time // 10 ** 3,
154-
"duration": (otel_spans[3].end_time // 10 ** 3)
155-
- (otel_spans[3].start_time // 10 ** 3),
153+
"timestamp": otel_spans[3].start_time // 10**3,
154+
"duration": (otel_spans[3].end_time // 10**3)
155+
- (otel_spans[3].start_time // 10**3),
156156
"binaryAnnotations": [
157157
{
158158
"key": NAME_KEY,
@@ -177,8 +177,8 @@ def test_encode_id_zero_padding(self):
177177
trace_id = 0x0E0C63257DE34C926F9EFCD03927272E
178178
span_id = 0x04BF92DEEFC58C92
179179
parent_id = 0x0AAAAAAAAAAAAAAA
180-
start_time = 683647322 * 10 ** 9 # in ns
181-
duration = 50 * 10 ** 6
180+
start_time = 683647322 * 10**9 # in ns
181+
duration = 50 * 10**6
182182
end_time = start_time + duration
183183

184184
otel_span = trace._Span(

0 commit comments

Comments
 (0)