Skip to content

[currency] fix: Tornado instrumentation to support version 6.5.3 #828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CagriYonca merged 2 commits into from
Dec 15, 2025
Merged

[currency] fix: Tornado instrumentation to support version 6.5.3 #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e13c65d
fix(tornado): `_dict` removed in `tornado-6.5.3`
GSVarsha Dec 15, 2025
6365fd0
fix: tornado tests
GSVarsha Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/instana/instrumentation/tornado/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,9 @@ def execute_with_instana(
try:
span_context = None
tracer = get_tracer()
if (
hasattr(instance.request.headers, "__dict__")
and "_dict" in instance.request.headers.__dict__
):
if instance.request.headers:
span_context = tracer.extract(
Format.HTTP_HEADERS, instance.request.headers.__dict__["_dict"]
Format.HTTP_HEADERS, dict(instance.request.headers.items())
)

span = tracer.start_span("tornado-server", span_context=span_context)
Expand Down
72 changes: 36 additions & 36 deletions tests/frameworks/test_tornado_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ async def test():
assert type(client_span.stack) is list
assert len(client_span.stack) > 1

assert "X-INSTANA-T" in response.headers
assert response.headers.get("X-INSTANA-T")
assert response.headers["X-INSTANA-T"] == hex_id(traceId)
assert "X-INSTANA-S" in response.headers
assert response.headers.get("X-INSTANA-S")
assert response.headers["X-INSTANA-S"] == hex_id(server_span.s)
assert "X-INSTANA-L" in response.headers
assert response.headers.get("X-INSTANA-L")
assert response.headers["X-INSTANA-L"] == "1"
assert "Server-Timing" in response.headers
assert response.headers.get("Server-Timing")
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"

def test_post(self) -> None:
Expand Down Expand Up @@ -140,13 +140,13 @@ async def test():
assert type(client_span.stack) is list
assert len(client_span.stack) > 1

assert "X-INSTANA-T" in response.headers
assert response.headers.get("X-INSTANA-T")
assert response.headers["X-INSTANA-T"] == hex_id(traceId)
assert "X-INSTANA-S" in response.headers
assert response.headers.get("X-INSTANA-S")
assert response.headers["X-INSTANA-S"] == hex_id(server_span.s)
assert "X-INSTANA-L" in response.headers
assert response.headers.get("X-INSTANA-L")
assert response.headers["X-INSTANA-L"] == "1"
assert "Server-Timing" in response.headers
assert response.headers.get("Server-Timing")
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"

def test_get_301(self) -> None:
Expand Down Expand Up @@ -242,13 +242,13 @@ def filter(span):
assert type(client301_span.stack) is list
assert len(client301_span.stack) > 1

assert "X-INSTANA-T" in response.headers
assert response.headers.get("X-INSTANA-T")
assert response.headers["X-INSTANA-T"] == hex_id(traceId)
assert "X-INSTANA-S" in response.headers
assert response.headers.get("X-INSTANA-S")
assert response.headers["X-INSTANA-S"] == hex_id(server_span.s)
assert "X-INSTANA-L" in response.headers
assert response.headers.get("X-INSTANA-L")
assert response.headers["X-INSTANA-L"] == "1"
assert "Server-Timing" in response.headers
assert response.headers.get("Server-Timing")
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"

def test_get_405(self) -> None:
Expand Down Expand Up @@ -302,13 +302,13 @@ async def test():
assert type(client_span.stack) is list
assert len(client_span.stack) > 1

assert "X-INSTANA-T" in response.headers
assert response.headers.get("X-INSTANA-T")
assert response.headers["X-INSTANA-T"] == hex_id(traceId)
assert "X-INSTANA-S" in response.headers
assert response.headers.get("X-INSTANA-S")
assert response.headers["X-INSTANA-S"] == hex_id(server_span.s)
assert "X-INSTANA-L" in response.headers
assert response.headers.get("X-INSTANA-L")
assert response.headers["X-INSTANA-L"] == "1"
assert "Server-Timing" in response.headers
assert response.headers.get("Server-Timing")
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"

def test_get_500(self) -> None:
Expand Down Expand Up @@ -362,13 +362,13 @@ async def test():
assert type(client_span.stack) is list
assert len(client_span.stack) > 1

assert "X-INSTANA-T" in response.headers
assert response.headers.get("X-INSTANA-T")
assert response.headers["X-INSTANA-T"] == hex_id(traceId)
assert "X-INSTANA-S" in response.headers
assert response.headers.get("X-INSTANA-S")
assert response.headers["X-INSTANA-S"] == hex_id(server_span.s)
assert "X-INSTANA-L" in response.headers
assert response.headers.get("X-INSTANA-L")
assert response.headers["X-INSTANA-L"] == "1"
assert "Server-Timing" in response.headers
assert response.headers.get("Server-Timing")
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"

def test_get_504(self) -> None:
Expand Down Expand Up @@ -422,13 +422,13 @@ async def test():
assert type(client_span.stack) is list
assert len(client_span.stack) > 1

assert "X-INSTANA-T" in response.headers
assert response.headers.get("X-INSTANA-T")
assert response.headers["X-INSTANA-T"] == hex_id(traceId)
assert "X-INSTANA-S" in response.headers
assert response.headers.get("X-INSTANA-S")
assert response.headers["X-INSTANA-S"] == hex_id(server_span.s)
assert "X-INSTANA-L" in response.headers
assert response.headers.get("X-INSTANA-L")
assert response.headers["X-INSTANA-L"] == "1"
assert "Server-Timing" in response.headers
assert response.headers.get("Server-Timing")
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"

def test_get_with_params_to_scrub(self) -> None:
Expand Down Expand Up @@ -480,13 +480,13 @@ async def test():
assert type(client_span.stack) is list
assert len(client_span.stack) > 1

assert "X-INSTANA-T" in response.headers
assert response.headers.get("X-INSTANA-T")
assert response.headers["X-INSTANA-T"] == hex_id(traceId)
assert "X-INSTANA-S" in response.headers
assert response.headers.get("X-INSTANA-S")
assert response.headers["X-INSTANA-S"] == hex_id(server_span.s)
assert "X-INSTANA-L" in response.headers
assert response.headers.get("X-INSTANA-L")
assert response.headers["X-INSTANA-L"] == "1"
assert "Server-Timing" in response.headers
assert response.headers.get("Server-Timing")
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"

def test_request_header_capture(self) -> None:
Expand Down Expand Up @@ -547,13 +547,13 @@ async def test():
assert type(client_span.stack) is list
assert len(client_span.stack) > 1

assert "X-INSTANA-T" in response.headers
assert response.headers.get("X-INSTANA-T")
assert response.headers["X-INSTANA-T"] == hex_id(traceId)
assert "X-INSTANA-S" in response.headers
assert response.headers.get("X-INSTANA-S")
assert response.headers["X-INSTANA-S"] == hex_id(server_span.s)
assert "X-INSTANA-L" in response.headers
assert response.headers.get("X-INSTANA-L")
assert response.headers["X-INSTANA-L"] == "1"
assert "Server-Timing" in response.headers
assert response.headers.get("Server-Timing")
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"

assert "X-Capture-This" in client_span.data["http"]["header"]
Expand Down Expand Up @@ -622,13 +622,13 @@ async def test():
assert type(client_span.stack) is list
assert len(client_span.stack) > 1

assert "X-INSTANA-T" in response.headers
assert response.headers.get("X-INSTANA-T")
assert response.headers["X-INSTANA-T"] == hex_id(traceId)
assert "X-INSTANA-S" in response.headers
assert response.headers.get("X-INSTANA-S")
assert response.headers["X-INSTANA-S"] == hex_id(server_span.s)
assert "X-INSTANA-L" in response.headers
assert response.headers.get("X-INSTANA-L")
assert response.headers["X-INSTANA-L"] == "1"
assert "Server-Timing" in response.headers
assert response.headers.get("Server-Timing")
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"

assert "X-Capture-This-Too" in client_span.data["http"]["header"]
Expand Down
Loading