fix: supported-configurations.json have valid version/types/default

Author: genesor

metadata/supported-configurations.json

@@ -10,7 +10,7 @@
     ],
     "DD_API_KEY": [
       {
-        "implementation": "A",
+        "implementation": "C",
         "type": "string",
         "default": ""
       }
@@ -81,7 +81,7 @@
     "DD_DBM_PROPAGATION_MODE": [
       {
         "implementation": "A",
-        "type": "int",
+        "type": "string",
         "default": "disabled"
       }
     ],
@@ -171,21 +171,21 @@
     ],
     "DD_GIT_COMMIT_SHA": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "string",
         "default": ""
       }
     ],
     "DD_GIT_REPOSITORY_URL": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "string",
         "default": ""
       }
     ],
     "DD_HOSTNAME": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "string",
         "default": ""
       }
@@ -290,7 +290,7 @@
     ],
     "DD_SERVICE": [
       {
-        "implementation": "E",
+        "implementation": "F",
         "type": "string",
         "default": ""
       }
@@ -311,7 +311,7 @@
     ],
     "DD_SPAN_SAMPLING_RULES_FILE": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "string",
         "default": ""
       }
@@ -1315,7 +1315,7 @@
     ],
     "DD_TRACE_MEMCACHE_ANALYTICS_ENABLED": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "boolean",
         "default": "false",
         "aliases": [
@@ -1855,15 +1855,15 @@
     ],
     "DD_TRACE_SAMPLING_RULES": [
       {
-        "implementation": "A",
+        "implementation": "D",
         "type": "array",
         "default": "[]"
       }
     ],
     "DD_TRACE_SAMPLING_RULES_FORMAT": [
       {
         "implementation": "A",
-        "type": "int",
+        "type": "string",
         "default": "glob"
       }
     ],
@@ -2238,56 +2238,56 @@
     ],
     "OTEL_LOG_LEVEL": [
       {
-        "implementation": "C",
+        "implementation": "E",
         "type": "string",
         "default": ""
       }
     ],
     "OTEL_METRICS_EXPORTER": [
       {
-        "implementation": "B",
+        "implementation": "D",
         "type": "string",
         "default": ""
       }
     ],
     "OTEL_PROPAGATORS": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "string",
         "default": ""
       }
     ],
     "OTEL_RESOURCE_ATTRIBUTES": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "string",
         "default": ""
       }
     ],
     "OTEL_SERVICE_NAME": [
       {
-        "implementation": "B",
+        "implementation": "C",
         "type": "string",
         "default": ""
       }
     ],
     "OTEL_TRACES_EXPORTER": [
       {
-        "implementation": "C",
+        "implementation": "E",
         "type": "string",
         "default": ""
       }
     ],
     "OTEL_TRACES_SAMPLER": [
       {
-        "implementation": "C",
+        "implementation": "D",
         "type": "string",
         "default": ""
       }
     ],
     "OTEL_TRACES_SAMPLER_ARG": [
       {
-        "implementation": "C",
+        "implementation": "E",
         "type": "string",
         "default": ""
       }

tooling/generate-supported-configurations.sh

@@ -6,11 +6,24 @@ set -euo pipefail
 cd "$(dirname "$0")"
 
 # Maps C config type to JSON schema type.
-PHP_CODE=$(cat <<'ENDPHP'
+PHP_CODE_FILE=$(mktemp "${TMPDIR:-/tmp}/ddtrace-supported-configurations.XXXXXX.php")
+trap 'rm -f "$PHP_CODE_FILE"' EXIT
+
+cat >"$PHP_CODE_FILE" <<'ENDPHP'
+<?php
 function map_type($raw) {
     $raw = trim($raw);
     if (preg_match('/^CUSTOM\((.+)\)$/', $raw, $m)) {
-        $raw = trim($m[1]);
+        $inner = trim($m[1]);
+        // CUSTOM() types don't always map 1:1 to JSON schema types.
+        // In particular, CUSTOM(INT) values are exposed as strings at the config boundary.
+        if ($inner === 'INT') {
+            return 'string';
+        }
+        if ($inner === 'MAP') {
+            return 'map';
+        }
+        $raw = $inner;
     }
     $map = [
         'BOOL' => 'boolean', 'STRING' => 'string', 'INT' => 'int', 'DOUBLE' => 'decimal',
@@ -172,7 +185,6 @@ $json = preg_replace_callback('/^ +/m', function ($m) {
 file_put_contents($outputPath, $json . "\n");
 echo "Wrote supported configurations to $outputPath\n";
 ENDPHP
-)
 
 cat <<EOT >../ext/version.h
 #ifndef PHP_DDTRACE_VERSION
@@ -181,7 +193,7 @@ cat <<EOT >../ext/version.h
 EOT
 
 PHP_VERSION_ID=${PHP_VERSION_ID:-0}
-gcc $(php-config --includes) -I.. -I../ext -I../zend_abstract_interface -I../src/dogstatsd -I../components-rs -x c -E - <<CODE | grep -A9999 -m1 -F 'JSON_CONFIGURATION_MARKER' | tail -n+2 | php -r "$PHP_CODE"
+gcc $(php-config --includes) -I.. -I../ext -I../zend_abstract_interface -I../src/dogstatsd -I../components-rs -x c -E - <<CODE | grep -A9999 -m1 -F "JSON_CONFIGURATION_MARKER" | tail -n+2 | php "$PHP_CODE_FILE"
 #include "../ext/configuration.h"
 
 #undef PHP_VERSION_ID
@@ -196,8 +208,10 @@ gcc $(php-config --includes) -I.. -I../ext -I../zend_abstract_interface -I../src
 #define ALTCALIASES(...) ,##__VA_ARGS__
 #define EXPAND(x) x
 #define CUSTOM(id) id
-#define CONFIG(type, name, default_value, ...) CALIAS(type, name, default_value,)
-#define CALIAS(type, name, default_value, aliases, ...) #type, #name, default_value EXPAND(ALT##aliases) |NEXT_CONFIG|
+// Preserve the literal config type tokens (e.g. CUSTOM(INT)) so the generator can
+// map them to the correct JSON schema type.
+#define CONFIG(type, name, default_value, ...) CALIAS(#type, name, default_value,)
+#define CALIAS(type, name, default_value, aliases, ...) type, #name, default_value EXPAND(ALT##aliases) |NEXT_CONFIG|
 
 JSON_CONFIGURATION_MARKER
 DD_CONFIGURATION