Skip to content

Commit 4c54b08

Browse files
author
Liudmila Molkova
committed
lint
1 parent f22d25d commit 4c54b08

File tree

14 files changed

+286
-321
lines changed

14 files changed

+286
-321
lines changed

‎exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/_internal/_log_encoder/__init__.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@
3030
ResourceLogs,
3131
ScopeLogs,
3232
)
33-
3433
from opentelemetry.sdk._logs import LogRecord as SDKLogRecord
34+
35+
3536
def encode_logs(batch: Sequence[SDKLogRecord]) -> ExportLogsServiceRequest:
3637
return ExportLogsServiceRequest(resource_logs=_encode_resource_logs(batch))
3738

‎exporter/opentelemetry-exporter-otlp-proto-common/tests/test_log_encoder.py‎

Lines changed: 84 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -79,71 +79,71 @@ def test_dropped_attributes_count(self):
7979
@staticmethod
8080
def _get_sdk_log_data() -> List[SDKLogRecord]:
8181
log1 = SDKLogRecord(
82-
timestamp=1644650195189786880,
83-
observed_timestamp=1644650195189786881,
84-
trace_id=89564621134313219400156819398935297684,
85-
span_id=1312458408527513268,
86-
trace_flags=TraceFlags(0x01),
87-
severity_text="WARN",
88-
severity_number=SeverityNumber.WARN,
89-
body="Do not go gentle into that good night. Rage, rage against the dying of the light",
90-
resource=SDKResource(
91-
{"first_resource": "value"},
92-
"resource_schema_url",
93-
),
94-
attributes={"a": 1, "b": "c"},
95-
instrumentation_scope=InstrumentationScope(
96-
"first_name", "first_version"
97-
),
82+
timestamp=1644650195189786880,
83+
observed_timestamp=1644650195189786881,
84+
trace_id=89564621134313219400156819398935297684,
85+
span_id=1312458408527513268,
86+
trace_flags=TraceFlags(0x01),
87+
severity_text="WARN",
88+
severity_number=SeverityNumber.WARN,
89+
body="Do not go gentle into that good night. Rage, rage against the dying of the light",
90+
resource=SDKResource(
91+
{"first_resource": "value"},
92+
"resource_schema_url",
93+
),
94+
attributes={"a": 1, "b": "c"},
95+
instrumentation_scope=InstrumentationScope(
96+
"first_name", "first_version"
97+
),
9898
)
9999

100100
log2 = SDKLogRecord(
101-
timestamp=1644650249738562048,
102-
observed_timestamp=1644650249738562049,
103-
trace_id=0,
104-
span_id=0,
105-
trace_flags=TraceFlags.DEFAULT,
106-
severity_text="WARN",
107-
severity_number=SeverityNumber.WARN,
108-
body="Cooper, this is no time for caution!",
109-
resource=SDKResource({"second_resource": "CASE"}),
110-
attributes={},
111-
instrumentation_scope=InstrumentationScope(
112-
"second_name", "second_version"
113-
),
101+
timestamp=1644650249738562048,
102+
observed_timestamp=1644650249738562049,
103+
trace_id=0,
104+
span_id=0,
105+
trace_flags=TraceFlags.DEFAULT,
106+
severity_text="WARN",
107+
severity_number=SeverityNumber.WARN,
108+
body="Cooper, this is no time for caution!",
109+
resource=SDKResource({"second_resource": "CASE"}),
110+
attributes={},
111+
instrumentation_scope=InstrumentationScope(
112+
"second_name", "second_version"
113+
),
114114
)
115115

116116
log3 = SDKLogRecord(
117-
timestamp=1644650427658989056,
118-
observed_timestamp=1644650427658989057,
119-
trace_id=271615924622795969659406376515024083555,
120-
span_id=4242561578944770265,
121-
trace_flags=TraceFlags(0x01),
122-
severity_text="DEBUG",
123-
severity_number=SeverityNumber.DEBUG,
124-
body="To our galaxy",
125-
resource=SDKResource({"second_resource": "CASE"}),
126-
attributes={"a": 1, "b": "c"},
127-
instrumentation_scope=None,
128-
)
117+
timestamp=1644650427658989056,
118+
observed_timestamp=1644650427658989057,
119+
trace_id=271615924622795969659406376515024083555,
120+
span_id=4242561578944770265,
121+
trace_flags=TraceFlags(0x01),
122+
severity_text="DEBUG",
123+
severity_number=SeverityNumber.DEBUG,
124+
body="To our galaxy",
125+
resource=SDKResource({"second_resource": "CASE"}),
126+
attributes={"a": 1, "b": "c"},
127+
instrumentation_scope=None,
128+
)
129129

130130
log4 = SDKLogRecord(
131-
timestamp=1644650584292683008,
132-
observed_timestamp=1644650584292683009,
133-
trace_id=212592107417388365804938480559624925555,
134-
span_id=6077757853989569223,
135-
trace_flags=TraceFlags(0x01),
136-
severity_text="INFO",
137-
severity_number=SeverityNumber.INFO,
138-
body="Love is the one thing that transcends time and space",
139-
resource=SDKResource(
140-
{"first_resource": "value"},
141-
"resource_schema_url",
142-
),
143-
attributes={"filename": "model.py", "func_name": "run_method"},
144-
instrumentation_scope=InstrumentationScope(
145-
"another_name", "another_version"
146-
),
131+
timestamp=1644650584292683008,
132+
observed_timestamp=1644650584292683009,
133+
trace_id=212592107417388365804938480559624925555,
134+
span_id=6077757853989569223,
135+
trace_flags=TraceFlags(0x01),
136+
severity_text="INFO",
137+
severity_number=SeverityNumber.INFO,
138+
body="Love is the one thing that transcends time and space",
139+
resource=SDKResource(
140+
{"first_resource": "value"},
141+
"resource_schema_url",
142+
),
143+
attributes={"filename": "model.py", "func_name": "run_method"},
144+
instrumentation_scope=InstrumentationScope(
145+
"another_name", "another_version"
146+
),
147147
)
148148

149149
return [log1, log2, log3, log4]
@@ -287,34 +287,34 @@ def get_test_logs(
287287
@staticmethod
288288
def _get_test_logs_dropped_attributes() -> List[SDKLogRecord]:
289289
log1 = SDKLogRecord(
290-
timestamp=1644650195189786880,
291-
trace_id=89564621134313219400156819398935297684,
292-
span_id=1312458408527513268,
293-
trace_flags=TraceFlags(0x01),
294-
severity_text="WARN",
295-
severity_number=SeverityNumber.WARN,
296-
body="Do not go gentle into that good night. Rage, rage against the dying of the light",
297-
resource=SDKResource({"first_resource": "value"}),
298-
attributes={"a": 1, "b": "c", "user_id": "B121092"},
299-
limits=LogLimits(max_attributes=1),
300-
instrumentation_scope=InstrumentationScope(
301-
"first_name", "first_version"
302-
),
303-
)
290+
timestamp=1644650195189786880,
291+
trace_id=89564621134313219400156819398935297684,
292+
span_id=1312458408527513268,
293+
trace_flags=TraceFlags(0x01),
294+
severity_text="WARN",
295+
severity_number=SeverityNumber.WARN,
296+
body="Do not go gentle into that good night. Rage, rage against the dying of the light",
297+
resource=SDKResource({"first_resource": "value"}),
298+
attributes={"a": 1, "b": "c", "user_id": "B121092"},
299+
limits=LogLimits(max_attributes=1),
300+
instrumentation_scope=InstrumentationScope(
301+
"first_name", "first_version"
302+
),
303+
)
304304

305305
log2 = SDKLogRecord(
306-
timestamp=1644650249738562048,
307-
trace_id=0,
308-
span_id=0,
309-
trace_flags=TraceFlags.DEFAULT,
310-
severity_text="WARN",
311-
severity_number=SeverityNumber.WARN,
312-
body="Cooper, this is no time for caution!",
313-
resource=SDKResource({"second_resource": "CASE"}),
314-
attributes={},
315-
instrumentation_scope=InstrumentationScope(
316-
"second_name", "second_version"
317-
),
318-
)
306+
timestamp=1644650249738562048,
307+
trace_id=0,
308+
span_id=0,
309+
trace_flags=TraceFlags.DEFAULT,
310+
severity_text="WARN",
311+
severity_number=SeverityNumber.WARN,
312+
body="Cooper, this is no time for caution!",
313+
resource=SDKResource({"second_resource": "CASE"}),
314+
attributes={},
315+
instrumentation_scope=InstrumentationScope(
316+
"second_name", "second_version"
317+
),
318+
)
319319

320320
return [log1, log2]

‎exporter/opentelemetry-exporter-otlp-proto-grpc/tests/logs/test_otlp_logs_exporter.py‎

Lines changed: 66 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -127,73 +127,73 @@ def setUp(self):
127127
self.server.start()
128128

129129
self.log_data_1 = LogRecord(
130-
timestamp=int(time.time() * 1e9),
131-
trace_id=2604504634922341076776623263868986797,
132-
span_id=5213367945872657620,
133-
trace_flags=TraceFlags(0x01),
134-
severity_text="WARNING",
135-
severity_number=SeverityNumber.WARN,
136-
body="Zhengzhou, We have a heaviest rains in 1000 years",
137-
resource=SDKResource({"key": "value"}),
138-
attributes={"a": 1, "b": "c"},
139-
instrumentation_scope=InstrumentationScope(
140-
"first_name", "first_version"
141-
),
142-
)
130+
timestamp=int(time.time() * 1e9),
131+
trace_id=2604504634922341076776623263868986797,
132+
span_id=5213367945872657620,
133+
trace_flags=TraceFlags(0x01),
134+
severity_text="WARNING",
135+
severity_number=SeverityNumber.WARN,
136+
body="Zhengzhou, We have a heaviest rains in 1000 years",
137+
resource=SDKResource({"key": "value"}),
138+
attributes={"a": 1, "b": "c"},
139+
instrumentation_scope=InstrumentationScope(
140+
"first_name", "first_version"
141+
),
142+
)
143143
self.log_data_2 = LogRecord(
144-
timestamp=int(time.time() * 1e9),
145-
trace_id=2604504634922341076776623263868986799,
146-
span_id=5213367945872657623,
147-
trace_flags=TraceFlags(0x01),
148-
severity_text="INFO",
149-
severity_number=SeverityNumber.INFO2,
150-
body="Sydney, Opera House is closed",
151-
resource=SDKResource({"key": "value"}),
152-
attributes={"custom_attr": [1, 2, 3]},
153-
instrumentation_scope=InstrumentationScope(
154-
"second_name", "second_version"
155-
),
156-
)
144+
timestamp=int(time.time() * 1e9),
145+
trace_id=2604504634922341076776623263868986799,
146+
span_id=5213367945872657623,
147+
trace_flags=TraceFlags(0x01),
148+
severity_text="INFO",
149+
severity_number=SeverityNumber.INFO2,
150+
body="Sydney, Opera House is closed",
151+
resource=SDKResource({"key": "value"}),
152+
attributes={"custom_attr": [1, 2, 3]},
153+
instrumentation_scope=InstrumentationScope(
154+
"second_name", "second_version"
155+
),
156+
)
157157
self.log_data_3 = LogRecord(
158-
timestamp=int(time.time() * 1e9),
159-
trace_id=2604504634922341076776623263868986800,
160-
span_id=5213367945872657628,
161-
trace_flags=TraceFlags(0x01),
162-
severity_text="ERROR",
163-
severity_number=SeverityNumber.WARN,
164-
body="Mumbai, Boil water before drinking",
165-
resource=SDKResource({"service": "myapp"}),
166-
instrumentation_scope=InstrumentationScope(
167-
"third_name", "third_version"
168-
),
169-
)
158+
timestamp=int(time.time() * 1e9),
159+
trace_id=2604504634922341076776623263868986800,
160+
span_id=5213367945872657628,
161+
trace_flags=TraceFlags(0x01),
162+
severity_text="ERROR",
163+
severity_number=SeverityNumber.WARN,
164+
body="Mumbai, Boil water before drinking",
165+
resource=SDKResource({"service": "myapp"}),
166+
instrumentation_scope=InstrumentationScope(
167+
"third_name", "third_version"
168+
),
169+
)
170170
self.log_data_4 = LogRecord(
171-
timestamp=int(time.time() * 1e9),
172-
trace_id=0,
173-
span_id=5213367945872657629,
174-
trace_flags=TraceFlags(0x01),
175-
severity_text="ERROR",
176-
severity_number=SeverityNumber.WARN,
177-
body="Invalid trace id check",
178-
resource=SDKResource({"service": "myapp"}),
179-
instrumentation_scope=InstrumentationScope(
180-
"fourth_name", "fourth_version"
181-
),
182-
)
171+
timestamp=int(time.time() * 1e9),
172+
trace_id=0,
173+
span_id=5213367945872657629,
174+
trace_flags=TraceFlags(0x01),
175+
severity_text="ERROR",
176+
severity_number=SeverityNumber.WARN,
177+
body="Invalid trace id check",
178+
resource=SDKResource({"service": "myapp"}),
179+
instrumentation_scope=InstrumentationScope(
180+
"fourth_name", "fourth_version"
181+
),
182+
)
183183

184184
self.log_data_5 = LogRecord(
185-
timestamp=int(time.time() * 1e9),
186-
trace_id=2604504634922341076776623263868986801,
187-
span_id=0,
188-
trace_flags=TraceFlags(0x01),
189-
severity_text="ERROR",
190-
severity_number=SeverityNumber.WARN,
191-
body="Invalid span id check",
192-
resource=SDKResource({"service": "myapp"}),
193-
instrumentation_scope=InstrumentationScope(
194-
"fifth_name", "fifth_version"
195-
),
196-
)
185+
timestamp=int(time.time() * 1e9),
186+
trace_id=2604504634922341076776623263868986801,
187+
span_id=0,
188+
trace_flags=TraceFlags(0x01),
189+
severity_text="ERROR",
190+
severity_number=SeverityNumber.WARN,
191+
body="Invalid span id check",
192+
resource=SDKResource({"service": "myapp"}),
193+
instrumentation_scope=InstrumentationScope(
194+
"fifth_name", "fifth_version"
195+
),
196+
)
197197

198198
def tearDown(self):
199199
self.server.stop(None)
@@ -507,9 +507,7 @@ def test_translate_log_data(self):
507507
value=AnyValue(string_value="c"),
508508
),
509509
],
510-
flags=int(
511-
self.log_data_1.trace_flags
512-
),
510+
flags=int(self.log_data_1.trace_flags),
513511
)
514512
],
515513
)
@@ -567,9 +565,7 @@ def test_translate_multiple_logs(self):
567565
value=AnyValue(string_value="c"),
568566
),
569567
],
570-
flags=int(
571-
self.log_data_1.trace_flags
572-
),
568+
flags=int(self.log_data_1.trace_flags),
573569
)
574570
],
575571
),
@@ -601,9 +597,7 @@ def test_translate_multiple_logs(self):
601597
value=_encode_value([1, 2, 3]),
602598
),
603599
],
604-
flags=int(
605-
self.log_data_2.trace_flags
606-
),
600+
flags=int(self.log_data_2.trace_flags),
607601
)
608602
],
609603
),
@@ -642,9 +636,7 @@ def test_translate_multiple_logs(self):
642636
"Mumbai, Boil water before drinking"
643637
),
644638
attributes=[],
645-
flags=int(
646-
self.log_data_3.trace_flags
647-
),
639+
flags=int(self.log_data_3.trace_flags),
648640
)
649641
],
650642
)

‎exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/_log_exporter/__init__.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
_OTLP_HTTP_HEADERS,
3131
Compression,
3232
)
33-
3433
from opentelemetry.sdk._logs import LogRecord
3534
from opentelemetry.sdk._logs.export import (
3635
LogExporter,

0 commit comments

Comments
 (0)