Skip to content

Commit 25d56f9

Browse files
pvitalpvital
committed
fix (tests): Using hexadecimal IDs in Server-Timing header.
Signed-off-by: Paulo Vital <[email protected]>
1 parent b7a673d commit 25d56f9

16 files changed

+107
-101
lines changed

‎tests/clients/test_pika.py

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from opentelemetry.trace.span import format_span_id
1515

1616
from instana.singletons import agent, tracer
17+
from instana.util.ids import hex_id
1718

1819

1920
class _TestPika:
@@ -377,6 +378,7 @@ def test_basic_publish(self, send_method, _unused) -> None:
377378
"X-INSTANA-T": format_span_id(rabbitmq_span.t),
378379
"X-INSTANA-S": format_span_id(rabbitmq_span.s),
379380
"X-INSTANA-L": "1",
381+
"Server-Timing": f"intid;desc={hex_id(rabbitmq_span.t)}",
380382
}
381383
),
382384
b"Hello!",
@@ -418,6 +420,7 @@ def test_basic_publish_as_root_exit_span(self, send_method, _unused) -> None:
418420
"X-INSTANA-T": format_span_id(rabbitmq_span.t),
419421
"X-INSTANA-S": format_span_id(rabbitmq_span.s),
420422
"X-INSTANA-L": "1",
423+
"Server-Timing": f"intid;desc={hex_id(rabbitmq_span.t)}",
421424
}
422425
),
423426
b"Hello!",
@@ -451,6 +454,7 @@ def test_basic_publish_with_headers(self, send_method, _unused) -> None:
451454
"X-INSTANA-T": format_span_id(rabbitmq_span.t),
452455
"X-INSTANA-S": format_span_id(rabbitmq_span.s),
453456
"X-INSTANA-L": "1",
457+
"Server-Timing": f"intid;desc={hex_id(rabbitmq_span.t)}",
454458
}
455459
),
456460
b"Hello!",

‎tests/frameworks/test_aiohttp_client.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ async def test():
8989
assert "X-INSTANA-L" in response.headers
9090
assert response.headers["X-INSTANA-L"] == "1"
9191
assert "Server-Timing" in response.headers
92-
assert response.headers["Server-Timing"] == f"intid;desc={traceId}"
92+
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"
9393

9494
def test_client_get_as_root_exit_span(self) -> None:
9595
agent.options.allow_exit_as_root = True
@@ -132,7 +132,7 @@ async def test():
132132
assert "X-INSTANA-L" in response.headers
133133
assert response.headers["X-INSTANA-L"] == "1"
134134
assert "Server-Timing" in response.headers
135-
assert response.headers["Server-Timing"] == f"intid;desc={wsgi_span.t}"
135+
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(wsgi_span.t)}"
136136

137137
def test_client_get_301(self) -> None:
138138
async def test():
@@ -182,7 +182,7 @@ async def test():
182182
assert "X-INSTANA-L" in response.headers
183183
assert response.headers["X-INSTANA-L"] == "1"
184184
assert "Server-Timing" in response.headers
185-
assert response.headers["Server-Timing"] == f"intid;desc={traceId}"
185+
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"
186186

187187
def test_client_get_405(self) -> None:
188188
async def test():
@@ -228,7 +228,7 @@ async def test():
228228
assert "X-INSTANA-L" in response.headers
229229
assert response.headers["X-INSTANA-L"] == "1"
230230
assert "Server-Timing" in response.headers
231-
assert response.headers["Server-Timing"] == f"intid;desc={traceId}"
231+
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"
232232

233233
def test_client_get_500(self) -> None:
234234
async def test():
@@ -275,7 +275,7 @@ async def test():
275275
assert "X-INSTANA-L" in response.headers
276276
assert response.headers["X-INSTANA-L"] == "1"
277277
assert "Server-Timing" in response.headers
278-
assert response.headers["Server-Timing"] == f"intid;desc={traceId}"
278+
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"
279279

280280
def test_client_get_504(self) -> None:
281281
async def test():
@@ -322,7 +322,7 @@ async def test():
322322
assert "X-INSTANA-L" in response.headers
323323
assert response.headers["X-INSTANA-L"] == "1"
324324
assert "Server-Timing" in response.headers
325-
assert response.headers["Server-Timing"] == f"intid;desc={traceId}"
325+
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"
326326

327327
def test_client_get_with_params_to_scrub(self) -> None:
328328
async def test():
@@ -371,7 +371,7 @@ async def test():
371371
assert "X-INSTANA-L" in response.headers
372372
assert response.headers["X-INSTANA-L"] == "1"
373373
assert "Server-Timing" in response.headers
374-
assert response.headers["Server-Timing"] == f"intid;desc={traceId}"
374+
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"
375375

376376
def test_client_response_header_capture(self) -> None:
377377
original_extra_http_headers = agent.options.extra_http_headers
@@ -425,7 +425,7 @@ async def test():
425425
assert "X-INSTANA-L" in response.headers
426426
assert response.headers["X-INSTANA-L"] == "1"
427427
assert "Server-Timing" in response.headers
428-
assert response.headers["Server-Timing"] == f"intid;desc={traceId}"
428+
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"
429429

430430
agent.options.extra_http_headers = original_extra_http_headers
431431

‎tests/frameworks/test_aiohttp_server.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ async def test():
8383
assert "X-INSTANA-L" in response.headers
8484
assert response.headers["X-INSTANA-L"] == "1"
8585
assert "Server-Timing" in response.headers
86-
assert response.headers["Server-Timing"] == f"intid;desc={traceId}"
86+
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"
8787

8888
def test_server_get_204(self):
8989
async def test():
@@ -132,7 +132,7 @@ async def test():
132132
assert "X-INSTANA-L" in response.headers
133133
assert response.headers["X-INSTANA-L"] == "1"
134134
assert "Server-Timing" in response.headers
135-
assert response.headers["Server-Timing"] == f"intid;desc={trace_id}"
135+
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(trace_id)}"
136136

137137
def test_server_synthetic_request(self):
138138
async def test():
@@ -205,7 +205,7 @@ async def test():
205205
assert "X-INSTANA-L" in response.headers
206206
assert response.headers["X-INSTANA-L"] == "1"
207207
assert "Server-Timing" in response.headers
208-
assert response.headers["Server-Timing"] == f"intid;desc={traceId}"
208+
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"
209209

210210
def test_server_custom_header_capture(self):
211211
async def test():
@@ -265,7 +265,7 @@ async def test():
265265
assert "X-INSTANA-L" in response.headers
266266
assert response.headers["X-INSTANA-L"] == "1"
267267
assert "Server-Timing" in response.headers
268-
assert response.headers["Server-Timing"] == f"intid;desc={traceId}"
268+
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"
269269

270270
assert "X-Capture-This" in aioserver_span.data["http"]["header"]
271271
assert aioserver_span.data["http"]["header"]["X-Capture-This"] == "this"
@@ -314,7 +314,7 @@ async def test():
314314
assert "X-INSTANA-L" in response.headers
315315
assert response.headers["X-INSTANA-L"] == "1"
316316
assert "Server-Timing" in response.headers
317-
assert response.headers["Server-Timing"] == f"intid;desc={traceId}"
317+
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"
318318

319319
def test_server_get_500(self):
320320
async def test():
@@ -358,7 +358,7 @@ async def test():
358358
assert "X-INSTANA-L" in response.headers
359359
assert response.headers["X-INSTANA-L"] == "1"
360360
assert "Server-Timing" in response.headers
361-
assert response.headers["Server-Timing"] == f"intid;desc={traceId}"
361+
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"
362362

363363
def test_server_get_exception(self):
364364
async def test():

‎tests/frameworks/test_django.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def test_basic_request(self) -> None:
6262
assert response.headers["X-INSTANA-L"] == "1"
6363

6464
assert "Server-Timing" in response.headers
65-
server_timing_value = "intid;desc=%s" % django_span.t
65+
server_timing_value = f"intid;desc={hex_id(django_span.t)}"
6666
assert response.headers["Server-Timing"] == server_timing_value
6767

6868
assert "test" == test_span.data["sdk"]["name"]
@@ -151,7 +151,7 @@ def test_request_with_error(self) -> None:
151151
assert response.headers["X-INSTANA-L"] == "1"
152152

153153
assert "Server-Timing" in response.headers
154-
server_timing_value = "intid;desc=%s" % django_span.t
154+
server_timing_value = f"intid;desc={hex_id(django_span.t)}"
155155
assert response.headers["Server-Timing"] == server_timing_value
156156

157157
assert "test" == test_span.data["sdk"]["name"]
@@ -244,7 +244,7 @@ def test_complex_request(self) -> None:
244244
assert response.headers["X-INSTANA-L"] == "1"
245245

246246
assert "Server-Timing" in response.headers
247-
server_timing_value = "intid;desc=%s" % django_span.t
247+
server_timing_value = f"intid;desc={hex_id(django_span.t)}"
248248
assert response.headers["Server-Timing"] == server_timing_value
249249

250250
assert "test" == test_span.data["sdk"]["name"]
@@ -410,7 +410,7 @@ def test_with_incoming_context(self) -> None:
410410
assert response.headers["X-INSTANA-L"] == "1"
411411

412412
assert "Server-Timing" in response.headers
413-
server_timing_value = "intid;desc=%s" % django_span.t
413+
server_timing_value = f"intid;desc={hex_id(django_span.t)}"
414414
assert response.headers["Server-Timing"] == server_timing_value
415415

416416
assert "traceparent" in response.headers
@@ -477,7 +477,7 @@ def test_with_incoming_context_and_correlation(self) -> None:
477477
assert response.headers["X-INSTANA-L"] == "1"
478478

479479
assert "Server-Timing" in response.headers
480-
server_timing_value = "intid;desc=%s" % django_span.t
480+
server_timing_value = f"intid;desc={hex_id(django_span.t)}"
481481
assert response.headers["Server-Timing"] == server_timing_value
482482

483483
assert "traceparent" in response.headers
@@ -537,7 +537,7 @@ def test_with_incoming_traceparent_tracestate(self) -> None:
537537
assert response.headers["X-INSTANA-L"] == "1"
538538

539539
assert "Server-Timing" in response.headers
540-
server_timing_value = "intid;desc=%s" % django_span.t
540+
server_timing_value = f"intid;desc={hex_id(django_span.t)}"
541541
assert response.headers["Server-Timing"] == server_timing_value
542542

543543
assert "traceparent" in response.headers
@@ -594,7 +594,7 @@ def test_with_incoming_traceparent_tracestate_disable_traceparent(self) -> None:
594594
assert response.headers["X-INSTANA-L"] == "1"
595595

596596
assert "Server-Timing" in response.headers
597-
server_timing_value = "intid;desc=%s" % django_span.t
597+
server_timing_value = f"intid;desc={hex_id(django_span.t)}"
598598
assert response.headers["Server-Timing"] == server_timing_value
599599

600600
assert "traceparent" in response.headers
@@ -645,7 +645,7 @@ def test_with_incoming_mixed_case_context(self) -> None:
645645
assert response.headers["X-INSTANA-L"] == "1"
646646

647647
assert "Server-Timing" in response.headers
648-
server_timing_value = "intid;desc=%s" % django_span.t
648+
server_timing_value = f"intid;desc={hex_id(django_span.t)}"
649649
assert response.headers["Server-Timing"] == server_timing_value
650650

651651
def test_url_pattern_route(self) -> None:

‎tests/frameworks/test_fastapi.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def test_basic_get(self) -> None:
8989

9090
assert result.headers["X-INSTANA-T"] == hex_id(asgi_span.t)
9191
assert result.headers["X-INSTANA-S"] == hex_id(asgi_span.s)
92-
assert result.headers["Server-Timing"] == f"intid;desc={asgi_span.t}"
92+
assert result.headers["Server-Timing"] == f"intid;desc={hex_id(asgi_span.t)}"
9393

9494
assert not asgi_span.ec
9595
assert asgi_span.data["http"]["host"] == "testserver"
@@ -140,7 +140,7 @@ def test_400(self) -> None:
140140

141141
assert result.headers["X-INSTANA-T"] == hex_id(asgi_span.t)
142142
assert result.headers["X-INSTANA-S"] == hex_id(asgi_span.s)
143-
assert result.headers["Server-Timing"] == f"intid;desc={asgi_span.t}"
143+
assert result.headers["Server-Timing"] == f"intid;desc={hex_id(asgi_span.t)}"
144144

145145
assert not asgi_span.ec
146146
assert asgi_span.data["http"]["host"] == "testserver"
@@ -191,7 +191,7 @@ def test_500(self) -> None:
191191

192192
assert result.headers["X-INSTANA-T"] == hex_id(asgi_span.t)
193193
assert result.headers["X-INSTANA-S"] == hex_id(asgi_span.s)
194-
assert result.headers["Server-Timing"] == f"intid;desc={asgi_span.t}"
194+
assert result.headers["Server-Timing"] == f"intid;desc={hex_id(asgi_span.t)}"
195195

196196
assert asgi_span.ec == 1
197197
assert asgi_span.data["http"]["host"] == "testserver"
@@ -241,7 +241,7 @@ def test_path_templates(self) -> None:
241241

242242
assert result.headers["X-INSTANA-T"] == hex_id(asgi_span.t)
243243
assert result.headers["X-INSTANA-S"] == hex_id(asgi_span.s)
244-
assert result.headers["Server-Timing"] == f"intid;desc={asgi_span.t}"
244+
assert result.headers["Server-Timing"] == f"intid;desc={hex_id(asgi_span.t)}"
245245

246246
assert not asgi_span.ec
247247
assert asgi_span.data["http"]["host"] == "testserver"
@@ -291,7 +291,7 @@ def test_secret_scrubbing(self) -> None:
291291

292292
assert result.headers["X-INSTANA-T"] == hex_id(asgi_span.t)
293293
assert result.headers["X-INSTANA-S"] == hex_id(asgi_span.s)
294-
assert result.headers["Server-Timing"] == f"intid;desc={asgi_span.t}"
294+
assert result.headers["Server-Timing"] == f"intid;desc={hex_id(asgi_span.t)}"
295295

296296
assert not asgi_span.ec
297297
assert asgi_span.data["http"]["host"] == "testserver"
@@ -342,7 +342,7 @@ def test_synthetic_request(self) -> None:
342342

343343
assert result.headers["X-INSTANA-T"] == hex_id(asgi_span.t)
344344
assert result.headers["X-INSTANA-S"] == hex_id(asgi_span.s)
345-
assert result.headers["Server-Timing"] == f"intid;desc={asgi_span.t}"
345+
assert result.headers["Server-Timing"] == f"intid;desc={hex_id(asgi_span.t)}"
346346

347347
assert not asgi_span.ec
348348
assert asgi_span.data["http"]["host"] == "testserver"
@@ -397,7 +397,7 @@ def test_request_header_capture(self) -> None:
397397

398398
assert result.headers["X-INSTANA-T"] == hex_id(asgi_span.t)
399399
assert result.headers["X-INSTANA-S"] == hex_id(asgi_span.s)
400-
assert result.headers["Server-Timing"] == f"intid;desc={asgi_span.t}"
400+
assert result.headers["Server-Timing"] == f"intid;desc={hex_id(asgi_span.t)}"
401401

402402
assert not asgi_span.ec
403403
assert asgi_span.data["http"]["host"] == "testserver"
@@ -455,7 +455,7 @@ def test_response_header_capture(self) -> None:
455455

456456
assert result.headers["X-INSTANA-T"] == hex_id(asgi_span.t)
457457
assert result.headers["X-INSTANA-S"] == hex_id(asgi_span.s)
458-
assert result.headers["Server-Timing"] == f"intid;desc={asgi_span.t}"
458+
assert result.headers["Server-Timing"] == f"intid;desc={hex_id(asgi_span.t)}"
459459

460460
assert not asgi_span.ec
461461
assert asgi_span.data["http"]["host"] == "testserver"
@@ -515,7 +515,7 @@ def test_non_async_simple(self) -> None:
515515

516516
assert result.headers["X-INSTANA-T"] == hex_id(asgi_span1.t)
517517
assert result.headers["X-INSTANA-S"] == hex_id(asgi_span1.s)
518-
assert result.headers["Server-Timing"] == f"intid;desc={asgi_span1.t}"
518+
assert result.headers["Server-Timing"] == f"intid;desc={hex_id(asgi_span1.t)}"
519519

520520
assert not asgi_span1.ec
521521
assert asgi_span1.data["http"]["host"] == "testserver"
@@ -573,7 +573,7 @@ def test_non_async_threadpool(self) -> None:
573573

574574
assert result.headers["X-INSTANA-T"] == hex_id(asgi_span.t)
575575
assert result.headers["X-INSTANA-S"] == hex_id(asgi_span.s)
576-
assert result.headers["Server-Timing"] == f"intid;desc={asgi_span.t}"
576+
assert result.headers["Server-Timing"] == f"intid;desc={hex_id(asgi_span.t)}"
577577

578578
assert not asgi_span.ec
579579
assert asgi_span.data["http"]["host"] == "testserver"

‎tests/frameworks/test_fastapi_middleware.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def test_basic_get(self) -> None:
8585

8686
assert result.headers["X-INSTANA-T"] == hex_id(asgi_span.t)
8787
assert result.headers["X-INSTANA-S"] == hex_id(asgi_span.s)
88-
assert result.headers["Server-Timing"] == f"intid;desc={asgi_span.t}"
88+
assert result.headers["Server-Timing"] == f"intid;desc={hex_id(asgi_span.t)}"
8989

9090
assert not asgi_span.ec
9191
assert asgi_span.data["http"]["path"] == "/"

0 commit comments

Comments
 (0)