handle empty request method

Author: majorgreys

ext/opentelemetry-ext-wsgi/src/opentelemetry/ext/wsgi/__init__.py

@@ -93,10 +93,10 @@ def collect_request_attributes(environ):
 
     result = {
         "component": "http",
-        "http.method": environ["REQUEST_METHOD"],
-        "http.server_name": environ["SERVER_NAME"],
-        "http.scheme": environ["wsgi.url_scheme"],
-        "host.port": int(environ["SERVER_PORT"]),
+        "http.method": environ.get("REQUEST_METHOD"),
+        "http.server_name": environ.get("SERVER_NAME"),
+        "http.scheme": environ.get("wsgi.url_scheme"),
+        "host.port": int(environ.get("SERVER_PORT")),
     }
 
     setifnotnone(result, "http.host", environ.get("HTTP_HOST"))
@@ -150,7 +150,12 @@ def add_response_attributes(
 
 def get_default_span_name(environ):
     """Default implementation for name_callback, returns HTTP {METHOD_NAME}."""
-    return "HTTP " + environ.get("REQUEST_METHOD")
+    request_method = environ.get("REQUEST_METHOD")
+    return "HTTP" + (
+        " " + request_method
+        if request_method is not None and request_method != ""
+        else ""
+    )
 
 
 class OpenTelemetryMiddleware:
@@ -191,7 +196,6 @@ def __call__(self, environ, start_response):
         token = context.attach(
             propagators.extract(get_header_from_environ, environ)
         )
-        span_name = get_default_span_name(environ)
         span_name = self.name_callback(environ)
 
         span = self.tracer.start_span(

ext/opentelemetry-ext-wsgi/tests/test_wsgi_middleware.py

@@ -74,7 +74,9 @@ def error_wsgi(environ, start_response):
 
 
 class TestWsgiApplication(WsgiTestBase):
-    def validate_response(self, response, error=None, span_name="HTTP GET"):
+    def validate_response(
+        self, response, error=None, span_name="HTTP GET", http_method="GET"
+    ):
         while True:
             try:
                 value = next(response)
@@ -97,21 +99,20 @@ def validate_response(self, response, error=None, span_name="HTTP GET"):
         self.assertEqual(len(span_list), 1)
         self.assertEqual(span_list[0].name, span_name)
         self.assertEqual(span_list[0].kind, trace_api.SpanKind.SERVER)
-        self.assertEqual(
-            span_list[0].attributes,
-            {
-                "component": "http",
-                "http.method": "GET",
-                "http.server_name": "127.0.0.1",
-                "http.scheme": "http",
-                "host.port": 80,
-                "http.host": "127.0.0.1",
-                "http.flavor": "1.0",
-                "http.url": "http://127.0.0.1/",
-                "http.status_text": "OK",
-                "http.status_code": 200,
-            },
-        )
+        expected_attributes = {
+            "component": "http",
+            "http.server_name": "127.0.0.1",
+            "http.scheme": "http",
+            "host.port": 80,
+            "http.host": "127.0.0.1",
+            "http.flavor": "1.0",
+            "http.url": "http://127.0.0.1/",
+            "http.status_text": "OK",
+            "http.status_code": 200,
+        }
+        if http_method is not None:
+            expected_attributes["http.method"] = http_method
+        self.assertEqual(span_list[0].attributes, expected_attributes)
 
     def test_basic_wsgi_call(self):
         app = otel_wsgi.OpenTelemetryMiddleware(simple_wsgi)
@@ -161,6 +162,13 @@ def get_predefined_span_name(scope):
         response = app(self.environ, self.start_response)
         self.validate_response(response, span_name=span_name)
 
+    def test_default_span_name_missing_request_method(self):
+        """Test that default span_names with missing request method."""
+        self.environ.pop("REQUEST_METHOD")
+        app = otel_wsgi.OpenTelemetryMiddleware(simple_wsgi)
+        response = app(self.environ, self.start_response)
+        self.validate_response(response, span_name="HTTP", http_method=None)
+
 
 class TestWsgiAttributes(unittest.TestCase):
     def setUp(self):