Skip to content

Commit ec966d8

Browse files
committed
update libdatadog rev and fix licenses
1 parent 75b6c94 commit ec966d8

6 files changed

Lines changed: 38 additions & 27 deletions

File tree

Cargo.lock

Lines changed: 13 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

LICENSE-3rdparty.csv

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@ camino,https://github.com/camino-rs/camino,MIT OR Apache-2.0,"Without Boats <sao
3030
cargo-platform,https://github.com/rust-lang/cargo,MIT OR Apache-2.0,The cargo-platform Authors
3131
cargo_metadata,https://github.com/oli-obk/cargo_metadata,MIT,Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>
3232
cc,https://github.com/rust-lang/cc-rs,MIT OR Apache-2.0,Alex Crichton <alex@alexcrichton.com>
33+
cesu8,https://github.com/emk/cesu8-rs,Apache-2.0 OR MIT,Eric Kidd <git@randomhacks.net>
3334
cexpr,https://github.com/jethrogb/rust-cexpr,Apache-2.0 OR MIT,Jethro Beekman <jethro@jbeekman.nl>
3435
cfg-if,https://github.com/rust-lang/cfg-if,MIT OR Apache-2.0,Alex Crichton <alex@alexcrichton.com>
3536
clang-sys,https://github.com/KyleMayes/clang-sys,Apache-2.0,Kyle Mayes <kyle@mayeses.com>
37+
combine,https://github.com/Marwes/combine,MIT,Markus Westerlind <marwes91@gmail.com>
3638
concurrent-queue,https://github.com/smol-rs/concurrent-queue,Apache-2.0 OR MIT,"Stjepan Glavina <stjepang@gmail.com>, Taiki Endo <te316e89@gmail.com>, John Nunley <dev@notgull.net>"
3739
const_format,https://github.com/rodrimati1992/const_format_crates,Zlib,rodrimati1992 <rodrimatt1985@gmail.com>
3840
const_format_proc_macros,https://github.com/rodrimati1992/const_format_crates,Zlib,rodrimati1992 <rodrimatt1985@gmail.com>
@@ -112,6 +114,10 @@ ipnet,https://github.com/krisprice/ipnet,MIT OR Apache-2.0,Kris Price <kris@kris
112114
iri-string,https://github.com/lo48576/iri-string,MIT OR Apache-2.0,YOSHIOKA Takuma <nop_thread@nops.red>
113115
itertools,https://github.com/rust-itertools/itertools,MIT OR Apache-2.0,bluss
114116
itoa,https://github.com/dtolnay/itoa,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
117+
jni,https://github.com/jni-rs/jni-rs,MIT OR Apache-2.0,Josh Chase <josh@prevoty.com>
118+
jni-sys,https://github.com/jni-rs/jni-sys,MIT OR Apache-2.0,Steven Fackler <sfackler@gmail.com>
119+
jni-sys,https://github.com/jni-rs/jni-sys,MIT OR Apache-2.0,"Steven Fackler <sfackler@gmail.com>, Robert Bragg <robert@sixbynine.org>"
120+
jni-sys-macros,https://github.com/jni-rs/jni-sys,MIT OR Apache-2.0,Robert Bragg <robert@sixbynine.org>
115121
jobserver,https://github.com/rust-lang/jobserver-rs,MIT OR Apache-2.0,Alex Crichton <alex@alexcrichton.com>
116122
js-sys,https://github.com/wasm-bindgen/wasm-bindgen/tree/master/crates/js-sys,MIT OR Apache-2.0,The wasm-bindgen Developers
117123
lazy_static,https://github.com/rust-lang-nursery/lazy-static.rs,MIT OR Apache-2.0,Marvin Löbel <loebel.marvin@gmail.com>
@@ -209,10 +215,13 @@ rustix,https://github.com/bytecodealliance/rustix,Apache-2.0 WITH LLVM-exception
209215
rustls,https://github.com/rustls/rustls,Apache-2.0 OR ISC OR MIT,The rustls Authors
210216
rustls-native-certs,https://github.com/rustls/rustls-native-certs,Apache-2.0 OR ISC OR MIT,The rustls-native-certs Authors
211217
rustls-pki-types,https://github.com/rustls/pki-types,MIT OR Apache-2.0,The rustls-pki-types Authors
218+
rustls-platform-verifier,https://github.com/rustls/rustls-platform-verifier,MIT OR Apache-2.0,The rustls-platform-verifier Authors
219+
rustls-platform-verifier-android,https://github.com/rustls/rustls-platform-verifier,MIT OR Apache-2.0,The rustls-platform-verifier-android Authors
212220
rustls-webpki,https://github.com/rustls/webpki,ISC,The rustls-webpki Authors
213221
rustversion,https://github.com/dtolnay/rustversion,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
214222
rusty-fork,https://github.com/altsysrq/rusty-fork,MIT OR Apache-2.0,Jason Lingle
215223
ryu,https://github.com/dtolnay/ryu,Apache-2.0 OR BSL-1.0,David Tolnay <dtolnay@gmail.com>
224+
same-file,https://github.com/BurntSushi/same-file,Unlicense OR MIT,Andrew Gallant <jamslam@gmail.com>
216225
schannel,https://github.com/steffengy/schannel-rs,MIT,"Steven Fackler <sfackler@gmail.com>, Steffen Butzer <steffen.butzer@outlook.com>"
217226
scopeguard,https://github.com/bluss/scopeguard,MIT OR Apache-2.0,bluss
218227
security-framework,https://github.com/kornelski/rust-security-framework,MIT OR Apache-2.0,"Steven Fackler <sfackler@gmail.com>, Kornel <kornel@geekhood.net>"
@@ -249,6 +258,7 @@ synstructure,https://github.com/mystor/synstructure,MIT,Nika Layzell <nika@thela
249258
sys-info,https://github.com/FillZpp/sys-info-rs,MIT,Siyu Wang <FillZpp.pub@gmail.com>
250259
tabwriter,https://github.com/BurntSushi/tabwriter,Unlicense OR MIT,Andrew Gallant <jamslam@gmail.com>
251260
tempfile,https://github.com/Stebalien/tempfile,MIT OR Apache-2.0,"Steven Allen <steven@stebalien.com>, The Rust Project Developers, Ashley Mannix <ashleymannix@live.com.au>, Jason White <me@jasonwhite.io>"
261+
thin-vec,https://github.com/mozilla/thin-vec,MIT OR Apache-2.0,Aria Beingessner <a.beingessner@gmail.com>
252262
thiserror,https://github.com/dtolnay/thiserror,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
253263
thiserror-impl,https://github.com/dtolnay/thiserror,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
254264
thread_local,https://github.com/Amanieu/thread_local-rs,MIT OR Apache-2.0,Amanieu d'Antras <amanieu@gmail.com>
@@ -301,8 +311,10 @@ wasm-metadata,https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wa
301311
wasmparser,https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasmparser,Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT,Yury Delendik <ydelendik@mozilla.com>
302312
web-sys,https://github.com/wasm-bindgen/wasm-bindgen/tree/master/crates/web-sys,MIT OR Apache-2.0,The wasm-bindgen Developers
303313
web-time,https://github.com/daxpedda/web-time,MIT OR Apache-2.0,The web-time Authors
314+
webpki-root-certs,https://github.com/rustls/webpki-roots,CDLA-Permissive-2.0,The webpki-root-certs Authors
304315
webpki-roots,https://github.com/rustls/webpki-roots,CDLA-Permissive-2.0,The webpki-roots Authors
305316
which,https://github.com/harryfei/which-rs,MIT,Harry Fei <tiziyuanfang@gmail.com>
317+
winapi-util,https://github.com/BurntSushi/winapi-util,Unlicense OR MIT,Andrew Gallant <jamslam@gmail.com>
306318
windows,https://github.com/microsoft/windows-rs,MIT OR Apache-2.0,Microsoft
307319
windows-link,https://github.com/microsoft/windows-rs,MIT OR Apache-2.0,The windows-link Authors
308320
windows-sys,https://github.com/microsoft/windows-rs,MIT OR Apache-2.0,Microsoft

crates/datadog-agent-config/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ license.workspace = true
66

77
[dependencies]
88
figment = { version = "0.10", default-features = false, features = ["yaml", "env"] }
9-
libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "b100350466504acbd12f8ca0da074464beda025d", default-features = false }
10-
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "b100350466504acbd12f8ca0da074464beda025d", default-features = false }
9+
libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "b3d13e59cd22bffecdf2c179f0b6b0bda6474f64", default-features = false }
10+
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "b3d13e59cd22bffecdf2c179f0b6b0bda6474f64", default-features = false }
1111
log = { version = "0.4", default-features = false }
1212
serde = { version = "1.0", default-features = false, features = ["derive"] }
1313
serde-aux = { version = "4.7", default-features = false }

crates/datadog-metrics-collector/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description = "Collector to read, compute, and submit enhanced metrics in Server
88
[dependencies]
99
dogstatsd = { path = "../dogstatsd", default-features = true }
1010
tracing = { version = "0.1", default-features = false }
11-
libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "b100350466504acbd12f8ca0da074464beda025d", default-features = false }
11+
libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "b3d13e59cd22bffecdf2c179f0b6b0bda6474f64", default-features = false }
1212

1313
[target.'cfg(windows)'.dependencies]
1414
windows-sys = { version = "0.61", features = ["Win32_System_JobObjects"], optional = true, default-features = false }

crates/datadog-serverless-compat/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ windows-enhanced-metrics = ["datadog-metrics-collector/windows-enhanced-metrics"
1414
datadog-logs-agent = { path = "../datadog-logs-agent" }
1515
datadog-metrics-collector = { path = "../datadog-metrics-collector" }
1616
datadog-trace-agent = { path = "../datadog-trace-agent" }
17-
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "b100350466504acbd12f8ca0da074464beda025d" }
17+
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "b3d13e59cd22bffecdf2c179f0b6b0bda6474f64" }
1818
datadog-fips = { path = "../datadog-fips", default-features = false }
1919
dogstatsd = { path = "../dogstatsd", default-features = true }
2020
reqwest = { version = "0.12.4", default-features = false }

crates/datadog-trace-agent/Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ tracing = { version = "0.1", default-features = false }
2525
serde = { version = "1.0.145", features = ["derive"] }
2626
serde_json = "1.0"
2727
thiserror = { version = "1.0.58", default-features = false }
28-
libdd-capabilities = { git = "https://github.com/DataDog/libdatadog", rev = "b100350466504acbd12f8ca0da074464beda025d" }
29-
libdd-capabilities-impl = { git = "https://github.com/DataDog/libdatadog", rev = "b100350466504acbd12f8ca0da074464beda025d" }
30-
libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "b100350466504acbd12f8ca0da074464beda025d" }
31-
libdd-library-config = { git = "https://github.com/DataDog/libdatadog", rev = "b100350466504acbd12f8ca0da074464beda025d" }
32-
libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "b100350466504acbd12f8ca0da074464beda025d" }
33-
libdd-trace-stats = { git = "https://github.com/DataDog/libdatadog", rev = "b100350466504acbd12f8ca0da074464beda025d" }
34-
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "b100350466504acbd12f8ca0da074464beda025d", features = [
28+
libdd-capabilities = { git = "https://github.com/DataDog/libdatadog", rev = "b3d13e59cd22bffecdf2c179f0b6b0bda6474f64" }
29+
libdd-capabilities-impl = { git = "https://github.com/DataDog/libdatadog", rev = "b3d13e59cd22bffecdf2c179f0b6b0bda6474f64" }
30+
libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "b3d13e59cd22bffecdf2c179f0b6b0bda6474f64" }
31+
libdd-library-config = { git = "https://github.com/DataDog/libdatadog", rev = "b3d13e59cd22bffecdf2c179f0b6b0bda6474f64" }
32+
libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "b3d13e59cd22bffecdf2c179f0b6b0bda6474f64" }
33+
libdd-trace-stats = { git = "https://github.com/DataDog/libdatadog", rev = "b3d13e59cd22bffecdf2c179f0b6b0bda6474f64" }
34+
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "b3d13e59cd22bffecdf2c179f0b6b0bda6474f64", features = [
3535
"mini_agent",
3636
] }
37-
libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "b100350466504acbd12f8ca0da074464beda025d" }
37+
libdd-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "b3d13e59cd22bffecdf2c179f0b6b0bda6474f64" }
3838
datadog-fips = { path = "../datadog-fips" }
3939
reqwest = { version = "0.12.23", features = [
4040
"json",
@@ -49,6 +49,6 @@ serial_test = "2.0.0"
4949
duplicate = "2.0.1"
5050
temp-env = "0.3.6"
5151
tempfile = "3.3.0"
52-
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "b100350466504acbd12f8ca0da074464beda025d", features = [
52+
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "b3d13e59cd22bffecdf2c179f0b6b0bda6474f64", features = [
5353
"test-utils",
5454
] }

0 commit comments

Comments
 (0)