Fix test spans (#631)

* Try to fix test span

Add a span for scenarios and use it as parent.

* Trigger CI

* Try to change patch

* Include undo in spans

Author: therve

tests/conftest.py

@@ -3,7 +3,7 @@
 
 import os
 
-# First patch httplib
+# First patch urllib
 tracer = None
 try:
     from ddtrace import config, patch, tracer
@@ -18,8 +18,7 @@
         )
         tracer.configure(writer)
 
-    config.httplib["distributed_tracing"] = True
-    patch(httplib=True)
+    patch(urllib3=True)
 
     from pytest import hookimpl
 
@@ -80,6 +79,28 @@ def escape_reserved_keyword(word):
     return word
 
 
+def pytest_bdd_before_scenario(request, feature, scenario):
+    if tracer is None:
+        return
+
+    span = tracer.start_span(
+        scenario.name,
+        span_type="scenario",
+        child_of=tracer.current_trace_context(),
+        activate=True,
+    )
+    setattr(scenario, "__dd_span__", span)
+
+
+def pytest_bdd_after_scenario(request, feature, scenario):
+    ctx = request.getfixturevalue("context")
+    for undo in reversed(ctx["undo_operations"]):
+        undo()
+    span = getattr(scenario, "__dd_span__", None)
+    if span is not None:
+        span.finish()
+
+
 def pytest_bdd_before_step(request, feature, scenario, step, step_func):
     if tracer is None:
         return
@@ -88,7 +109,8 @@ def pytest_bdd_before_step(request, feature, scenario, step, step_func):
         step.type,
         resource=step.name,
         span_type=step.type,
-        child_of=tracer.current_trace_context(),
+        child_of=getattr(scenario, "__dd_span__"),
+        activate=True,
     )
     setattr(step_func, "__dd_span__", span)
 
@@ -230,9 +252,6 @@ def context(vcr, unique, unique_lower, freezer):
 
     yield ctx
 
-    for undo in reversed(ctx["undo_operations"]):
-        undo()
-
 
 @pytest.fixture(scope="session")
 def record_mode(request):