Skip to content

Commit cf5b397

Browse files
artemziborevartemziborev
committed
refactor(flask): replace SpanAttributes with semconv attributes (fix ruff linting)
1 parent ce5814f commit cf5b397

File tree

8 files changed

+49
-124
lines changed

8 files changed

+49
-124
lines changed

‎instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_client.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
from opentelemetry.propagate import inject
3333
from opentelemetry.propagators.textmap import Setter
3434
from opentelemetry.semconv._incubating.attributes.rpc_attributes import (
35-
RPC_SYSTEM,
3635
RPC_GRPC_STATUS_CODE,
3736
RPC_METHOD,
3837
RPC_SERVICE,
38+
RPC_SYSTEM,
3939
)
4040
from opentelemetry.trace.status import Status, StatusCode
4141

@@ -216,9 +216,7 @@ def _intercept_server_stream(
216216
yield from invoker(request_or_iterator, metadata)
217217
except grpc.RpcError as err:
218218
span.set_status(Status(StatusCode.ERROR))
219-
span.set_attribute(
220-
RPC_GRPC_STATUS_CODE, err.code().value[0]
221-
)
219+
span.set_attribute(RPC_GRPC_STATUS_CODE, err.code().value[0])
222220
raise err
223221

224222
def intercept_stream(

‎instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_server.py‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@
3030
from opentelemetry import trace
3131
from opentelemetry.context import attach, detach
3232
from opentelemetry.propagate import extract
33+
from opentelemetry.semconv._incubating.attributes.net_attributes import (
34+
NET_PEER_IP,
35+
NET_PEER_NAME,
36+
NET_PEER_PORT,
37+
)
3338
from opentelemetry.semconv._incubating.attributes.rpc_attributes import (
3439
RPC_GRPC_STATUS_CODE,
3540
RPC_METHOD,
3641
RPC_SERVICE,
3742
RPC_SYSTEM,
3843
)
39-
from opentelemetry.semconv._incubating.attributes.net_attributes import (
40-
NET_PEER_IP,
41-
NET_PEER_NAME,
42-
NET_PEER_PORT,
43-
)
4444

4545
from ._utilities import _server_status
4646

@@ -132,9 +132,7 @@ def trailing_metadata(self):
132132
def abort(self, code, details):
133133
self._code = code
134134
self._details = details
135-
self._active_span.set_attribute(
136-
RPC_GRPC_STATUS_CODE, code.value[0]
137-
)
135+
self._active_span.set_attribute(RPC_GRPC_STATUS_CODE, code.value[0])
138136
status = _server_status(code, details)
139137
self._active_span.set_status(status)
140138
return self._servicer_context.abort(code, details)
@@ -161,9 +159,7 @@ def set_code(self, code):
161159
self._code = code
162160
# use details if we already have it, otherwise the status description
163161
details = self._details or code.value[1]
164-
self._active_span.set_attribute(
165-
RPC_GRPC_STATUS_CODE, code.value[0]
166-
)
162+
self._active_span.set_attribute(RPC_GRPC_STATUS_CODE, code.value[0])
167163
if code != grpc.StatusCode.OK:
168164
status = _server_status(code, details)
169165
self._active_span.set_status(status)

‎instrumentation/opentelemetry-instrumentation-grpc/tests/test_aio_client_interceptor.py‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
from opentelemetry.instrumentation.utils import suppress_instrumentation
2828
from opentelemetry.propagate import get_global_textmap, set_global_textmap
2929
from opentelemetry.semconv._incubating.attributes.rpc_attributes import (
30+
RPC_GRPC_STATUS_CODE,
3031
RPC_METHOD,
3132
RPC_SERVICE,
3233
RPC_SYSTEM,
33-
RPC_GRPC_STATUS_CODE,
3434
)
3535
from opentelemetry.test.mock_textmap import MockTextMapPropagator
3636
from opentelemetry.test.test_base import TestBase
@@ -129,9 +129,7 @@ async def test_unary_unary(self):
129129
RPC_METHOD: "SimpleMethod",
130130
RPC_SERVICE: "GRPCTestServer",
131131
RPC_SYSTEM: "grpc",
132-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
133-
0
134-
],
132+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
135133
},
136134
)
137135

@@ -157,9 +155,7 @@ async def test_unary_stream(self):
157155
RPC_METHOD: "ServerStreamingMethod",
158156
RPC_SERVICE: "GRPCTestServer",
159157
RPC_SYSTEM: "grpc",
160-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
161-
0
162-
],
158+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
163159
},
164160
)
165161

@@ -185,9 +181,7 @@ async def test_stream_unary(self):
185181
RPC_METHOD: "ClientStreamingMethod",
186182
RPC_SERVICE: "GRPCTestServer",
187183
RPC_SYSTEM: "grpc",
188-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
189-
0
190-
],
184+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
191185
},
192186
)
193187

@@ -215,9 +209,7 @@ async def test_stream_stream(self):
215209
RPC_METHOD: "BidirectionalStreamingMethod",
216210
RPC_SERVICE: "GRPCTestServer",
217211
RPC_SYSTEM: "grpc",
218-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
219-
0
220-
],
212+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
221213
},
222214
)
223215

‎instrumentation/opentelemetry-instrumentation-grpc/tests/test_aio_server_interceptor.py‎

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
NET_PEER_NAME,
3030
)
3131
from opentelemetry.semconv._incubating.attributes.rpc_attributes import (
32+
RPC_GRPC_STATUS_CODE,
3233
RPC_METHOD,
3334
RPC_SERVICE,
3435
RPC_SYSTEM,
35-
RPC_GRPC_STATUS_CODE
3636
)
3737
from opentelemetry.test.test_base import TestBase
3838
from opentelemetry.trace import StatusCode
@@ -123,9 +123,7 @@ async def request(channel):
123123
RPC_METHOD: "SimpleMethod",
124124
RPC_SERVICE: "GRPCTestServer",
125125
RPC_SYSTEM: "grpc",
126-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
127-
0
128-
],
126+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
129127
},
130128
)
131129

@@ -184,9 +182,7 @@ async def request(channel):
184182
RPC_METHOD: "SimpleMethod",
185183
RPC_SERVICE: "GRPCTestServer",
186184
RPC_SYSTEM: "grpc",
187-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
188-
0
189-
],
185+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
190186
},
191187
)
192188

@@ -241,9 +237,7 @@ async def request(channel):
241237
RPC_METHOD: "SimpleMethod",
242238
RPC_SERVICE: "GRPCTestServer",
243239
RPC_SYSTEM: "grpc",
244-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
245-
0
246-
],
240+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
247241
},
248242
)
249243

@@ -289,9 +283,7 @@ async def request(channel):
289283
RPC_METHOD: "ServerStreamingMethod",
290284
RPC_SERVICE: "GRPCTestServer",
291285
RPC_SYSTEM: "grpc",
292-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
293-
0
294-
],
286+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
295287
},
296288
)
297289

@@ -348,9 +340,7 @@ async def request(channel):
348340
RPC_METHOD: "ServerStreamingMethod",
349341
RPC_SERVICE: "GRPCTestServer",
350342
RPC_SYSTEM: "grpc",
351-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
352-
0
353-
],
343+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
354344
},
355345
)
356346

@@ -438,9 +428,7 @@ async def sequential_requests(channel):
438428
RPC_METHOD: "SimpleMethod",
439429
RPC_SERVICE: "GRPCTestServer",
440430
RPC_SYSTEM: "grpc",
441-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
442-
0
443-
],
431+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
444432
},
445433
)
446434

@@ -501,9 +489,7 @@ async def concurrent_requests(channel):
501489
RPC_METHOD: "SimpleMethod",
502490
RPC_SERVICE: "GRPCTestServer",
503491
RPC_SYSTEM: "grpc",
504-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
505-
0
506-
],
492+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
507493
},
508494
)
509495

@@ -563,9 +549,7 @@ async def request(channel):
563549
RPC_METHOD: "SimpleMethod",
564550
RPC_SERVICE: "GRPCTestServer",
565551
RPC_SYSTEM: "grpc",
566-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.INTERNAL.value[
567-
0
568-
],
552+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.INTERNAL.value[0],
569553
},
570554
)
571555

@@ -683,9 +667,7 @@ async def intercept_service(
683667
RPC_METHOD: "SimpleMethod",
684668
RPC_SERVICE: "GRPCTestServer",
685669
RPC_SYSTEM: "grpc",
686-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
687-
0
688-
],
670+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
689671
},
690672
)
691673

‎instrumentation/opentelemetry-instrumentation-grpc/tests/test_client_interceptor.py‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
from opentelemetry.propagate import get_global_textmap, set_global_textmap
3131
from opentelemetry.sdk.trace import Span as SdkSpan
3232
from opentelemetry.semconv._incubating.attributes.rpc_attributes import (
33+
RPC_GRPC_STATUS_CODE,
3334
RPC_METHOD,
3435
RPC_SERVICE,
3536
RPC_SYSTEM,
36-
RPC_GRPC_STATUS_CODE,
3737
)
3838
from opentelemetry.test.mock_textmap import MockTextMapPropagator
3939
from opentelemetry.test.test_base import TestBase
@@ -143,9 +143,7 @@ def test_unary_unary(self):
143143
RPC_METHOD: "SimpleMethod",
144144
RPC_SERVICE: "GRPCTestServer",
145145
RPC_SYSTEM: "grpc",
146-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
147-
0
148-
],
146+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
149147
},
150148
)
151149

@@ -169,9 +167,7 @@ def test_unary_stream(self):
169167
RPC_METHOD: "ServerStreamingMethod",
170168
RPC_SERVICE: "GRPCTestServer",
171169
RPC_SYSTEM: "grpc",
172-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
173-
0
174-
],
170+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
175171
},
176172
)
177173

@@ -195,9 +191,7 @@ def test_stream_unary(self):
195191
RPC_METHOD: "ClientStreamingMethod",
196192
RPC_SERVICE: "GRPCTestServer",
197193
RPC_SYSTEM: "grpc",
198-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
199-
0
200-
],
194+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
201195
},
202196
)
203197

@@ -223,9 +217,7 @@ def test_stream_stream(self):
223217
RPC_METHOD: "BidirectionalStreamingMethod",
224218
RPC_SERVICE: "GRPCTestServer",
225219
RPC_SYSTEM: "grpc",
226-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
227-
0
228-
],
220+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
229221
},
230222
)
231223

‎instrumentation/opentelemetry-instrumentation-grpc/tests/test_client_interceptor_filter.py‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
from opentelemetry.instrumentation.utils import suppress_instrumentation
3131
from opentelemetry.propagate import get_global_textmap, set_global_textmap
3232
from opentelemetry.semconv._incubating.attributes.rpc_attributes import (
33+
RPC_GRPC_STATUS_CODE,
3334
RPC_METHOD,
3435
RPC_SERVICE,
3536
RPC_SYSTEM,
36-
RPC_GRPC_STATUS_CODE
3737
)
3838
from opentelemetry.test.mock_textmap import MockTextMapPropagator
3939
from opentelemetry.test.test_base import TestBase
@@ -145,9 +145,7 @@ def test_unary_unary(self):
145145
RPC_METHOD: "SimpleMethod",
146146
RPC_SERVICE: "GRPCTestServer",
147147
RPC_SYSTEM: "grpc",
148-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
149-
0
150-
],
148+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
151149
},
152150
)
153151

@@ -289,9 +287,7 @@ def test_unary_unary(self):
289287
RPC_METHOD: "SimpleMethod",
290288
RPC_SERVICE: "GRPCTestServer",
291289
RPC_SYSTEM: "grpc",
292-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
293-
0
294-
],
290+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
295291
},
296292
)
297293

@@ -472,9 +468,7 @@ def test_unary_unary(self):
472468
RPC_METHOD: "SimpleMethod",
473469
RPC_SERVICE: "GRPCTestServer",
474470
RPC_SYSTEM: "grpc",
475-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
476-
0
477-
],
471+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
478472
},
479473
)
480474

@@ -498,9 +492,7 @@ def test_unary_stream(self):
498492
RPC_METHOD: "ServerStreamingMethod",
499493
RPC_SERVICE: "GRPCTestServer",
500494
RPC_SYSTEM: "grpc",
501-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
502-
0
503-
],
495+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
504496
},
505497
)
506498

@@ -524,9 +516,7 @@ def test_stream_unary(self):
524516
RPC_METHOD: "ClientStreamingMethod",
525517
RPC_SERVICE: "GRPCTestServer",
526518
RPC_SYSTEM: "grpc",
527-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
528-
0
529-
],
519+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
530520
},
531521
)
532522

@@ -552,9 +542,7 @@ def test_stream_stream(self):
552542
RPC_METHOD: "BidirectionalStreamingMethod",
553543
RPC_SERVICE: "GRPCTestServer",
554544
RPC_SYSTEM: "grpc",
555-
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[
556-
0
557-
],
545+
RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
558546
},
559547
)
560548

0 commit comments

Comments
 (0)