Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions LICENSE-3rdparty.yml

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions datadog-live-debugger/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ http-body-util = "0.1"
bytes = "1.11.1"

regex = "1.9.3"
regex-lite = "0.1"
percent-encoding = "2.1"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion datadog-live-debugger/src/redacted_names.rs
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ pub unsafe fn add_redacted_type<I: AsRef<[u8]>>(name: I) {
regex_str.push('|')
}
let name = String::from_utf8_lossy(name);
regex_str.push_str(regex::escape(&name[..name.len() - 1]).as_str());
regex_str.push_str(regex_lite::escape(&name[..name.len() - 1]).as_str());
regex_str.push_str(".*");
} else {
let added_types = &mut (*(&*ADDED_REDACTED_TYPES as *const Vec<Vec<u8>>).cast_mut());
Expand Down
2 changes: 1 addition & 1 deletion datadog-remote-config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ tracing = { version = "0.1", default-features = false, optional = true }
serde = "1.0"
serde_json = { version = "1.0", features = ["raw_value"] }
serde_with = "3"
regex = "1.0"

# Test feature
hyper-util = { workspace = true, features = ["service"], optional = true }
regex-lite = "0.1.9"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very minor: I don't think that will change anything to version resolution, but some version constraints are "0.1" and others "0.1.9"; maybe we should only use one?


[dev-dependencies]
futures = "0.3"
Expand Down
2 changes: 1 addition & 1 deletion datadog-remote-config/src/config/agent_task.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use serde::Deserialize;
#[cfg(feature = "test")]
use serde::Serialize;

use regex::Regex;
use regex_lite::Regex;
use serde::de::{self, Deserializer};

fn deserialize_case_id<'de, D>(deserializer: D) -> Result<String, D::Error>
Expand Down
2 changes: 1 addition & 1 deletion libdd-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ multer = { version = "3.1", optional = true }
bytes = { version = "1.11.1" }
pin-project = "1"
rand = { version = "0.8", optional = true }
regex = "1.5"
# Use hickory-dns instead of the default system DNS resolver to avoid fork safety issues.
# The default resolver can hold locks or other global state that can cause deadlocks
# or corruption when the process forks (e.g., in PHP-FPM or other forking environments).
Expand All @@ -48,6 +47,7 @@ static_assertions = "1.1.0"
libc = "0.2"
const_format = "0.2.34"
nix = { version = "0.29", features = ["process"] }
regex-lite = "0.1.9"
[target.'cfg(windows)'.dependencies.windows-sys]
version = "0.52"
features = [
Expand Down
2 changes: 1 addition & 1 deletion libdd-common/src/azure_app_services.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2021-Present Datadog, Inc. https://www.datadoghq.com/
// SPDX-License-Identifier: Apache-2.0

use regex::Regex;
use regex_lite::Regex;
use std::env;
use std::sync::LazyLock;

Expand Down
2 changes: 1 addition & 1 deletion libdd-common/src/entity_id/unix/container_id.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

//! This module provides functions to parse the container id from the cgroup file
use super::CgroupFileParsingError;
use regex::Regex;
use regex_lite::Regex;
use std::fs::File;
use std::io::{BufRead, BufReader};
use std::path::Path;
Expand Down
2 changes: 1 addition & 1 deletion libdd-common/src/entity_id/unix/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ pub static ENTITY_ID: LazyLock<Option<&'static str>> = LazyLock::new(|| {
#[cfg(test)]
mod tests {
use super::*;
use regex::Regex;
use regex_lite::Regex;

static IN_REGEX: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"in-\d+").unwrap());
static CI_REGEX: LazyLock<Regex> = LazyLock::new(|| {
Expand Down
1 change: 1 addition & 0 deletions libdd-trace-obfuscation/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ log = "0.4"
libdd-trace-protobuf = { version = "1.1.0", path = "../libdd-trace-protobuf" }
libdd-trace-utils = { version = "2.0.0", path = "../libdd-trace-utils" }
libdd-common = { version = "2.0.0", path = "../libdd-common" }
regex-lite = "0.1.9"

[dev-dependencies]
duplicate = "0.4.1"
Expand Down
2 changes: 1 addition & 1 deletion libdd-trace-obfuscation/src/ip_address.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2024-Present Datadog, Inc. https://www.datadoghq.com/
// SPDX-License-Identifier: Apache-2.0

use regex::Regex;
use regex_lite::Regex;
use std::{borrow::Cow, collections::HashSet, net::Ipv6Addr, sync::LazyLock};

const ALLOWED_IP_ADDRESSES: [&str; 5] = [
Expand Down
2 changes: 1 addition & 1 deletion tools/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cargo_metadata = "0.18"
clap = { version = "4.0", features = ["derive"] }
colored = "2"
quick-xml = "0.37"
regex = "1"
regex-lite = "0.1"
toml = "0.8"
wait-timeout = "0.2"

Expand Down
2 changes: 1 addition & 1 deletion tools/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
pub mod junit_file_attributes;

pub mod headers {
use regex::{Regex, RegexBuilder};
use regex_lite::{Regex, RegexBuilder};
use std::collections::HashSet;
use std::fs::{File, OpenOptions};
use std::io::{self, BufReader, BufWriter, Read, Seek, Write};
Expand Down
Loading