Don't use root span on the WrapperRouter for molten, because that will return the api gateway span after these changes.

Author: wantsui

ddtrace/contrib/internal/molten/wrappers.py

@@ -8,6 +8,7 @@
 from ddtrace.ext import http
 from ddtrace.internal.constants import COMPONENT
 from ddtrace.internal.utils.importlib import func_name
+from ddtrace.internal import core
 from ddtrace.trace import Pin
 
 
@@ -107,16 +108,17 @@ def match(self, *args, **kwargs):
                 route.method,
                 route.template,
             )
-            root_span = pin.tracer.current_root_span()
-            root_span.resource = resource
+
+            molten_span = core.get_item('req_span')
+            molten_span.resource = resource
 
             # if no root route set make sure we record it based on this resolved
             # route
-            if root_span:
-                if not root_span.get_tag(MOLTEN_ROUTE):
-                    root_span.set_tag(MOLTEN_ROUTE, route.name)
-                if not root_span.get_tag(http.ROUTE):
-                    root_span.set_tag_str(http.ROUTE, route.template)
+            if molten_span:
+                if not molten_span.get_tag(MOLTEN_ROUTE):
+                    molten_span.set_tag(MOLTEN_ROUTE, route.name)
+                if not molten_span.get_tag(http.ROUTE):
+                    molten_span.set_tag_str(http.ROUTE, route.template)
 
             return route, params
 

tests/contrib/molten/test_molten.py

@@ -451,29 +451,32 @@ def test_inferred_spans_api_gateway_default(self):
         }
 
         for setting_enabled in [False, True]:
-            for test_headers in [distributed_headers, headers]:
+            for test_headers in [headers, distributed_headers]:
                 for test_endpoint in [
                     {
                         "endpoint": "/greet",
                         "status": 200,
-                        "resource_name": "GET 200",
+                        "resource_name": "GET /greet",
                         "http.route": "/greet",
                     },
                     {
                         "endpoint": "/unhandlederror",
                         "status": 500,
-                        "resource_name": "GET 500",
+                        "resource_name": "GET /unhandlederror",
                         "http.route": "/unhandlederror",
                     },
                     {
                         "endpoint": "/404",
                         "status": 404,
-                        "resource_name": "GET 404",
+                        "resource_name": "GET /404",
                         "http.route": "/404",
                     },
                 ]:
                     with override_global_config(dict(_inferred_proxy_services_enabled=setting_enabled)):
-                        self.make_request(headers=test_headers, route=test_endpoint["endpoint"])
+                        try:
+                            self.make_request(headers=test_headers, route=test_endpoint["endpoint"])
+                        except ZeroDivisionError:
+                            pass
 
                         traces = self.pop_traces()
                         if setting_enabled: