Fix top Code Origin frame for ExecIntegration and KafkaIntegration (#3392)

bwoebi · web-flow · commit b9f0323fdc7e · 2025-08-27T19:17:27.000+02:00
* Fix top Code Origin frame for ExecIntegration and KafkaIntegration

Signed-off-by: Bob Weinand &lt;bob.weinand@datadoghq.com&gt;

* Fix double code origin

---------

Signed-off-by: Bob Weinand &lt;bob.weinand@datadoghq.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,7 @@ Changelog for older versions can be found in our [release page](https://github.c
 - Fix names of global git tags for debugger #3377
 - Fix SQLSRVIntegration resource handling #3379
 - Set DD_APPSEC_RASP_ENABLED default to true as on the tracer #3374
+- Fix top Code Origin frame for ExecIntegration and KafkaIntegration #3392
 
 ### Internal
 - Update baggage telemetry typo #3382
diff --git a/ext/code_origins.c b/ext/code_origins.c
@@ -17,6 +17,15 @@ void ddtrace_add_code_origin_information(ddtrace_span_data *span, int skip_frame
             if (skip_frames > 0) {
                 --skip_frames;
             } else {
+                if (current_frame == 0) {
+                    zval type, *kind = zend_hash_str_find_deref(meta, ZEND_STRL("span.kind"));
+                    ZVAL_STRING(&type, (kind && Z_TYPE_P(kind) == IS_STRING ? zend_string_equals_literal(Z_STR_P(kind), "server") || zend_string_equals_literal(Z_STR_P(kind), "producer") : &span->root->span == span) ? "entry" : "exit");
+                    if (!zend_hash_str_add(meta, ZEND_STRL("_dd.code_origin.type"), &type)) {
+                        zend_string_release(Z_STR(type));
+                        return; // skip if already present
+                    }
+                }
+
                 zval zv;
                 zend_string *key;
 
@@ -48,17 +57,6 @@ void ddtrace_add_code_origin_information(ddtrace_span_data *span, int skip_frame
         }
         execute_data = EX(prev_execute_data);
     }
-
-    // current_frame is typically 0 when a file is the entrypoint.
-    if (current_frame != 0) {
-        zval *kind = zend_hash_str_find_deref(meta, ZEND_STRL("span.kind"));
-
-        zval type;
-        ZVAL_STRING(&type, (kind && Z_TYPE_P(kind) == IS_STRING ? zend_string_equals_literal(Z_STR_P(kind), "server") || zend_string_equals_literal(Z_STR_P(kind), "producer") : &span->root->span == span) ? "entry" : "exit");
-        if (!zend_hash_str_add(meta, ZEND_STRL("_dd.code_origin.type"), &type)) {
-            zend_string_release(Z_STR(type));
-        }
-    }
 }
 
 void ddtrace_maybe_add_code_origin_information(ddtrace_span_data *span) {
diff --git a/loader/tests/functional/test_ddtrace_is_fully_loaded.php b/loader/tests/functional/test_ddtrace_is_fully_loaded.php
@@ -36,6 +36,9 @@
             [type] => system
             [meta] => Array
                 (
+                    [_dd.code_origin.frames.0.file] => %s/fixtures/ddtrace.php
+                    [_dd.code_origin.frames.0.line] => 1
+                    [_dd.code_origin.type] => exit
                     [cmd.exit_code] => 0
                     [cmd.shell] => echo using passthru
                     [component] => subprocess
diff --git a/src/DDTrace/Integrations/Exec/ExecIntegration.php b/src/DDTrace/Integrations/Exec/ExecIntegration.php
@@ -278,6 +278,7 @@ private static function createSpan(array $tags, string $resource)
         $span->meta = $tags;
         $span->type = Type::SYSTEM;
         $span->resource = $resource;
+        \DDTrace\collect_code_origins(2); // manually collect origin, otherwise the top frame will be this integration
         switch_stack();
 
         return $span;
diff --git a/src/DDTrace/Integrations/Kafka/KafkaIntegration.php b/src/DDTrace/Integrations/Kafka/KafkaIntegration.php
@@ -143,6 +143,7 @@ function (HookData $hook) use ($integration) {
 
                     $hook->data['span'] = $span;
                     $integration->setupKafkaConsumeSpan($hook, $this);
+                    \DDTrace\collect_code_origins(1);
                     \DDTrace\close_span();
                 }
             );
diff --git a/tests/snapshots/tests.integrations.cli.symfony.latest.common_scenarios_test.test_silenced_spans_are_dropped.json b/tests/snapshots/tests.integrations.cli.symfony.latest.common_scenarios_test.test_silenced_spans_are_dropped.json
@@ -26,6 +26,37 @@
        "parent_id": 1,
        "type": "system",
        "meta": {
+         "_dd.code_origin.frames.0.file": "{path}/tests/Frameworks/Symfony/Latest/vendor/symfony/console/Terminal.php",
+         "_dd.code_origin.frames.0.line": "199",
+         "_dd.code_origin.frames.0.method": "readFromProcess",
+         "_dd.code_origin.frames.0.type": "Symfony\\Component\\Console\\Terminal",
+         "_dd.code_origin.frames.1.file": "{path}/tests/Frameworks/Symfony/Latest/vendor/symfony/console/Terminal.php",
+         "_dd.code_origin.frames.1.line": "196",
+         "_dd.code_origin.frames.1.method": "getSttyColumns",
+         "_dd.code_origin.frames.1.type": "Symfony\\Component\\Console\\Terminal",
+         "_dd.code_origin.frames.2.file": "{path}/tests/Frameworks/Symfony/Latest/vendor/symfony/console/Terminal.php",
+         "_dd.code_origin.frames.2.line": "162",
+         "_dd.code_origin.frames.2.method": "initDimensionsUsingStty",
+         "_dd.code_origin.frames.2.type": "Symfony\\Component\\Console\\Terminal",
+         "_dd.code_origin.frames.3.file": "{path}/tests/Frameworks/Symfony/Latest/vendor/symfony/console/Terminal.php",
+         "_dd.code_origin.frames.3.line": "153",
+         "_dd.code_origin.frames.3.method": "initDimensions",
+         "_dd.code_origin.frames.3.type": "Symfony\\Component\\Console\\Terminal",
+         "_dd.code_origin.frames.4.file": "{path}/tests/Frameworks/Symfony/Latest/vendor/symfony/console/Terminal.php",
+         "_dd.code_origin.frames.4.line": "111",
+         "_dd.code_origin.frames.4.method": "getHeight",
+         "_dd.code_origin.frames.4.type": "Symfony\\Component\\Console\\Terminal",
+         "_dd.code_origin.frames.5.file": "{path}/tests/Frameworks/Symfony/Latest/vendor/symfony/console/Application.php",
+         "_dd.code_origin.frames.5.line": "166",
+         "_dd.code_origin.frames.5.method": "run",
+         "_dd.code_origin.frames.5.type": "Symfony\\Component\\Console\\Application",
+         "_dd.code_origin.frames.6.file": "{path}/tests/Frameworks/Symfony/Latest/vendor/symfony/runtime/Runner/Symfony/ConsoleApplicationRunner.php",
+         "_dd.code_origin.frames.6.line": "49",
+         "_dd.code_origin.frames.6.method": "run",
+         "_dd.code_origin.frames.6.type": "Symfony\\Component\\Runtime\\Runner\\Symfony\\ConsoleApplicationRunner",
+         "_dd.code_origin.frames.7.file": "{path}/tests/Frameworks/Symfony/Latest/vendor/autoload_runtime.php",
+         "_dd.code_origin.frames.7.line": "29",
+         "_dd.code_origin.type": "exit",
          "cmd.exec": "[\"stty\",\"-a\"]",
          "cmd.exit_code": "0",
          "component": "subprocess"
@@ -78,6 +109,35 @@
        "parent_id": 1,
        "type": "system",
        "meta": {
+         "_dd.code_origin.frames.0.file": "{path}/tests/Frameworks/Symfony/Latest/vendor/symfony/console/Application.php",
+         "_dd.code_origin.frames.0.line": "999",
+         "_dd.code_origin.frames.0.method": "doRunCommand",
+         "_dd.code_origin.frames.0.type": "Symfony\\Component\\Console\\Application",
+         "_dd.code_origin.frames.1.file": "{path}/tests/Frameworks/Symfony/Latest/vendor/symfony/framework-bundle/Console/Application.php",
+         "_dd.code_origin.frames.1.line": "123",
+         "_dd.code_origin.frames.1.method": "doRunCommand",
+         "_dd.code_origin.frames.1.type": "Symfony\\Bundle\\FrameworkBundle\\Console\\Application",
+         "_dd.code_origin.frames.2.file": "{path}/tests/Frameworks/Symfony/Latest/vendor/symfony/console/Application.php",
+         "_dd.code_origin.frames.2.line": "341",
+         "_dd.code_origin.frames.2.method": "doRun",
+         "_dd.code_origin.frames.2.type": "Symfony\\Component\\Console\\Application",
+         "_dd.code_origin.frames.3.file": "{path}/tests/Frameworks/Symfony/Latest/vendor/symfony/framework-bundle/Console/Application.php",
+         "_dd.code_origin.frames.3.line": "77",
+         "_dd.code_origin.frames.3.method": "doRun",
+         "_dd.code_origin.frames.3.type": "Symfony\\Bundle\\FrameworkBundle\\Console\\Application",
+         "_dd.code_origin.frames.4.file": "{path}/tests/Frameworks/Symfony/Latest/vendor/symfony/console/Application.php",
+         "_dd.code_origin.frames.4.line": "192",
+         "_dd.code_origin.frames.4.method": "run",
+         "_dd.code_origin.frames.4.type": "Symfony\\Component\\Console\\Application",
+         "_dd.code_origin.frames.5.file": "{path}/tests/Frameworks/Symfony/Latest/vendor/symfony/runtime/Runner/Symfony/ConsoleApplicationRunner.php",
+         "_dd.code_origin.frames.5.line": "49",
+         "_dd.code_origin.frames.5.method": "run",
+         "_dd.code_origin.frames.5.type": "Symfony\\Component\\Runtime\\Runner\\Symfony\\ConsoleApplicationRunner",
+         "_dd.code_origin.frames.6.file": "{path}/tests/Frameworks/Symfony/Latest/vendor/autoload_runtime.php",
+         "_dd.code_origin.frames.6.line": "29",
+         "_dd.code_origin.frames.7.file": "{path}/tests/Frameworks/Symfony/Latest/bin/console",
+         "_dd.code_origin.frames.7.line": "11",
+         "_dd.code_origin.type": "exit",
          "cmd.shell": "stty -g",
          "component": "subprocess"
        }
diff --git a/tests/snapshots/tests.integrations.cli.symfony.v4_4.common_scenarios_test.test_silenced_spans_are_dropped.json b/tests/snapshots/tests.integrations.cli.symfony.v4_4.common_scenarios_test.test_silenced_spans_are_dropped.json
@@ -26,6 +26,33 @@
        "parent_id": 1,
        "type": "system",
        "meta": {
+         "_dd.code_origin.frames.0.file": "{path}/tests/Frameworks/Symfony/Version_4_4/vendor/symfony/console/Terminal.php",
+         "_dd.code_origin.frames.0.line": "151",
+         "_dd.code_origin.frames.0.method": "readFromProcess",
+         "_dd.code_origin.frames.0.type": "Symfony\\Component\\Console\\Terminal",
+         "_dd.code_origin.frames.1.file": "{path}/tests/Frameworks/Symfony/Version_4_4/vendor/symfony/console/Terminal.php",
+         "_dd.code_origin.frames.1.line": "148",
+         "_dd.code_origin.frames.1.method": "getSttyColumns",
+         "_dd.code_origin.frames.1.type": "Symfony\\Component\\Console\\Terminal",
+         "_dd.code_origin.frames.2.file": "{path}/tests/Frameworks/Symfony/Version_4_4/vendor/symfony/console/Terminal.php",
+         "_dd.code_origin.frames.2.line": "114",
+         "_dd.code_origin.frames.2.method": "initDimensionsUsingStty",
+         "_dd.code_origin.frames.2.type": "Symfony\\Component\\Console\\Terminal",
+         "_dd.code_origin.frames.3.file": "{path}/tests/Frameworks/Symfony/Version_4_4/vendor/symfony/console/Terminal.php",
+         "_dd.code_origin.frames.3.line": "97",
+         "_dd.code_origin.frames.3.method": "initDimensions",
+         "_dd.code_origin.frames.3.type": "Symfony\\Component\\Console\\Terminal",
+         "_dd.code_origin.frames.4.file": "{path}/tests/Frameworks/Symfony/Version_4_4/vendor/symfony/console/Terminal.php",
+         "_dd.code_origin.frames.4.line": "52",
+         "_dd.code_origin.frames.4.method": "getHeight",
+         "_dd.code_origin.frames.4.type": "Symfony\\Component\\Console\\Terminal",
+         "_dd.code_origin.frames.5.file": "{path}/tests/Frameworks/Symfony/Version_4_4/vendor/symfony/console/Application.php",
+         "_dd.code_origin.frames.5.line": "118",
+         "_dd.code_origin.frames.5.method": "run",
+         "_dd.code_origin.frames.5.type": "Symfony\\Component\\Console\\Application",
+         "_dd.code_origin.frames.6.file": "{path}/tests/Frameworks/Symfony/Version_4_4/bin/console",
+         "_dd.code_origin.frames.6.line": "42",
+         "_dd.code_origin.type": "exit",
          "cmd.exit_code": "0",
          "cmd.shell": "stty -a | grep columns",
          "component": "subprocess"
diff --git a/tests/snapshots/tests.integrations.cli.symfony.v5_2.common_scenarios_test.test_silenced_spans_are_dropped.json b/tests/snapshots/tests.integrations.cli.symfony.v5_2.common_scenarios_test.test_silenced_spans_are_dropped.json
@@ -26,6 +26,33 @@
        "parent_id": 1,
        "type": "system",
        "meta": {
+         "_dd.code_origin.frames.0.file": "{path}/tests/Frameworks/Symfony/Version_5_2/vendor/symfony/console/Terminal.php",
+         "_dd.code_origin.frames.0.line": "151",
+         "_dd.code_origin.frames.0.method": "readFromProcess",
+         "_dd.code_origin.frames.0.type": "Symfony\\Component\\Console\\Terminal",
+         "_dd.code_origin.frames.1.file": "{path}/tests/Frameworks/Symfony/Version_5_2/vendor/symfony/console/Terminal.php",
+         "_dd.code_origin.frames.1.line": "148",
+         "_dd.code_origin.frames.1.method": "getSttyColumns",
+         "_dd.code_origin.frames.1.type": "Symfony\\Component\\Console\\Terminal",
+         "_dd.code_origin.frames.2.file": "{path}/tests/Frameworks/Symfony/Version_5_2/vendor/symfony/console/Terminal.php",
+         "_dd.code_origin.frames.2.line": "114",
+         "_dd.code_origin.frames.2.method": "initDimensionsUsingStty",
+         "_dd.code_origin.frames.2.type": "Symfony\\Component\\Console\\Terminal",
+         "_dd.code_origin.frames.3.file": "{path}/tests/Frameworks/Symfony/Version_5_2/vendor/symfony/console/Terminal.php",
+         "_dd.code_origin.frames.3.line": "97",
+         "_dd.code_origin.frames.3.method": "initDimensions",
+         "_dd.code_origin.frames.3.type": "Symfony\\Component\\Console\\Terminal",
+         "_dd.code_origin.frames.4.file": "{path}/tests/Frameworks/Symfony/Version_5_2/vendor/symfony/console/Terminal.php",
+         "_dd.code_origin.frames.4.line": "52",
+         "_dd.code_origin.frames.4.method": "getHeight",
+         "_dd.code_origin.frames.4.type": "Symfony\\Component\\Console\\Terminal",
+         "_dd.code_origin.frames.5.file": "{path}/tests/Frameworks/Symfony/Version_5_2/vendor/symfony/console/Application.php",
+         "_dd.code_origin.frames.5.line": "135",
+         "_dd.code_origin.frames.5.method": "run",
+         "_dd.code_origin.frames.5.type": "Symfony\\Component\\Console\\Application",
+         "_dd.code_origin.frames.6.file": "{path}/tests/Frameworks/Symfony/Version_5_2/bin/console",
+         "_dd.code_origin.frames.6.line": "43",
+         "_dd.code_origin.type": "exit",
          "cmd.exit_code": "0",
          "cmd.shell": "stty -a | grep columns",
          "component": "subprocess"
diff --git a/tests/snapshots/tests.integrations.cli.symfony.v6_2.common_scenarios_test.test_silenced_spans_are_dropped.json b/tests/snapshots/tests.integrations.cli.symfony.v6_2.common_scenarios_test.test_silenced_spans_are_dropped.json
@@ -26,6 +26,33 @@
        "parent_id": 1,
        "type": "system",
        "meta": {
+         "_dd.code_origin.frames.0.file": "{path}/tests/Frameworks/Symfony/Version_6_2/vendor/symfony/console/Terminal.php",
+         "_dd.code_origin.frames.0.line": "207",
+         "_dd.code_origin.frames.0.method": "readFromProcess",
+         "_dd.code_origin.frames.0.type": "Symfony\\Component\\Console\\Terminal",
+         "_dd.code_origin.frames.1.file": "{path}/tests/Frameworks/Symfony/Version_6_2/vendor/symfony/console/Terminal.php",
+         "_dd.code_origin.frames.1.line": "204",
+         "_dd.code_origin.frames.1.method": "getSttyColumns",
+         "_dd.code_origin.frames.1.type": "Symfony\\Component\\Console\\Terminal",
+         "_dd.code_origin.frames.2.file": "{path}/tests/Frameworks/Symfony/Version_6_2/vendor/symfony/console/Terminal.php",
+         "_dd.code_origin.frames.2.line": "170",
+         "_dd.code_origin.frames.2.method": "initDimensionsUsingStty",
+         "_dd.code_origin.frames.2.type": "Symfony\\Component\\Console\\Terminal",
+         "_dd.code_origin.frames.3.file": "{path}/tests/Frameworks/Symfony/Version_6_2/vendor/symfony/console/Terminal.php",
+         "_dd.code_origin.frames.3.line": "153",
+         "_dd.code_origin.frames.3.method": "initDimensions",
+         "_dd.code_origin.frames.3.type": "Symfony\\Component\\Console\\Terminal",
+         "_dd.code_origin.frames.4.file": "{path}/tests/Frameworks/Symfony/Version_6_2/vendor/symfony/console/Terminal.php",
+         "_dd.code_origin.frames.4.line": "111",
+         "_dd.code_origin.frames.4.method": "getHeight",
+         "_dd.code_origin.frames.4.type": "Symfony\\Component\\Console\\Terminal",
+         "_dd.code_origin.frames.5.file": "{path}/tests/Frameworks/Symfony/Version_6_2/vendor/symfony/console/Application.php",
+         "_dd.code_origin.frames.5.line": "142",
+         "_dd.code_origin.frames.5.method": "run",
+         "_dd.code_origin.frames.5.type": "Symfony\\Component\\Console\\Application",
+         "_dd.code_origin.frames.6.file": "{path}/tests/Frameworks/Symfony/Version_6_2/bin/console",
+         "_dd.code_origin.frames.6.line": "43",
+         "_dd.code_origin.type": "exit",
          "cmd.exec": "[\"stty\",\"-a\"]",
          "cmd.exit_code": "0",
          "component": "subprocess"
@@ -72,6 +99,29 @@
        "parent_id": 1,
        "type": "system",
        "meta": {
+         "_dd.code_origin.frames.0.file": "{path}/tests/Frameworks/Symfony/Version_6_2/vendor/symfony/console/Application.php",
+         "_dd.code_origin.frames.0.line": "972",
+         "_dd.code_origin.frames.0.method": "doRunCommand",
+         "_dd.code_origin.frames.0.type": "Symfony\\Component\\Console\\Application",
+         "_dd.code_origin.frames.1.file": "{path}/tests/Frameworks/Symfony/Version_6_2/vendor/symfony/framework-bundle/Console/Application.php",
+         "_dd.code_origin.frames.1.line": "88",
+         "_dd.code_origin.frames.1.method": "doRunCommand",
+         "_dd.code_origin.frames.1.type": "Symfony\\Bundle\\FrameworkBundle\\Console\\Application",
+         "_dd.code_origin.frames.2.file": "{path}/tests/Frameworks/Symfony/Version_6_2/vendor/symfony/console/Application.php",
+         "_dd.code_origin.frames.2.line": "314",
+         "_dd.code_origin.frames.2.method": "doRun",
+         "_dd.code_origin.frames.2.type": "Symfony\\Component\\Console\\Application",
+         "_dd.code_origin.frames.3.file": "{path}/tests/Frameworks/Symfony/Version_6_2/vendor/symfony/framework-bundle/Console/Application.php",
+         "_dd.code_origin.frames.3.line": "77",
+         "_dd.code_origin.frames.3.method": "doRun",
+         "_dd.code_origin.frames.3.type": "Symfony\\Bundle\\FrameworkBundle\\Console\\Application",
+         "_dd.code_origin.frames.4.file": "{path}/tests/Frameworks/Symfony/Version_6_2/vendor/symfony/console/Application.php",
+         "_dd.code_origin.frames.4.line": "168",
+         "_dd.code_origin.frames.4.method": "run",
+         "_dd.code_origin.frames.4.type": "Symfony\\Component\\Console\\Application",
+         "_dd.code_origin.frames.5.file": "{path}/tests/Frameworks/Symfony/Version_6_2/bin/console",
+         "_dd.code_origin.frames.5.line": "43",
+         "_dd.code_origin.type": "exit",
          "cmd.shell": "stty -g",
          "component": "subprocess"
        }

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ function (HookData $hook) use ($integration) {`
`143`	`143`
`144`	`144`	`$hook->data['span'] = $span;`
`145`	`145`	`$integration->setupKafkaConsumeSpan($hook, $this);`
	`146`	`+ \DDTrace\collect_code_origins(1);`
`146`	`147`	`\DDTrace\close_span();`
`147`	`148`	`}`
`148`	`149`	`);`