Add CI tags to tracked spans (#105)

* ci: enable tracing

* Apply suggestions from code review

Author: jirikuncar

.azure-pipelines/all.yml

@@ -19,7 +19,7 @@ schedules:
 resources:
   containers:
   - container: datadog-agent
-    image: datadog/agent:7
+    image: datadog/agent:latest
     options: --health-cmd="exit 0" --health-interval=1s
     ports:
     - 8125:8125
@@ -46,7 +46,11 @@ jobs:
   services:
     datadog-agent: datadog-agent
   steps:
-    - script: python -m pip install -e .[apm,tests]
+    - script: |
+        python -m pip install --upgrade pip setuptools
+        python -m pip install cython
+        python -m pip install -e .[apm,tests]
+        python -m pip install -U --pre --find-links=https://s3.amazonaws.com/pypi.datadoghq.com/trace-dev/index.html ddtrace
       displayName: Install package
     - script: ./run-tests.sh
       displayName: Run integration tests
@@ -55,11 +59,13 @@ jobs:
         DD_AGENT_HOST: datadog-agent
         DD_ENV: prod
         DD_SERVICE: datadog-api-client-python
-        DD_TAGS: "team:integration-tools-and-libraries,build.requested_by:$(Build.RequestedForId),build.attempt:$(System.StageAttempt),pull_request.number:$(System.PullRequest.PullRequestNumber)"
+        DD_TAGS: "team:integration-tools-and-libraries"
         DD_TEST_CLIENT_API_KEY: $(datadogAPIKey)
         DD_TEST_CLIENT_APP_KEY: $(datadogAPPKey)
         DD_TRACE_ANALYTICS_ENABLED: "true"
         RECORD: "none"
+        PYTEST_ADDOPTS: "--ddtrace"
+        DD_PYTEST_OPERATION_NAME: "test"
     - script: |
         bash <(curl -s https://codecov.io/bash) -F integration -v
 

tests/conftest.py

@@ -35,45 +35,6 @@
 logging.basicConfig()
 
 
-@pytest.hookimpl(tryfirst=True, hookwrapper=True)
-def pytest_runtest_makereport(item, call):
-    """Store outcome for tracing."""
-    outcome = yield
-    rep = outcome.get_result()
-    setattr(item, "dd_outcome", rep)
-
-
-def pytest_sessionfinish(session, exitstatus):
-    """Flush open tracer."""
-    if tracer is None:
-        return
-
-    tracer.shutdown()
-
-
-@pytest.fixture(scope="function")
-def ddspan(request):
-    if tracer is None:
-        yield None
-        return
-
-    tags = [marker.kwargs for marker in request.node.iter_markers(name="dd_tag")]
-
-    with tracer.trace("test", resource=request.node.name, span_type="test") as span:
-        from ddtrace.constants import ANALYTICS_SAMPLE_RATE_KEY
-        span.set_tag(ANALYTICS_SAMPLE_RATE_KEY, True)
-
-        for tag in tags:
-            for key, value in tag.items():
-                span.set_tag(key, value)
-
-        yield span
-
-        outcome = request.node.dd_outcome
-        if outcome.failed:
-            span.set_exc_info(sys.last_type, sys.last_value, sys.last_traceback)
-
-
 def pytest_bdd_before_step(request, feature, scenario, step, step_func):
     if tracer is None:
         return

tests/v1/test_scenarios.py

@@ -7,7 +7,6 @@
 
 pytestmark = [
     pytest.mark.vcr,
-    pytest.mark.usefixtures("ddspan"),
 ]
 
 scenarios("features")

tests/v2/test_scenarios.py

@@ -6,7 +6,6 @@
 
 pytestmark = [
     pytest.mark.vcr,
-    pytest.mark.usefixtures("ddspan"),
 ]