Merge branch 'main' into igor/rc/di-refactor-claude

Author: iunanua

.github/CODEOWNERS

@@ -66,6 +66,7 @@ README.md                            @DataDog/libdatadog
 repository.datadog.yml               @DataDog/apm-common-components-core
 rustfmt.toml                         @DataDog/libdatadog-core
 scripts/check_cargo_metadata.sh      @DataDog/libdatadog-core
+scripts/check_crypto_providers.sh    @DataDog/libdatadog-core
 scripts/commits-since-release.sh     @DataDog/libdatadog-core
 scripts/create-release.sh            @DataDog/apm-common-components-core
 scripts/crates-to-package.sh         @DataDog/libdatadog-core

.github/workflows/check-crypto-providers.yml

@@ -0,0 +1,27 @@
+name: 'Check crypto providers'
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+      - mq-working-branch-*
+env:
+  rust_version: "1.84.1"
+  CARGO_TERM_COLOR: always
+  CARGO_INCREMENTAL: 0
+jobs:
+  check-crypto-providers:
+    name: "ring + aws-lc-rs are not both pulled into any workspace crate"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
+      - name: Install ${{ env.rust_version }} toolchain
+        run: rustup set profile minimal && rustup install ${{ env.rust_version }} && rustup default ${{ env.rust_version }}
+      - name: Cache [rust]
+        uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # 2.8.1
+        with:
+          cache-targets: true # cache build artifacts
+          cache-bin: true # cache the ~/.cargo/bin directory
+      - name: Run crypto provider check
+        run: ./scripts/check_crypto_providers.sh

Cargo.lock

@@ -335,6 +335,7 @@ ref-cast,https://github.com/dtolnay/ref-cast,MIT OR Apache-2.0,David Tolnay <dto
 ref-cast-impl,https://github.com/dtolnay/ref-cast,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
 regex,https://github.com/rust-lang/regex,MIT OR Apache-2.0,"The Rust Project Developers, Andrew Gallant <jamslam@gmail.com>"
 regex-automata,https://github.com/rust-lang/regex/tree/master/regex-automata,MIT OR Apache-2.0,"The Rust Project Developers, Andrew Gallant <jamslam@gmail.com>"
+regex-lite,https://github.com/rust-lang/regex,MIT OR Apache-2.0,"The Rust Project Developers, Andrew Gallant <jamslam@gmail.com>"
 regex-syntax,https://github.com/rust-lang/regex/tree/master/regex-syntax,MIT OR Apache-2.0,"The Rust Project Developers, Andrew Gallant <jamslam@gmail.com>"
 reqwest,https://github.com/seanmonstar/reqwest,MIT OR Apache-2.0,Sean McArthur <sean@seanmonstar.com>
 resolv-conf,https://github.com/hickory-dns/resolv-conf,MIT OR Apache-2.0,The resolv-conf Authors

LICENSE-3rdparty.csv

@@ -25,11 +25,13 @@ errno = "0.3"
 nix = { version = "0.29", features = ["signal", "socket"] }
 hex = "0.4"
 os_info = "3.14.0"
-regex = "1.0"
 
 [dev-dependencies]
 serial_test = "3.2"
 
+[features]
+regex-lite = ["libdd-common/regex-lite"]
+
 [lib]
 bench = false
 

bin_tests/Cargo.toml

@@ -738,7 +738,7 @@ fn test_panic_hook_mode(mode: &str, expected_category: &str, expected_panic_mess
 
         // Check for location format (file:line:column) - always present in Debug builds
         // Location should end with pattern like " (path/file.rs:123:45)"
-        let location_regex = regex::Regex::new(r" \(.+?:\d+:\d+\)$").unwrap();
+        let location_regex = libdd_common::regex_engine::Regex::new(r" \(.+?:\d+:\d+\)$").unwrap();
         assert!(
             location_regex.is_match(message),
             "Expected panic message to end with location ' (file:line:column)', got: {}",

bin_tests/tests/crashtracker_bin_test.rs

@@ -29,6 +29,7 @@ library-config = []
 log = []
 ddsketch = []
 ffe = []
+regex-lite = ["libdd-common/regex-lite"]
 
 [lib]
 bench = false
@@ -44,7 +45,7 @@ tar = "0.4.45"
 tools = { path = "../tools" }
 toml = "0.8.19"
 serde = "1.0.209"
-regex = "1.10"
+libdd-common = { path = "../libdd-common", default-features = false }
 
 [[bin]]
 name = "release"

builder/Cargo.toml

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use anyhow::{anyhow, Result};
-use regex::Regex;
+use libdd_common::regex_engine::{Captures, Regex};
 use std::fs::{self, OpenOptions};
 use std::io::Write;
 use std::path::{Path, PathBuf};
@@ -37,7 +37,7 @@ pub(crate) fn adjust_extern_symbols(
     let re = Regex::new(r#"(?m)^(\s*)extern\s+(.+;)$"#).unwrap();
 
     // Replace function using captures
-    let new_content = re.replace_all(&content, |caps: &regex::Captures| {
+    let new_content = re.replace_all(&content, |caps: &Captures| {
         let full_match = caps.get(0).unwrap().as_str();
         let indent = &caps[1];
         let declaration = &caps[2];

builder/src/utils.rs

@@ -19,7 +19,7 @@ chrono = { version = "0.4.38", default-features = false, features = ["now", "ser
 derive_more = { version = "2.0.0", default-features = false, features = ["from", "into"] }
 log = { version = "0.4.21", default-features = false, features = ["kv", "kv_serde"] }
 md5 = { version = "0.7.0", default-features = false }
-regex = "1.10.4"
+libdd-common = { version = "4.0.0", path = "../libdd-common", default-features = false, features = ["require-regex-full"] }
 semver = "1.0"
 serde-bool = { version = "0.1.3", default-features = false }
 serde_with = { version = "3.11.0", default-features = false, features = ["base64", "hex", "macros"] }

datadog-ffe/Cargo.toml

@@ -3,7 +3,7 @@
 
 use std::{collections::HashMap, sync::Arc};
 
-use regex::Regex;
+use libdd_common::regex_engine::Regex;
 use serde::{Deserialize, Serialize};
 
 use crate::rules_based::{EvaluationError, FlagType, Str, Timestamp};