From 99779339ec3d92e825fa4ff5265c03b631860258 Mon Sep 17 00:00:00 2001
From: Levi Morrison <levi.morrison@datadoghq.com>
Date: Mon, 8 Jun 2026 21:19:28 -0600
Subject: [PATCH] fix(crasht): metadata correctness

---
 ext/signals.c                        | 34 +++++++++++-----------------
 tests/ext/crashtracker_jit_tags.phpt |  2 +-
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/ext/signals.c b/ext/signals.c
index d709626cb62..7def8a44e8c 100644
--- a/ext/signals.c
+++ b/ext/signals.c
@@ -183,13 +183,24 @@ const ddog_CharSlice PHP_OPCACHE_ENABLE = DDOG_CHARSLICE_C("php.opcache.enable")
 // Fetches certain opcache tags and adds them with the pattern of php.opcache.*.
 static void dd_crasht_add_opcache_inis(ddog_Vec_Tag *tags) {
 #if PHP_VERSION_ID >= 80000
-    // We'll push php.opcache.enabled:0 whenever we detect we're disabled.
-
     bool loaded = zend_get_extension("Zend OPcache");
     if (UNEXPECTED(!loaded)) {
         goto opcache_disabled;
     }
 
+    // The CLI SAPI has an additional configuration for being enabled. This is
+    // INI_SYSTEM so we can check it here.
+    bool is_cli_sapi = strcmp("cli", sapi_module.name) == 0;
+    if (is_cli_sapi) {
+        ddog_CharSlice tag = DDOG_CHARSLICE_C("php.opcache.enable_cli");
+        zend_string *value = dd_crasht_find_ini_by_tag(tag);
+        if (EXPECTED(value)) {
+            bool is_enabled = zend_ini_parse_bool(value);
+            ddog_CharSlice val = is_enabled ? ONE : ZERO;
+            dd_crasht_push_tag(tags, tag, val);
+        }
+    }
+
     // opcache.jit_buffer_size is INI_SYSTEM, so we can check it now. If it's
     // zero, then JIT won't operate.
     {
@@ -209,25 +220,6 @@ static void dd_crasht_add_opcache_inis(ddog_Vec_Tag *tags) {
                 ? dd_zend_string_to_CharSlice(value)
                 : ZERO;
             dd_crasht_push_tag(tags, tag, val);
-            if (UNEXPECTED(!is_positive)) {
-                goto opcache_disabled;
-            }
-        }
-    }
-
-    // The CLI SAPI has an additional configuration for being enabled. This is
-    // INI_SYSTEM so we can check it here.
-    bool is_cli_sapi = strcmp("cli", sapi_module.name) == 0;
-    if (is_cli_sapi) {
-        ddog_CharSlice tag = DDOG_CHARSLICE_C("php.opcache.enable_cli");
-        zend_string *value = dd_crasht_find_ini_by_tag(tag);
-        if (EXPECTED(value)) {
-            bool is_enabled = zend_ini_parse_bool(value);
-            ddog_CharSlice val = is_enabled ? ONE : ZERO;
-            dd_crasht_push_tag(tags, tag, val);
-            if (UNEXPECTED(!is_enabled)) {
-                goto opcache_disabled;
-            }
         }
     }
 
diff --git a/tests/ext/crashtracker_jit_tags.phpt b/tests/ext/crashtracker_jit_tags.phpt
index 7c90b6576ed..d506404a550 100644
--- a/tests/ext/crashtracker_jit_tags.phpt
+++ b/tests/ext/crashtracker_jit_tags.phpt
@@ -74,8 +74,8 @@ $rr->waitForRequest(function ($request) {
             "library_version": "%s",
             "family": "php",
             "tags": [
-                "php.opcache.jit_buffer_size:32M",
                 "php.opcache.enable_cli:1",
+                "php.opcache.jit_buffer_size:32M",
                 "php.opcache.enable:1",
                 "php.opcache.jit:tracing",
 %A