Merge branch 'main' into chris.agocs/patch_botocore_stepfunctions

Author: agocs

.gitlab/benchmarks.yml

@@ -69,6 +69,12 @@ benchmark-set-http-meta:
   variables:
     SCENARIO: "set_http_meta"
 
+benchmark-django-simple:
+  extends: .benchmarks
+  timeout: 1h 30m
+  variables:
+    SCENARIO: "django_simple"
+
 benchmark-flask-simple:
   extends: .benchmarks
   timeout: 1h 30m
@@ -94,3 +100,18 @@ appsec-iast-propagation:
   extends: .benchmarks
   variables:
     SCENARIO: "appsec_iast_propagation"
+
+benchmark-encoder:
+  extends: .benchmarks
+  variables:
+    SCENARIO: "encoder"
+
+benchmark-http-propagation-extract:
+  extends: .benchmarks
+  variables:
+    SCENARIO: "http_propagation_extract"
+
+benchmark-http-propagation-inject:
+  extends: .benchmarks
+  variables:
+    SCENARIO: "http_propagation_inject"

benchmarks/base/requirements.txt

@@ -4,3 +4,4 @@ pyperf
 pyyaml
 attrs
 httpretty==1.1.4
+tenacity==8.0.0

benchmarks/core_api/config.yaml

@@ -1,28 +1,75 @@
 core_dispatch_no_listeners:
   listeners: 0
+  all_listeners: 0
   set_item_count: 0
   get_item_exists: false
 core_dispatch_listeners:
   listeners: 10
+  all_listeners: 0
+  set_item_count: 0
+  get_item_exists: false
+core_dispatch_listeners_and_all_listeners:
+  listeners: 10
+  all_listeners: 10
+  set_item_count: 0
+  get_item_exists: false
+core_dispatch_only_all_listeners:
+  listeners: 0
+  all_listeners: 10
+  set_item_count: 0
+  get_item_exists: false
+core_dispatch_with_results_no_listeners:
+  listeners: 0
+  all_listeners: 0
+  set_item_count: 0
+  get_item_exists: false
+core_dispatch_with_results_listeners:
+  listeners: 10
+  all_listeners: 0
+  set_item_count: 0
+  get_item_exists: false
+core_dispatch_with_results_listeners_and_all_listeners:
+  listeners: 10
+  all_listeners: 10
+  set_item_count: 0
+  get_item_exists: false
+core_dispatch_with_results_only_all_listeners:
+  listeners: 0
+  all_listeners: 10
   set_item_count: 0
   get_item_exists: false
 context_with_data_no_listeners:
   listeners: 0
+  all_listeners: 0
   set_item_count: 0
   get_item_exists: false
 context_with_data_listeners:
   listeners: 10
+  all_listeners: 0
+  set_item_count: 0
+  get_item_exists: false
+context_with_data_listeners_and_all_listeners:
+  listeners: 10
+  all_listeners: 10
+  set_item_count: 0
+  get_item_exists: false
+context_with_data_only_all_listeners:
+  listeners: 10
+  all_listeners: 0
   set_item_count: 0
   get_item_exists: false
 set_item:
   listeners: 0
+  all_listeners: 0
   set_item_count: 100
   get_item_exists: false
 get_item_missing:
   listeners: 0
+  all_listeners: 0
   set_item_count: 0
   get_item_exists: false
 get_item_exists:
   listeners: 0
+  all_listeners: 0
   set_item_count: 0
   get_item_exists: true

benchmarks/core_api/scenario.py

@@ -3,24 +3,47 @@
 from ddtrace.internal import core
 
 
+if not hasattr(core, "dispatch_with_results"):
+    core.dispatch_with_results = core.dispatch
+
+
 class CoreAPIScenario(bm.Scenario):
     CUSTOM_EVENT_NAME = "CoreAPIScenario.event"
 
     listeners = bm.var(type=int, default=0)
+    all_listeners = bm.var(type=int, default=0)
     set_item_count = bm.var(type=int, default=100)
     get_item_exists = bm.var_bool(default=False)
 
     def run(self):
         # Activate a number of no-op listeners for known events
         for _ in range(self.listeners):
 
-            def listener(_):
+            def listener(*_):
                 pass
 
             core.on(self.CUSTOM_EVENT_NAME, listener)
             core.on("context.started.with_data", listener)
             core.on("context.ended.with_data", listener)
 
+        for _ in range(self.all_listeners):
+            if hasattr(core, "on_all"):
+
+                def all_listener(event_id, args):
+                    pass
+
+                core.on_all(all_listener)
+            else:
+
+                def listener(*_):
+                    pass
+
+                # If we don't support "core.on_all", just double up the registered listeners to try
+                # and make the comparison semi-equal
+                core.on(self.CUSTOM_EVENT_NAME, listener)
+                core.on("context.started.with_data", listener)
+                core.on("context.ended.with_data", listener)
+
         if self.get_item_exists:
             core.set_item("key", "value")
 
@@ -29,6 +52,11 @@ def core_dispatch(loops):
             for _ in range(loops):
                 core.dispatch(self.CUSTOM_EVENT_NAME, (5, 6, 7, 8))
 
+        def core_dispatch_with_results(loops):
+            """Measure the cost to dispatch an event on the hub"""
+            for _ in range(loops):
+                core.dispatch_with_results(self.CUSTOM_EVENT_NAME, (5, 6, 7, 8))
+
         def context_with_data(loops):
             """Measure the cost of creating and ending a new context"""
             for _ in range(loops):
@@ -48,7 +76,9 @@ def get_item(loops):
             for _ in range(loops):
                 core.get_item("key")
 
-        if "core_dispatch" in self.scenario_name:
+        if "core_dispatch_with_results" in self.scenario_name:
+            yield core_dispatch_with_results
+        elif "core_dispatch" in self.scenario_name:
             yield core_dispatch
         elif "context_with_data" in self.scenario_name:
             yield context_with_data

benchmarks/flask_simple/requirements_scenario.txt

@@ -1,4 +1,3 @@
 flask==3.0.0
 gunicorn==20.1.0
 requests==2.31.0
-tenacity==8.0.0

benchmarks/flask_sqli/requirements_scenario.txt

@@ -1,4 +1,3 @@
 flask==3.0.0
 gunicorn==20.1.0
 requests==2.31.0
-tenacity==8.0.0

benchmarks/sampling_rule_matches/scenario.py

@@ -38,10 +38,11 @@ def run(self):
         tag_names = [rands() for _ in range(self.num_tags)]
 
         # Generate all possible permutations of service and operation names
-        spans = [
-            Span(service=service, name=name, resource=resource, tags={tag: tag})
-            for service, name, resource, tag in itertools.product(services, operation_names, resource_names, tag_names)
-        ]
+        spans = []
+        for service, name, resource, tag in itertools.product(services, operation_names, resource_names, tag_names):
+            span = Span(service=service, name=name, resource=resource)
+            span.set_tag(tag, tag)
+            spans.append(span)
 
         # Create a single rule to use for all matches
         # Pick a random service/operation name

ddtrace/__init__.py

@@ -1,11 +1,9 @@
 import sys
 
-
 LOADED_MODULES = frozenset(sys.modules.keys())
 
 from ddtrace.internal.module import ModuleWatchdog
 
-
 ModuleWatchdog.install()
 
 # Acquire a reference to the threading module. Some parts of the library (e.g.
@@ -21,15 +19,17 @@
 # configure ddtrace logger before other modules log
 configure_ddtrace_logger()  # noqa: E402
 
-from ddtrace.internal import telemetry
+from .settings import _config as config
 
+if config._telemetry_enabled:
+    from ddtrace.internal import telemetry
 
-telemetry.install_excepthook()
-# In order to support 3.12, we start the writer upon initialization.
-# See https://github.com/python/cpython/pull/104826.
-# Telemetry events will only be sent after the `app-started` is queued.
-# This will occur when the agent writer starts.
-telemetry.telemetry_writer.enable()
+    telemetry.install_excepthook()
+    # In order to support 3.12, we start the writer upon initialization.
+    # See https://github.com/python/cpython/pull/104826.
+    # Telemetry events will only be sent after the `app-started` is queued.
+    # This will occur when the agent writer starts.
+    telemetry.telemetry_writer.enable()
 
 from ._monkey import patch  # noqa: E402
 from ._monkey import patch_all  # noqa: E402

ddtrace/contrib/asgi/middleware.py

@@ -194,7 +194,7 @@ async def __call__(self, scope, receive, send):
             if not self.integration_config.trace_query_string:
                 query_string = None
             body = None
-            parse_body_result = core.dispatch("asgi.request.parse.body", receive, headers)[0]
+            parse_body_result = core.dispatch_with_results("asgi.request.parse.body", (receive, headers))[0]
             if len(parse_body_result) == 1:
                 receive, body = await parse_body_result[0]
 
@@ -232,7 +232,7 @@ async def wrapped_send(message):
                     trace_utils.set_http_meta(
                         span, self.integration_config, status_code=status_code, response_headers=response_headers
                     )
-                    core.dispatch("asgi.start_response", "asgi")
+                    core.dispatch("asgi.start_response", ("asgi",))
 
                 if core.get_item(HTTP_REQUEST_BLOCKED):
                     raise trace_utils.InterruptException("wrapped_send")
@@ -252,7 +252,7 @@ async def wrapped_send(message):
                         span.finish()
 
             async def wrapped_blocked_send(message):
-                status, headers, content = core.dispatch("asgi.block.started", ctx, url)[0][0]
+                status, headers, content = core.dispatch_with_results("asgi.block.started", (ctx, url))[0][0]
                 if span and message.get("type") == "http.response.start":
                     message["headers"] = headers
                     message["status"] = int(status)
@@ -269,7 +269,7 @@ async def wrapped_blocked_send(message):
                         span.finish()
 
             try:
-                core.dispatch("asgi.start_request", "asgi")
+                core.dispatch("asgi.start_request", ("asgi",))
                 if core.get_item(HTTP_REQUEST_BLOCKED):
                     return await _blocked_asgi_app(scope, receive, wrapped_blocked_send)
                 return await self.app(scope, receive, wrapped_send)