fix(graphql): mark graphql.execute spans as measured (#6113) [backport to 1.12] (#6126)

For consistency with other tracers, especially dd-trace-js.

---------

Co-authored-by: Yun Kim <[email protected]>
(cherry picked from commit 54110dd)

## Checklist

- [x] foobar

Author: emmettbutler

ddtrace/contrib/graphql/patch.py

@@ -169,6 +169,8 @@ def _traced_execute(func, args, kwargs):
     ) as span:
         span.set_tag_str(COMPONENT, config.graphql.integration_name)
 
+        span.set_tag(SPAN_MEASURED_KEY)
+
         _set_span_operation_tags(span, document)
         span.set_tag_str(_GRAPHQL_SOURCE, source_str)
 

releasenotes/notes/graphql-measured-d512e43de27d7ae3.yaml

@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    graphql: ``graphql.execute`` spans are now marked as measured.

tests/snapshots/tests.contrib.graphene.test_graphene.test_schema_execute.json

@@ -12,18 +12,18 @@
       "_dd.p.dm": "-0",
       "component": "graphql",
       "language": "python",
-      "runtime-id": "9203e2a344a64d8da2a34d37d8fe3900"
+      "runtime-id": "9cdfa74761ee41b8a9a989a2e4eab332"
     },
     "metrics": {
       "_dd.agent_psr": 1.0,
       "_dd.measured": 1,
       "_dd.top_level": 1,
       "_dd.tracer_kr": 1.0,
       "_sampling_priority_v1": 1,
-      "process_id": 80357
+      "process_id": 9620
     },
-    "duration": 3735000,
-    "start": 1659643443220117000
+    "duration": 2463417,
+    "start": 1686684417449812549
   },
      {
        "name": "graphql.parse",
@@ -38,8 +38,8 @@
          "component": "graphql",
          "graphql.source": "{ patron { id name age } }"
        },
-       "duration": 229000,
-       "start": 1659643443221007000
+       "duration": 178833,
+       "start": 1686684417450290133
      },
      {
        "name": "graphql.validate",
@@ -54,8 +54,8 @@
          "component": "graphql",
          "graphql.source": "{ patron { id name age } }"
        },
-       "duration": 1316000,
-       "start": 1659643443221350000
+       "duration": 1565292,
+       "start": 1686684417450525049
      },
      {
        "name": "graphql.execute",
@@ -71,6 +71,9 @@
          "graphql.operation.type": "query",
          "graphql.source": "{ patron { id name age } }"
        },
-       "duration": 976000,
-       "start": 1659643443222816000
+       "metrics": {
+         "_dd.measured": 1
+       },
+       "duration": 116541,
+       "start": 1686684417452143508
      }]]

tests/snapshots/tests.contrib.graphene.test_graphene.test_schema_execute_with_resolvers.json

@@ -12,18 +12,18 @@
       "_dd.p.dm": "-0",
       "component": "graphql",
       "language": "python",
-      "runtime-id": "9203e2a344a64d8da2a34d37d8fe3900"
+      "runtime-id": "9cdfa74761ee41b8a9a989a2e4eab332"
     },
     "metrics": {
       "_dd.agent_psr": 1.0,
       "_dd.measured": 1,
       "_dd.top_level": 1,
       "_dd.tracer_kr": 1.0,
       "_sampling_priority_v1": 1,
-      "process_id": 80357
+      "process_id": 9620
     },
-    "duration": 2818000,
-    "start": 1659643443277058000
+    "duration": 2261625,
+    "start": 1686684417655955174
   },
      {
        "name": "graphql.parse",
@@ -38,8 +38,8 @@
          "component": "graphql",
          "graphql.source": "{ patron { id name age } }"
        },
-       "duration": 319000,
-       "start": 1659643443277207000
+       "duration": 150541,
+       "start": 1686684417656227008
      },
      {
        "name": "graphql.validate",
@@ -54,8 +54,8 @@
          "component": "graphql",
          "graphql.source": "{ patron { id name age } }"
        },
-       "duration": 1043000,
-       "start": 1659643443277626000
+       "duration": 1478042,
+       "start": 1686684417656418799
      },
      {
        "name": "graphql.execute",
@@ -71,8 +71,11 @@
          "graphql.operation.type": "query",
          "graphql.source": "{ patron { id name age } }"
        },
-       "duration": 1093000,
-       "start": 1659643443278749000
+       "metrics": {
+         "_dd.measured": 1
+       },
+       "duration": 245666,
+       "start": 1686684417657958133
      },
         {
           "name": "graphql.resolve",
@@ -86,8 +89,8 @@
           "meta": {
             "component": "graphql"
           },
-          "duration": 60000,
-          "start": 1659643443278923000
+          "duration": 17500,
+          "start": 1686684417658031299
         },
         {
           "name": "graphql.resolve",
@@ -101,8 +104,8 @@
           "meta": {
             "component": "graphql"
           },
-          "duration": 33000,
-          "start": 1659643443279216000
+          "duration": 13875,
+          "start": 1686684417658088133
         },
         {
           "name": "graphql.resolve",
@@ -116,8 +119,8 @@
           "meta": {
             "component": "graphql"
           },
-          "duration": 27000,
-          "start": 1659643443279338000
+          "duration": 11750,
+          "start": 1686684417658131341
         },
         {
           "name": "graphql.resolve",
@@ -131,6 +134,6 @@
           "meta": {
             "component": "graphql"
           },
-          "duration": 27000,
-          "start": 1659643443279449000
+          "duration": 11708,
+          "start": 1686684417658167841
         }]]

tests/snapshots/tests.contrib.graphene.test_graphene.test_schema_failing_execute.json

@@ -14,18 +14,18 @@
       "error.message": "exception was raised in a graphene query\n\nGraphQL request:3:7\n2 |     {\n3 |       patron {\n  |       ^\n4 |         id",
       "error.type": "graphql.error.graphql_error.GraphQLError",
       "language": "python",
-      "runtime-id": "c1db560b55aa4f1284fbe0e80eaad453"
+      "runtime-id": "9cdfa74761ee41b8a9a989a2e4eab332"
     },
     "metrics": {
       "_dd.agent_psr": 1.0,
       "_dd.measured": 1,
       "_dd.top_level": 1,
       "_dd.tracer_kr": 1.0,
       "_sampling_priority_v1": 1,
-      "process_id": 80691
+      "process_id": 9620
     },
-    "duration": 4849000,
-    "start": 1659643456601199000
+    "duration": 6447083,
+    "start": 1686684417701375966
   },
      {
        "name": "graphql.parse",
@@ -40,8 +40,8 @@
          "component": "graphql",
          "graphql.source": "{ patron { id name age } }"
        },
-       "duration": 321000,
-       "start": 1659643456601818000
+       "duration": 170417,
+       "start": 1686684417701833424
      },
      {
        "name": "graphql.validate",
@@ -56,8 +56,8 @@
          "component": "graphql",
          "graphql.source": "{ patron { id name age } }"
        },
-       "duration": 2488000,
-       "start": 1659643456602231000
+       "duration": 1409583,
+       "start": 1686684417702052716
      },
      {
        "name": "graphql.execute",
@@ -75,8 +75,11 @@
          "graphql.operation.type": "query",
          "graphql.source": "{ patron { id name age } }"
        },
-       "duration": 1104000,
-       "start": 1659643456604870000
+       "metrics": {
+         "_dd.measured": 1
+       },
+       "duration": 4237458,
+       "start": 1686684417703531216
      },
         {
           "name": "graphql.resolve",
@@ -90,9 +93,9 @@
           "meta": {
             "component": "graphql",
             "error.message": "exception was raised in a graphene query",
-            "error.stack": "Traceback (most recent call last):\n  File \"/Users/munir.abdinur/Documents/ApmPython/dd-trace-py/ddtrace/contrib/graphql/patch.py\", line 219, in _resolver_middleware\n    return next_middleware(root, info, **args)\n  File \"/Users/munir.abdinur/Documents/ApmPython/dd-trace-py/tests/contrib/graphene/test_graphene.py\", line 26, in resolve_patron\n    raise Exception(\"exception was raised in a graphene query\")\nException: exception was raised in a graphene query\n",
+            "error.stack": "Traceback (most recent call last):\n  File \"/root/project/ddtrace/contrib/graphql/patch.py\", line 236, in _resolver_middleware\n    return next_middleware(root, info, **args)\n  File \"/root/project/tests/contrib/graphene/test_graphene.py\", line 26, in resolve_patron\n    raise Exception(\"exception was raised in a graphene query\")\nException: exception was raised in a graphene query\n",
             "error.type": "builtins.Exception"
           },
-          "duration": 757000,
-          "start": 1659643456605007000
+          "duration": 3819708,
+          "start": 1686684417703705258
         }]]

tests/snapshots/tests.contrib.graphene.test_graphene.test_schema_failing_execute_v2.json

@@ -12,18 +12,18 @@
       "_dd.p.dm": "-0",
       "component": "graphql",
       "language": "python",
-      "runtime-id": "bc0efee142884beb96fdb35ca56aa3dc"
+      "runtime-id": "4fe099efe4794f50a7d4022ab0de907a"
     },
     "metrics": {
       "_dd.agent_psr": 1.0,
       "_dd.measured": 1,
       "_dd.top_level": 1,
       "_dd.tracer_kr": 1.0,
       "_sampling_priority_v1": 1,
-      "process_id": 76591
+      "process_id": 4098
     },
-    "duration": 2409000,
-    "start": 1658848788443487000
+    "duration": 1675416,
+    "start": 1686682179892854500
   },
      {
        "name": "graphql.parse",
@@ -38,8 +38,8 @@
          "component": "graphql",
          "graphql.source": "query HELLO { hello }"
        },
-       "duration": 147000,
-       "start": 1658848788444365000
+       "duration": 125167,
+       "start": 1686682179893382333
      },
      {
        "name": "graphql.validate",
@@ -54,8 +54,8 @@
          "component": "graphql",
          "graphql.source": "query HELLO { hello }"
        },
-       "duration": 674000,
-       "start": 1658848788444620000
+       "duration": 810041,
+       "start": 1686682179893565500
      },
      {
        "name": "graphql.execute",
@@ -72,6 +72,9 @@
          "graphql.operation.type": "query",
          "graphql.source": "query HELLO { hello }"
        },
-       "duration": 399000,
-       "start": 1658848788445460000
+       "metrics": {
+         "_dd.measured": 1
+       },
+       "duration": 87167,
+       "start": 1686682179894427916
      }]]