Skip to content

Commit 0d390c2

Browse files
authored
fix(asgi): handle when server port is not set (#1601)
1 parent 4222f54 commit 0d390c2

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

ddtrace/contrib/asgi/middleware.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def _extract_tags_from_scope(scope):
4040
server = scope.get("server")
4141
if server and len(server) == 2:
4242
port = server[1]
43-
server_host = server[0] + (":" + str(port) if port != 80 else "")
43+
server_host = server[0] + (":" + str(port) if port is not None and port != 80 else "")
4444
full_path = scope.get("root_path", "") + scope.get("path", "")
4545
http_url = scope.get("scheme", "http") + "://" + server_host + full_path
4646
tags[http.URL] = http_url

tests/contrib/asgi/test_asgi.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
{},
1818
{"server": None},
1919
{"server": ("dev", 8000)},
20+
{"server": ("dev", None)},
2021
{"http_version": "1.0", "asgi": {}},
2122
{"http_version": "1.0", "asgi": {"version": "3.2"}},
2223
{"http_version": "1.0", "asgi": {"spec_version": "2.1",}},

0 commit comments

Comments
 (0)