aj/honor both proxies in order (#410)

* feat: Honor priority order of DD_PROXY_HTTPS over HTTPS_PROXY * feat: fmt * fix: Prefer Ok over some + ok * Feat: Use tags for proxy support in libdatadog * fix: no proxy for tests * fix: license * all this for a comma
DataDog · Oct 23, 2024 · 527db82 · 527db82
1 parent 890e779
commit 527db82
Show file tree

Hide file tree

Showing 10 changed files with 78 additions and 93 deletions.
diff --git a/bottlecap/Cargo.lock b/bottlecap/Cargo.lock
diff --git a/bottlecap/Cargo.toml b/bottlecap/Cargo.toml
@@ -9,13 +9,13 @@ async-trait = { version = "0.1", default-features = false }
 chrono = { version = "0.4", features = ["serde", "std", "now"], default-features = false }
 datadog-protos = { version = "0.1.0", default-features = false, git = "https://github.com/DataDog/saluki/" }
 ddsketch-agent = { version = "0.1.0", default-features = false, git = "https://github.com/DataDog/saluki/" }
-ddcommon = { git = "https://github.com/DataDog/libdatadog", tag = "v13.1.0" }
-datadog-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", tag = "v13.1.0" }
-datadog-trace-utils = { git = "https://github.com/DataDog/libdatadog", tag = "v13.1.0" }
-datadog-trace-mini-agent = { git = "https://github.com/DataDog/libdatadog", tag = "v13.1.0" }
-datadog-trace-normalization = { git = "https://github.com/DataDog/libdatadog", tag = "v13.1.0" }
-datadog-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", tag = "v13.1.0" }
-dogstatsd = { git = "https://github.com/DataDog/libdatadog", branch = "main" }
+ddcommon = { git = "https://github.com/DataDog/libdatadog", rev = "92272e90a7919f07178f3246ef8f82295513cfed" }
+datadog-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "92272e90a7919f07178f3246ef8f82295513cfed" }
+datadog-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "92272e90a7919f07178f3246ef8f82295513cfed" }
+datadog-trace-mini-agent = { git = "https://github.com/DataDog/libdatadog", rev = "92272e90a7919f07178f3246ef8f82295513cfed" }
+datadog-trace-normalization = { git = "https://github.com/DataDog/libdatadog", rev = "92272e90a7919f07178f3246ef8f82295513cfed" }
+datadog-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "92272e90a7919f07178f3246ef8f82295513cfed" }
+dogstatsd = { git = "https://github.com/DataDog/libdatadog", rev = "92272e90a7919f07178f3246ef8f82295513cfed" }
 figment = { version = "0.10", default-features = false, features = ["yaml", "env"] }
 hyper = { version = "0.14", default-features = false, features = ["server"] }
 log = { version = "0.4", default-features = false }