diff --git a/Cargo.lock b/Cargo.lock index 0e3c0872a8c..50c7c00313f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2801,6 +2801,8 @@ dependencies = [ "thiserror 2.0.18", "tokio", "tower-service", + "webpki-root-certs", + "webpki-roots", "windows-sys 0.52.0", ] @@ -3304,6 +3306,7 @@ name = "libdd-tinybytes" version = "1.1.5" dependencies = [ "libdd-tinybytes", + "libdd-trace-model", "once_cell", "pretty_assertions", "proptest", @@ -3313,6 +3316,10 @@ dependencies = [ "test-case", ] +[[package]] +name = "libdd-trace-model" +version = "0.1.0" + [[package]] name = "libdd-trace-normalization" version = "4.2.0" @@ -3392,6 +3399,7 @@ dependencies = [ name = "libdd-trace-utils" version = "14.0.0" dependencies = [ + "allocator-api2", "anyhow", "base64 0.22.1", "bolero", @@ -3416,6 +3424,7 @@ dependencies = [ "libdd-capabilities-impl", "libdd-common", "libdd-tinybytes", + "libdd-trace-model", "libdd-trace-normalization", "libdd-trace-protobuf", "libdd-trace-utils", @@ -6557,18 +6566,18 @@ dependencies = [ [[package]] name = "webpki-root-certs" -version = "1.0.6" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804f18a4ac2676ffb4e8b5b5fa9ae38af06df08162314f96a68d2a363e21a8ca" +checksum = "58ec80e73fd8baf57bf0d9615554c75348bda990d6d5bbeab964dd068319fecb" dependencies = [ "rustls-pki-types", ] [[package]] name = "webpki-roots" -version = "1.0.6" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed" +checksum = "1c1c8e20c8a38fc7d65abfe74eb7280e4aa667e8eec8bc84996d2874810748d9" dependencies = [ "rustls-pki-types", ] diff --git a/Cargo.toml b/Cargo.toml index b789d59ef89..2338f25cf75 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -340,6 +340,8 @@ wait-timeout = { version = "0.2", default-features = false } walkdir = { version = "2.4", default-features = false } wasm-bindgen-futures = { version = "0.4", default-features = false } wasm-bindgen-test = { version = "=0.3.50", default-features = false } +webpki-roots = { version = "1.0.10", default-features = false } +webpki-root-certs = { version = "1.0.10", default-features = false } web-time = { version = "1", default-features = false } windows = { version = "0.59.0", default-features = false } windows-sys = { version = "0.52", default-features = false } diff --git a/components-rs/crashtracker.h b/components-rs/crashtracker.h index d7110398ea7..ddb891bb506 100644 --- a/components-rs/crashtracker.h +++ b/components-rs/crashtracker.h @@ -407,34 +407,6 @@ bool ddog_crasht_init_windows(ddog_CharSlice module, struct ddog_crasht_Metadata metadata); #endif -#if (defined(_CRASHTRACKING_COLLECTOR) && defined(_WIN32)) -HRESULT OutOfProcessExceptionEventSignatureCallback(const void *_context, - const WER_RUNTIME_EXCEPTION_INFORMATION *_exception_information, - int32_t _index, - uint16_t *_name, - uint32_t *_name_size, - uint16_t *_value, - uint32_t *_value_size); -#endif - -#if (defined(_CRASHTRACKING_COLLECTOR) && defined(_WIN32)) -HRESULT OutOfProcessExceptionEventDebuggerLaunchCallback(const void *_context, - const WER_RUNTIME_EXCEPTION_INFORMATION *_exception_information, - BOOL *_is_custom_debugger, - uint16_t *_debugger_launch, - uint32_t *_debugger_launch_size, - BOOL *_is_debugger_auto_launch); -#endif - -#if (defined(_CRASHTRACKING_COLLECTOR) && defined(_WIN32)) -HRESULT OutOfProcessExceptionEventCallback(const void *context, - const WER_RUNTIME_EXCEPTION_INFORMATION *exception_information, - BOOL *_ownership_claimed, - uint16_t *_event_name, - uint32_t *_size, - uint32_t *_signature_count); -#endif - /** * # Safety * The `crash_info` can be null, but if non-null it must point to a Builder made by this module, diff --git a/libdatadog b/libdatadog index 634af2c847b..096a3cc012c 160000 --- a/libdatadog +++ b/libdatadog @@ -1 +1 @@ -Subproject commit 634af2c847b1d0b7f6f89dff4f715a7828da93c4 +Subproject commit 096a3cc012cb895a23a6738e1df480c7201193e7 diff --git a/tests/FeatureFlags/ffe-system-test-data b/tests/FeatureFlags/ffe-system-test-data index 0c467473aa8..f6c8ad87053 160000 --- a/tests/FeatureFlags/ffe-system-test-data +++ b/tests/FeatureFlags/ffe-system-test-data @@ -1 +1 @@ -Subproject commit 0c467473aa8dc1f1cbfc0ef9a60d5c1c7a8826e6 +Subproject commit f6c8ad870531d041eaef42286899c93ad4d6e0e9 diff --git a/tests/ext/ffe/evaluation_metrics_native.phpt b/tests/ext/ffe/evaluation_metrics_native.phpt index c0d88766433..96d934da620 100644 --- a/tests/ext/ffe/evaluation_metrics_native.phpt +++ b/tests/ext/ffe/evaluation_metrics_native.phpt @@ -34,6 +34,7 @@ $config = <<<'JSON' }, "allocations": [{ "key": "alloc-string", + "doLog": true, "rules": [], "splits": [{"variationKey": "blue", "serialId": 7, "shards": []}] }] diff --git a/tests/ext/ffe/system_test_data_evaluate.phpt b/tests/ext/ffe/system_test_data_evaluate.phpt index 8292184d8f1..0e5e494d008 100644 --- a/tests/ext/ffe/system_test_data_evaluate.phpt +++ b/tests/ext/ffe/system_test_data_evaluate.phpt @@ -185,6 +185,19 @@ function run_fixture_case($client, $fileName, $index, array $case, array &$failu . ': value got=' . encode_value($details->getValue()) . ' want=' . encode_value($case['result']['value']); } + + if (isset($case['result']['reason']) && $details->getReason() !== $case['result']['reason']) { + $failures[] = $fileName . '#' . $index + . ': reason got=' . encode_value($details->getReason()) + . ' want=' . encode_value($case['result']['reason']); + } + + if (array_key_exists('errorCode', $case['result']) + && $details->getErrorCode() !== $case['result']['errorCode']) { + $failures[] = $fileName . '#' . $index + . ': errorCode got=' . encode_value($details->getErrorCode()) + . ' want=' . encode_value($case['result']['errorCode']); + } } function evaluate_fixture_case($client, $variationType, $flag, $defaultValue, array $context)