File tree 1 file changed +9
-2
lines changed
ext/opentelemetry-ext-asgi/src/opentelemetry/ext/asgi
1 file changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -80,8 +80,12 @@ def collect_request_attributes(scope):
80
80
server = scope .get ("server" ) or ["0.0.0.0" , 80 ]
81
81
port = server [1 ]
82
82
server_host = server [0 ] + (":" + str (port ) if port != 80 else "" )
83
- http_url = scope .get ("scheme" ) + "://" + server_host + scope .get ("path" )
84
- if scope .get ("query_string" ):
83
+ http_url = (
84
+ scope .get ("scheme" ) + "://" + server_host + scope .get ("path" , "" )
85
+ if scope .get ("scheme" ) and server_host and scope .get ("path" )
86
+ else None
87
+ )
88
+ if scope .get ("query_string" ) and http_url :
85
89
http_url = http_url + ("?" + scope .get ("query_string" ).decode ("utf8" ))
86
90
87
91
result = {
@@ -107,6 +111,9 @@ def collect_request_attributes(scope):
107
111
result ["net.peer.ip" ] = scope .get ("client" )[0 ]
108
112
result ["net.peer.port" ] = scope .get ("client" )[1 ]
109
113
114
+ # remove None values
115
+ result = {k : v for k , v in result .items () if v is not None }
116
+
110
117
return result
111
118
112
119
You can’t perform that action at this time.
0 commit comments