Merge branch 'yunkim/add-py-312' into munir/fix-telemetry-2.x

Author: majorgreys

.riot/requirements/16b0e2d.txt

@@ -15,7 +15,6 @@ mock==5.1.0
 opentracing==2.4.0
 packaging==23.1
 pluggy==1.3.0
-protobuf==4.23.4
 py-cpuinfo==8.0.0
 pytest==7.4.0
 pytest-asyncio==0.21.1

.riot/requirements/4ec2419.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --config=pyproject.toml --no-annotate .riot/requirements/fc4505d.in
+#    pip-compile --no-annotate .riot/requirements/4ec2419.in
 #
 attrs==23.1.0
 coverage[toml]==7.2.7

.riot/requirements/e70d73c.txt

@@ -2,23 +2,23 @@
 # This file is autogenerated by pip-compile with Python 3.7
 # by the following command:
 #
-#    pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/e70d73c.in
+#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/e70d73c.in
 #
 attrs==23.1.0
-coverage[toml]==7.2.7
-exceptiongroup==1.1.3
+coverage[toml]==7.2.5
+exceptiongroup==1.1.1
 hypothesis==6.45.0
-importlib-metadata==6.7.0
+importlib-metadata==6.6.0
 iniconfig==2.0.0
-mock==5.1.0
+mock==5.0.2
 opentracing==2.4.0
 packaging==23.1
-pluggy==1.2.0
-pytest==7.4.1
-pytest-asyncio==0.21.1
-pytest-cov==4.1.0
-pytest-mock==3.11.1
+pluggy==1.0.0
+pytest==7.3.1
+pytest-asyncio==0.21.0
+pytest-cov==4.0.0
+pytest-mock==3.10.0
 sortedcontainers==2.4.0
 tomli==2.0.1
-typing-extensions==4.7.1
+typing-extensions==4.5.0
 zipp==3.15.0

benchmarks/appsec_iast_propagation/scenario.py

@@ -2,12 +2,12 @@
 
 import bm
 
+from ddtrace.appsec.iast._taint_tracking import OriginType
+from ddtrace.appsec.iast._taint_tracking import Source
+from ddtrace.appsec.iast._taint_tracking import TaintRange
 from ddtrace.appsec.iast._taint_tracking import contexts_reset
 from ddtrace.appsec.iast._taint_tracking import create_context
-from ddtrace.appsec.iast._taint_tracking._native.taint_tracking import OriginType
-from ddtrace.appsec.iast._taint_tracking._native.taint_tracking import Source
-from ddtrace.appsec.iast._taint_tracking._native.taint_tracking import TaintRange
-from ddtrace.appsec.iast._taint_tracking._native.taint_tracking import set_ranges
+from ddtrace.appsec.iast._taint_tracking import set_ranges
 from ddtrace.appsec.iast._taint_tracking.aspects import add_aspect
 from ddtrace.appsec.iast._taint_tracking.aspects import join_aspect
 

benchmarks/sampling_rule_matches/config.yaml

@@ -3,21 +3,25 @@ high_match:
   num_iterations: 100
   num_services: 1
   num_operations: 1
+  num_resources: 1
 
 # Low number of variations, hit rate of about 25%
 average_match:
   num_iterations: 100
   num_services: 2
   num_operations: 2
+  num_resources: 2
 
 # High number of variations, hit rate of 0% or 1%
 low_match:
   num_iterations: 100
   num_services: 25
   num_operations: 25
+  num_resources: 25
 
 # This variation has performance issues due to the cache max size
 very_low_match:
   num_iterations: 1000
   num_services: 250
   num_operations: 100
+  num_resources: 100

benchmarks/sampling_rule_matches/scenario.py

@@ -27,20 +27,26 @@ class SamplingRules(bm.Scenario):
     num_iterations = bm.var(type=int)
     num_services = bm.var(type=int)
     num_operations = bm.var(type=int)
+    num_resources = bm.var(type=int)
 
     def run(self):
         # Generate random service and operation names for the counts we requested
         services = [rands() for _ in range(self.num_services)]
         operation_names = [rands() for _ in range(self.num_operations)]
+        resource_names = [rands() for _ in range(self.num_resources)]
 
         # Generate all possible permutations of service and operation names
-        spans = [Span(service=service, name=name) for service, name in itertools.product(services, operation_names)]
+        spans = [
+            Span(service=service, name=name, resource=resource)
+            for service, name, resource in itertools.product(services, operation_names, resource_names)
+        ]
 
         # Create a single rule to use for all matches
         # Pick a random service/operation name
         rule = SamplingRule(
             service=random.choice(services),
             name=random.choice(operation_names),
+            resource=random.choice(resource_names),
             sample_rate=1.0,
         )
 

ddtrace/__init__.py

@@ -46,6 +46,15 @@
 # a global tracer instance with integration settings
 tracer = Tracer()
 
+
+# The telemetry writer is not started until data is queued but this creates a
+# problem for CPython 3.12 which disallows thread creation at interpreter
+# finalization. In order to support 3.12, we start the writer upon initialization.
+# See https://github.com/python/cpython/pull/104826.
+if sys.version_info >= (3, 12):
+    telemetry.telemetry_writer.enable()
+
+
 __all__ = [
     "patch",
     "patch_all",

ddtrace/appsec/_api_security/api_manager.py

@@ -37,6 +37,7 @@ class TooLargeSchemaException(Exception):
 class APIManager(Service):
     COLLECTED = [
         ("REQUEST_HEADERS_NO_COOKIES", API_SECURITY.REQUEST_HEADERS_NO_COOKIES, dict),
+        ("REQUEST_COOKIES", API_SECURITY.REQUEST_COOKIES, dict),
         ("REQUEST_QUERY", API_SECURITY.REQUEST_QUERY, dict),
         ("REQUEST_PATH_PARAMS", API_SECURITY.REQUEST_PATH_PARAMS, dict),
         ("REQUEST_BODY", API_SECURITY.REQUEST_BODY, None),

ddtrace/appsec/_api_security/preprocessors.json renamed to ddtrace/appsec/_api_security/processors.json

@@ -28,7 +28,7 @@
       ]
     }
   ],
-  "preprocessors": [
+  "processors": [
     {
       "id": "preprocessor-001",
       "generator": "extract_schema",
@@ -67,6 +67,14 @@
             ],
             "output": "_dd.appsec.s.req.headers"
           },
+          {
+            "inputs": [
+              {
+                "address": "server.request.cookies"
+              }
+            ],
+            "output": "_dd.appsec.s.req.cookies"
+          },
           {
             "inputs": [
               {

ddtrace/appsec/_asm_request_context.py

@@ -125,11 +125,13 @@ def __init__(self):
     def finalise(self):
         if self.active:
             env = self.execution_context.get_item("asm_env")
-            # assert _CONTEXT_ID.get() == self._id
-            callbacks = GLOBAL_CALLBACKS.get(_CONTEXT_CALL, []) + env.callbacks.get(_CONTEXT_CALL)
-            if callbacks is not None:
-                for function in callbacks:
-                    function(env)
+            callbacks = GLOBAL_CALLBACKS.get(_CONTEXT_CALL, [])
+            if env is not None and env.callbacks is not None and env.callbacks.get(_CONTEXT_CALL):
+                callbacks += env.callbacks.get(_CONTEXT_CALL)
+            if callbacks:
+                if env is not None:
+                    for function in callbacks:
+                        function(env)
                 self.execution_context.end()
             self.active = False