diff --git a/Cargo.lock b/Cargo.lock index 65572d0075..a71ed5f79f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -769,6 +769,7 @@ version = "0.0.1" dependencies = [ "anyhow", "arrayref", + "bincode", "bytes", "chrono", "console-subscriber", @@ -800,7 +801,6 @@ dependencies = [ "rmp-serde", "sendfd", "serde", - "serde_json", "spawn_worker", "sys-info", "tempfile", diff --git a/libdatadog b/libdatadog index ca32215210..dcdbe76848 160000 --- a/libdatadog +++ b/libdatadog @@ -1 +1 @@ -Subproject commit ca32215210c089883d7f3e8015dd91c240d35217 +Subproject commit dcdbe76848398e941605a1e51f599bf422a26663 diff --git a/tests/Integrations/Custom/Autoloaded/InstrumentationTest.php b/tests/Integrations/Custom/Autoloaded/InstrumentationTest.php index 8bf5e7c835..5929e2989a 100644 --- a/tests/Integrations/Custom/Autoloaded/InstrumentationTest.php +++ b/tests/Integrations/Custom/Autoloaded/InstrumentationTest.php @@ -82,16 +82,23 @@ public function testInstrumentation() [ "name" => "pdo", "enabled" => true, + 'version' => null, + 'compatible' => null, + 'auto_enabled' => null, ], [ "name" => "exec", "enabled" => false, - "version" => "" + "version" => "", + 'compatible' => null, + 'auto_enabled' => null, ], [ "name" => "logs", "enabled" => false, - "version" => "" + "version" => "", + 'compatible' => null, + 'auto_enabled' => null, ] ], $payloads[2]["payload"]["integrations"]); } diff --git a/tests/ext/telemetry/integration.phpt b/tests/ext/telemetry/integration.phpt index a890701309..06d37287c2 100644 --- a/tests/ext/telemetry/integration.phpt +++ b/tests/ext/telemetry/integration.phpt @@ -72,20 +72,30 @@ array(1) { ["integrations"]=> array(2) { [0]=> - array(2) { + array(5) { ["name"]=> string(37) "ddtrace\test\testsandboxedintegration" ["enabled"]=> bool(true) + ["version"]=> + NULL + ["compatible"]=> + NULL + ["auto_enabled"]=> + NULL } [1]=> - array(3) { + array(5) { ["name"]=> string(4) "logs" ["enabled"]=> bool(false) ["version"]=> string(0) "" + ["compatible"]=> + NULL + ["auto_enabled"]=> + NULL } } }