Implemented span compression algorithm

See elastic/apm#432
beniwohli · Sep 9, 2021 · aad1525 · aad1525
1 parent 6739158
commit aad1525
Show file tree

Hide file tree

Showing 10 changed files with 383 additions and 67 deletions.
diff --git a/elasticapm/conf/__init__.py b/elasticapm/conf/__init__.py
@@ -579,6 +579,18 @@ class Config(_ConfigBase):
         ],
         type=int,
     )
+    span_compression_exact_match_max_duration = _ConfigValue(
+        "span_compression_exact_match_max_duration",
+        default=5,
+        validators=[duration_validator],
+        type=int,
+    )
+    span_compression_same_kind_max_duration = _ConfigValue(
+        "span_compression_exact_match_max_duration",
+        default=5,
+        validators=[duration_validator],
+        type=int,
+    )
     collect_local_variables = _ConfigValue("COLLECT_LOCAL_VARIABLES", default="errors")
     source_lines_error_app_frames = _ConfigValue("SOURCE_LINES_ERROR_APP_FRAMES", type=int, default=5)
     source_lines_error_library_frames = _ConfigValue("SOURCE_LINES_ERROR_LIBRARY_FRAMES", type=int, default=5)

diff --git a/elasticapm/instrumentation/packages/dbapi2.py b/elasticapm/instrumentation/packages/dbapi2.py
@@ -237,6 +237,7 @@ def _trace_sql(self, method, sql, params, action=QUERY_ACTION):
             span_action=action,
             extra={"db": {"type": "sql", "statement": sql_string}, "destination": self._self_destination_info},
             skip_frames=1,
+            leaf=True,
         ) as span:
             if params is None:
                 result = method(sql)

diff --git a/elasticapm/instrumentation/packages/httpcore.py b/elasticapm/instrumentation/packages/httpcore.py
@@ -96,6 +96,8 @@ def call(self, module, method, wrapped, instance, args, kwargs):
                     span_id=parent_id, trace_options=TracingOptions(recorded=True)
                 )
                 self._set_disttracing_headers(headers, trace_parent, transaction)
+                if leaf_span:
+                    leaf_span.dist_tracing_propagated = True
             response = wrapped(*args, **kwargs)
             if len(response) > 4:
                 # httpcore < 0.11.0

diff --git a/elasticapm/instrumentation/packages/httplib2.py b/elasticapm/instrumentation/packages/httplib2.py
@@ -93,6 +93,8 @@ def call(self, module, method, wrapped, instance, args, kwargs):
                 span_id=parent_id, trace_options=TracingOptions(recorded=True)
             )
             self._set_disttracing_headers(params["headers"], trace_parent, transaction)
+            if leaf_span:
+                leaf_span.dist_tracing_propagated = True
 
             response, content = wrapped(*args, **kwargs)
             if span.context:

diff --git a/elasticapm/instrumentation/packages/urllib.py b/elasticapm/instrumentation/packages/urllib.py
@@ -96,6 +96,8 @@ def call(self, module, method, wrapped, instance, args, kwargs):
                 span_id=parent_id, trace_options=TracingOptions(recorded=True)
             )
             self._set_disttracing_headers(request_object, trace_parent, transaction)
+            if leaf_span:
+                leaf_span.dist_tracing_propagated = True
             response = wrapped(*args, **kwargs)
             if response:
                 status = getattr(response, "status", None) or response.getcode()  # Python 2 compat

diff --git a/elasticapm/instrumentation/packages/urllib3.py b/elasticapm/instrumentation/packages/urllib3.py
@@ -127,6 +127,8 @@ def call(self, module, method, wrapped, instance, args, kwargs):
                 span_id=parent_id, trace_options=TracingOptions(recorded=True)
             )
             args, kwargs = update_headers(args, kwargs, instance, transaction, trace_parent)
+            if leaf_span:
+                leaf_span.dist_tracing_propagated = True
             response = wrapped(*args, **kwargs)
             if response:
                 if span.context: