diff --git a/Cargo.lock b/Cargo.lock index 5276dba..aa09f1c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -570,15 +570,6 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] - [[package]] name = "enum-primitive-derive" version = "0.3.0" @@ -596,22 +587,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -[[package]] -name = "errno" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "fastrand" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" - [[package]] name = "fiat-crypto" version = "0.2.9" @@ -624,21 +599,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -949,22 +909,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - [[package]] name = "hyper-util" version = "0.1.7" @@ -1129,12 +1073,6 @@ dependencies = [ "libc", ] -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - [[package]] name = "lock_api" version = "0.4.12" @@ -1263,23 +1201,6 @@ dependencies = [ "zstd", ] -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "nix-compat" version = "0.1.0" @@ -1396,50 +1317,12 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "openssl" -version = "0.10.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.77", -] - [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-sys" -version = "0.9.103" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "opentelemetry" version = "0.24.0" @@ -1454,6 +1337,19 @@ dependencies = [ "thiserror", ] +[[package]] +name = "opentelemetry-http" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad31e9de44ee3538fb9d64fe3376c1362f406162434609e79aea2a41a0af78ab" +dependencies = [ + "async-trait", + "bytes", + "http", + "opentelemetry", + "reqwest", +] + [[package]] name = "opentelemetry-otlp" version = "0.17.0" @@ -1464,9 +1360,12 @@ dependencies = [ "futures-core", "http", "opentelemetry", + "opentelemetry-http", "opentelemetry-proto", "opentelemetry_sdk", "prost", + "reqwest", + "serde_json", "thiserror", "tokio", "tonic", @@ -1478,9 +1377,11 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30ee9f20bff9c984511a02f082dc8ede839e4a9bf15cc2487c8d6fea5ad850d9" dependencies = [ + "hex", "opentelemetry", "opentelemetry_sdk", "prost", + "serde", "tonic", ] @@ -1885,7 +1786,7 @@ dependencies = [ "async-compression", "base64", "bytes", - "encoding_rs", + "futures-channel", "futures-core", "futures-util", "h2", @@ -1894,13 +1795,11 @@ dependencies = [ "http-body-util", "hyper", "hyper-rustls", - "hyper-tls", "hyper-util", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite", @@ -1913,9 +1812,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper 1.0.1", - "system-configuration", "tokio", - "tokio-native-tls", "tokio-rustls", "tokio-util", "tower-service", @@ -1963,19 +1860,6 @@ dependencies = [ "semver", ] -[[package]] -name = "rustix" -version = "0.38.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" -dependencies = [ - "bitflags", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - [[package]] name = "rustls" version = "0.23.12" @@ -2310,27 +2194,6 @@ dependencies = [ "futures-core", ] -[[package]] -name = "system-configuration" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" -dependencies = [ - "bitflags", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "tempdir" version = "0.3.7" @@ -2341,19 +2204,6 @@ dependencies = [ "remove_dir_all", ] -[[package]] -name = "tempfile" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" -dependencies = [ - "cfg-if", - "fastrand", - "once_cell", - "rustix", - "windows-sys 0.59.0", -] - [[package]] name = "termtree" version = "0.5.1" @@ -2445,16 +2295,6 @@ dependencies = [ "syn 2.0.77", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.26.0" @@ -2745,12 +2585,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "version_check" version = "0.9.5" diff --git a/Cargo.nix b/Cargo.nix index 4c2ea14..eb5ef64 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -844,7 +844,6 @@ rec { "rustc-dep-of-std" = [ "core" "compiler_builtins" ]; "serde" = [ "dep:serde" ]; }; - resolvedDefaultFeatures = [ "std" ]; }; "blake3" = rec { crateName = "blake3"; @@ -1807,29 +1806,6 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; - "encoding_rs" = rec { - crateName = "encoding_rs"; - version = "0.8.34"; - edition = "2018"; - sha256 = "0nagpi1rjqdpvakymwmnlxzq908ncg868lml5b70n08bm82fjpdl"; - authors = [ - "Henri Sivonen " - ]; - dependencies = [ - { - name = "cfg-if"; - packageId = "cfg-if"; - } - ]; - features = { - "any_all_workaround" = [ "dep:any_all_workaround" ]; - "default" = [ "alloc" ]; - "fast-legacy-encode" = [ "fast-hangul-encode" "fast-hanja-encode" "fast-kanji-encode" "fast-gb-hanzi-encode" "fast-big5-hanzi-encode" ]; - "serde" = [ "dep:serde" ]; - "simd-accel" = [ "any_all_workaround" ]; - }; - resolvedDefaultFeatures = [ "alloc" "default" ]; - }; "enum-primitive-derive" = rec { crateName = "enum-primitive-derive"; version = "0.3.0"; @@ -1864,62 +1840,6 @@ rec { sha256 = "1malmx5f4lkfvqasz319lq6gb3ddg19yzf9s8cykfsgzdmyq0hsl"; }; - "errno" = rec { - crateName = "errno"; - version = "0.3.9"; - edition = "2018"; - sha256 = "1fi0m0493maq1jygcf1bya9cymz2pc1mqxj26bdv7yjd37v5qk2k"; - authors = [ - "Chris Wong " - ]; - dependencies = [ - { - name = "libc"; - packageId = "libc"; - usesDefaultFeatures = false; - target = { target, features }: ("hermit" == target."os" or null); - } - { - name = "libc"; - packageId = "libc"; - usesDefaultFeatures = false; - target = { target, features }: ("wasi" == target."os" or null); - } - { - name = "libc"; - packageId = "libc"; - usesDefaultFeatures = false; - target = { target, features }: (target."unix" or false); - } - { - name = "windows-sys"; - packageId = "windows-sys 0.52.0"; - target = { target, features }: (target."windows" or false); - features = [ "Win32_Foundation" "Win32_System_Diagnostics_Debug" ]; - } - ]; - features = { - "default" = [ "std" ]; - "std" = [ "libc/std" ]; - }; - resolvedDefaultFeatures = [ "std" ]; - }; - "fastrand" = rec { - crateName = "fastrand"; - version = "2.1.1"; - edition = "2018"; - sha256 = "19nyzdq3ha4g173364y2wijmd6jlyms8qx40daqkxsnl458jmh78"; - authors = [ - "Stjepan Glavina " - ]; - features = { - "default" = [ "std" ]; - "getrandom" = [ "dep:getrandom" ]; - "js" = [ "std" "getrandom" ]; - "std" = [ "alloc" ]; - }; - resolvedDefaultFeatures = [ "alloc" "default" "std" ]; - }; "fiat-crypto" = rec { crateName = "fiat-crypto"; version = "0.2.9"; @@ -1947,34 +1867,6 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; - "foreign-types" = rec { - crateName = "foreign-types"; - version = "0.3.2"; - edition = "2015"; - sha256 = "1cgk0vyd7r45cj769jym4a6s7vwshvd0z4bqrb92q1fwibmkkwzn"; - libName = "foreign_types"; - authors = [ - "Steven Fackler " - ]; - dependencies = [ - { - name = "foreign-types-shared"; - packageId = "foreign-types-shared"; - } - ]; - - }; - "foreign-types-shared" = rec { - crateName = "foreign-types-shared"; - version = "0.1.1"; - edition = "2015"; - sha256 = "0jxgzd04ra4imjv8jgkmdq59kj8fsz6w4zxsbmlai34h26225c00"; - libName = "foreign_types_shared"; - authors = [ - "Steven Fackler " - ]; - - }; "form_urlencoded" = rec { crateName = "form_urlencoded"; version = "1.2.1"; @@ -2957,67 +2849,6 @@ rec { ]; }; - "hyper-tls" = rec { - crateName = "hyper-tls"; - version = "0.6.0"; - edition = "2018"; - sha256 = "1q36x2yps6hhvxq5r7mc8ph9zz6xlb573gx0x3yskb0fi736y83h"; - libName = "hyper_tls"; - authors = [ - "Sean McArthur " - ]; - dependencies = [ - { - name = "bytes"; - packageId = "bytes"; - } - { - name = "http-body-util"; - packageId = "http-body-util"; - } - { - name = "hyper"; - packageId = "hyper"; - } - { - name = "hyper-util"; - packageId = "hyper-util"; - features = [ "client-legacy" "tokio" ]; - } - { - name = "native-tls"; - packageId = "native-tls"; - } - { - name = "tokio"; - packageId = "tokio"; - } - { - name = "tokio-native-tls"; - packageId = "tokio-native-tls"; - } - { - name = "tower-service"; - packageId = "tower-service"; - } - ]; - devDependencies = [ - { - name = "hyper-util"; - packageId = "hyper-util"; - features = [ "http1" ]; - } - { - name = "tokio"; - packageId = "tokio"; - features = [ "io-std" "macros" "io-util" ]; - } - ]; - features = { - "alpn" = [ "native-tls/alpn" ]; - "vendored" = [ "native-tls/vendored" ]; - }; - }; "hyper-util" = rec { crateName = "hyper-util"; version = "0.1.7"; @@ -3474,7 +3305,7 @@ rec { "rustc-std-workspace-core" = [ "dep:rustc-std-workspace-core" ]; "use_std" = [ "std" ]; }; - resolvedDefaultFeatures = [ "default" "extra_traits" "std" ]; + resolvedDefaultFeatures = [ "default" "std" ]; }; "libmimalloc-sys" = rec { crateName = "libmimalloc-sys"; @@ -3503,23 +3334,6 @@ rec { "extended" = [ "cty" ]; }; }; - "linux-raw-sys" = rec { - crateName = "linux-raw-sys"; - version = "0.4.14"; - edition = "2021"; - sha256 = "12gsjgbhhjwywpqcrizv80vrp7p7grsz5laqq773i33wphjsxcvq"; - libName = "linux_raw_sys"; - authors = [ - "Dan Gohman " - ]; - features = { - "compiler_builtins" = [ "dep:compiler_builtins" ]; - "core" = [ "dep:core" ]; - "default" = [ "std" "general" "errno" ]; - "rustc-dep-of-std" = [ "core" "compiler_builtins" "no_std" ]; - }; - resolvedDefaultFeatures = [ "elf" "errno" "general" "ioctl" "no_std" ]; - }; "lock_api" = rec { crateName = "lock_api"; version = "0.4.12"; @@ -3854,6 +3668,7 @@ rec { { name = "opentelemetry-otlp"; packageId = "opentelemetry-otlp"; + features = [ "http-json" "reqwest-client" "reqwest-rustls" ]; } { name = "opentelemetry_sdk"; @@ -3867,7 +3682,8 @@ rec { { name = "reqwest"; packageId = "reqwest"; - features = [ "brotli" ]; + usesDefaultFeatures = false; + features = [ "brotli" "http2" "rustls-tls-native-roots" ]; } { name = "serde"; @@ -3937,73 +3753,6 @@ rec { ]; }; - "native-tls" = rec { - crateName = "native-tls"; - version = "0.2.12"; - edition = "2015"; - sha256 = "0rkl65z70n7sy4d5w0qa99klg1hr43wx6kcprk4d2n9xr2r4wqd8"; - libName = "native_tls"; - authors = [ - "Steven Fackler " - ]; - dependencies = [ - { - name = "libc"; - packageId = "libc"; - target = { target, features }: ("apple" == target."vendor" or null); - } - { - name = "log"; - packageId = "log"; - target = { target, features }: (!(("windows" == target."os" or null) || ("apple" == target."vendor" or null))); - } - { - name = "openssl"; - packageId = "openssl"; - target = { target, features }: (!(("windows" == target."os" or null) || ("apple" == target."vendor" or null))); - } - { - name = "openssl-probe"; - packageId = "openssl-probe"; - target = { target, features }: (!(("windows" == target."os" or null) || ("apple" == target."vendor" or null))); - } - { - name = "openssl-sys"; - packageId = "openssl-sys"; - target = { target, features }: (!(("windows" == target."os" or null) || ("apple" == target."vendor" or null))); - } - { - name = "schannel"; - packageId = "schannel"; - target = { target, features }: ("windows" == target."os" or null); - } - { - name = "security-framework"; - packageId = "security-framework"; - target = { target, features }: ("apple" == target."vendor" or null); - } - { - name = "security-framework-sys"; - packageId = "security-framework-sys"; - target = { target, features }: ("apple" == target."vendor" or null); - } - { - name = "tempfile"; - packageId = "tempfile"; - target = { target, features }: ("macos" == target."os" or null); - } - ]; - devDependencies = [ - { - name = "tempfile"; - packageId = "tempfile"; - } - ]; - features = { - "alpn" = [ "security-framework/alpn" ]; - "vendored" = [ "openssl/vendored" ]; - }; - }; "nix-compat" = rec { crateName = "nix-compat"; version = "0.1.0"; @@ -4447,76 +4196,6 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "default" "race" "std" ]; }; - "openssl" = rec { - crateName = "openssl"; - version = "0.10.66"; - edition = "2018"; - sha256 = "1hfr9ffx67j455aqrmyys3c8l65ngbqrl5qi3v3fi8vhddwg8acm"; - authors = [ - "Steven Fackler " - ]; - dependencies = [ - { - name = "bitflags"; - packageId = "bitflags"; - } - { - name = "cfg-if"; - packageId = "cfg-if"; - } - { - name = "foreign-types"; - packageId = "foreign-types"; - } - { - name = "libc"; - packageId = "libc"; - } - { - name = "once_cell"; - packageId = "once_cell"; - } - { - name = "openssl-macros"; - packageId = "openssl-macros"; - } - { - name = "openssl-sys"; - packageId = "openssl-sys"; - rename = "ffi"; - } - ]; - features = { - "bindgen" = [ "ffi/bindgen" ]; - "unstable_boringssl" = [ "ffi/unstable_boringssl" ]; - "vendored" = [ "ffi/vendored" ]; - }; - resolvedDefaultFeatures = [ "default" ]; - }; - "openssl-macros" = rec { - crateName = "openssl-macros"; - version = "0.1.1"; - edition = "2018"; - sha256 = "173xxvfc63rr5ybwqwylsir0vq6xsj4kxiv4hmg4c3vscdmncj59"; - procMacro = true; - libName = "openssl_macros"; - dependencies = [ - { - name = "proc-macro2"; - packageId = "proc-macro2"; - } - { - name = "quote"; - packageId = "quote"; - } - { - name = "syn"; - packageId = "syn 2.0.77"; - features = [ "full" ]; - } - ]; - - }; "openssl-probe" = rec { crateName = "openssl-probe"; version = "0.1.5"; @@ -4528,46 +4207,6 @@ rec { ]; }; - "openssl-sys" = rec { - crateName = "openssl-sys"; - version = "0.9.103"; - edition = "2018"; - links = "openssl"; - sha256 = "1mi9r5vbgqqwfa2nqlh2m0r1v5abhzjigfbi7ja0mx0xx7p8v7kz"; - build = "build/main.rs"; - libName = "openssl_sys"; - authors = [ - "Alex Crichton " - "Steven Fackler " - ]; - dependencies = [ - { - name = "libc"; - packageId = "libc"; - } - ]; - buildDependencies = [ - { - name = "cc"; - packageId = "cc"; - } - { - name = "pkg-config"; - packageId = "pkg-config"; - } - { - name = "vcpkg"; - packageId = "vcpkg"; - } - ]; - features = { - "bindgen" = [ "dep:bindgen" ]; - "bssl-sys" = [ "dep:bssl-sys" ]; - "openssl-src" = [ "dep:openssl-src" ]; - "unstable_boringssl" = [ "bssl-sys" ]; - "vendored" = [ "openssl-src" ]; - }; - }; "opentelemetry" = rec { crateName = "opentelemetry"; version = "0.24.0"; @@ -4611,6 +4250,48 @@ rec { }; resolvedDefaultFeatures = [ "default" "logs" "metrics" "pin-project-lite" "trace" ]; }; + "opentelemetry-http" = rec { + crateName = "opentelemetry-http"; + version = "0.13.0"; + edition = "2021"; + sha256 = "1avqmyh42apakbkhjij3c9hl0brnq5v37zk4kpxkhdgf8kgfjcdd"; + libName = "opentelemetry_http"; + dependencies = [ + { + name = "async-trait"; + packageId = "async-trait"; + } + { + name = "bytes"; + packageId = "bytes"; + } + { + name = "http"; + packageId = "http"; + usesDefaultFeatures = false; + features = [ "std" ]; + } + { + name = "opentelemetry"; + packageId = "opentelemetry"; + features = [ "trace" ]; + } + { + name = "reqwest"; + packageId = "reqwest"; + optional = true; + usesDefaultFeatures = false; + features = [ "blocking" ]; + } + ]; + features = { + "hyper" = [ "dep:http-body-util" "dep:hyper" "dep:hyper-util" "dep:tokio" ]; + "reqwest" = [ "dep:reqwest" ]; + "reqwest-rustls" = [ "reqwest" "reqwest/rustls-tls-native-roots" ]; + "reqwest-rustls-webpki-roots" = [ "reqwest" "reqwest/rustls-tls-webpki-roots" ]; + }; + resolvedDefaultFeatures = [ "reqwest" "reqwest-rustls" ]; + }; "opentelemetry-otlp" = rec { crateName = "opentelemetry-otlp"; version = "0.17.0"; @@ -4638,6 +4319,11 @@ rec { packageId = "opentelemetry"; usesDefaultFeatures = false; } + { + name = "opentelemetry-http"; + packageId = "opentelemetry-http"; + optional = true; + } { name = "opentelemetry-proto"; packageId = "opentelemetry-proto"; @@ -4653,6 +4339,17 @@ rec { packageId = "prost"; optional = true; } + { + name = "reqwest"; + packageId = "reqwest"; + optional = true; + usesDefaultFeatures = false; + } + { + name = "serde_json"; + packageId = "serde_json"; + optional = true; + } { name = "thiserror"; packageId = "thiserror"; @@ -4707,7 +4404,7 @@ rec { "tonic" = [ "dep:tonic" ]; "trace" = [ "opentelemetry/trace" "opentelemetry_sdk/trace" "opentelemetry-proto/trace" ]; }; - resolvedDefaultFeatures = [ "default" "grpc-tonic" "http" "logs" "metrics" "prost" "tokio" "tonic" "trace" ]; + resolvedDefaultFeatures = [ "default" "grpc-tonic" "http" "http-json" "logs" "metrics" "opentelemetry-http" "prost" "reqwest" "reqwest-client" "reqwest-rustls" "serde_json" "tokio" "tonic" "trace" ]; }; "opentelemetry-proto" = rec { crateName = "opentelemetry-proto"; @@ -4716,6 +4413,11 @@ rec { sha256 = "1nahv1dflvwdgi4c4p7ikd59x0yyivf85w02398q9jgrpwh9zvih"; libName = "opentelemetry_proto"; dependencies = [ + { + name = "hex"; + packageId = "hex"; + optional = true; + } { name = "opentelemetry"; packageId = "opentelemetry"; @@ -4731,6 +4433,13 @@ rec { packageId = "prost"; optional = true; } + { + name = "serde"; + packageId = "serde"; + optional = true; + usesDefaultFeatures = false; + features = [ "serde_derive" ]; + } { name = "tonic"; packageId = "tonic"; @@ -4764,7 +4473,7 @@ rec { "with-serde" = [ "serde" "hex" ]; "zpages" = [ "trace" ]; }; - resolvedDefaultFeatures = [ "gen-tonic" "gen-tonic-messages" "logs" "metrics" "prost" "tonic" "trace" ]; + resolvedDefaultFeatures = [ "gen-tonic" "gen-tonic-messages" "hex" "logs" "metrics" "prost" "serde" "tonic" "trace" "with-serde" ]; }; "opentelemetry_sdk" = rec { crateName = "opentelemetry_sdk"; @@ -5990,8 +5699,8 @@ rec { packageId = "bytes"; } { - name = "encoding_rs"; - packageId = "encoding_rs"; + name = "futures-channel"; + packageId = "futures-channel"; optional = true; target = { target, features }: (!("wasm32" == target."arch" or null)); } @@ -6039,12 +5748,6 @@ rec { target = { target, features }: (!("wasm32" == target."arch" or null)); features = [ "http1" "tls12" ]; } - { - name = "hyper-tls"; - packageId = "hyper-tls"; - optional = true; - target = { target, features }: (!("wasm32" == target."arch" or null)); - } { name = "hyper-util"; packageId = "hyper-util"; @@ -6071,13 +5774,6 @@ rec { packageId = "mime"; target = { target, features }: (!("wasm32" == target."arch" or null)); } - { - name = "native-tls"; - packageId = "native-tls"; - rename = "native-tls-crate"; - optional = true; - target = { target, features }: (!("wasm32" == target."arch" or null)); - } { name = "once_cell"; packageId = "once_cell"; @@ -6151,12 +5847,6 @@ rec { packageId = "sync_wrapper 1.0.1"; features = [ "futures" ]; } - { - name = "system-configuration"; - packageId = "system-configuration"; - optional = true; - target = { target, features }: ("macos" == target."os" or null); - } { name = "tokio"; packageId = "tokio"; @@ -6164,12 +5854,6 @@ rec { target = { target, features }: (!("wasm32" == target."arch" or null)); features = [ "net" "time" ]; } - { - name = "tokio-native-tls"; - packageId = "tokio-native-tls"; - optional = true; - target = { target, features }: (!("wasm32" == target."arch" or null)); - } { name = "tokio-rustls"; packageId = "tokio-rustls"; @@ -6302,7 +5986,7 @@ rec { "stream" = [ "tokio/fs" "dep:tokio-util" "dep:wasm-streams" ]; "zstd" = [ "dep:async-compression" "async-compression?/zstd" "dep:tokio-util" ]; }; - resolvedDefaultFeatures = [ "__rustls" "__rustls-ring" "__tls" "brotli" "charset" "default" "default-tls" "h2" "http2" "json" "macos-system-configuration" "rustls-tls-native-roots" "stream" ]; + resolvedDefaultFeatures = [ "__rustls" "__rustls-ring" "__tls" "blocking" "brotli" "h2" "http2" "json" "rustls-tls-native-roots" "stream" ]; }; "ring" = rec { crateName = "ring"; @@ -6412,117 +6096,6 @@ rec { ]; }; - "rustix" = rec { - crateName = "rustix"; - version = "0.38.35"; - edition = "2021"; - sha256 = "0vy38cpprg64i6kfwz0w5hj2lqgliyimnx6vmplninir499m0pd8"; - authors = [ - "Dan Gohman " - "Jakub Konka " - ]; - dependencies = [ - { - name = "bitflags"; - packageId = "bitflags"; - usesDefaultFeatures = false; - } - { - name = "errno"; - packageId = "errno"; - rename = "libc_errno"; - optional = true; - usesDefaultFeatures = false; - target = { target, features }: ((!(target."rustix_use_libc" or false)) && (!(target."miri" or false)) && ("linux" == target."os" or null) && ("little" == target."endian" or null) && (("arm" == target."arch" or null) || (("aarch64" == target."arch" or null) && ("64" == target."pointer_width" or null)) || ("riscv64" == target."arch" or null) || ((target."rustix_use_experimental_asm" or false) && ("powerpc64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips32r6" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64r6" == target."arch" or null)) || ("x86" == target."arch" or null) || (("x86_64" == target."arch" or null) && ("64" == target."pointer_width" or null)))); - } - { - name = "errno"; - packageId = "errno"; - rename = "libc_errno"; - usesDefaultFeatures = false; - target = { target, features }: ((!(target."windows" or false)) && ((target."rustix_use_libc" or false) || (target."miri" or false) || (!(("linux" == target."os" or null) && ("little" == target."endian" or null) && (("arm" == target."arch" or null) || (("aarch64" == target."arch" or null) && ("64" == target."pointer_width" or null)) || ("riscv64" == target."arch" or null) || ((target."rustix_use_experimental_asm" or false) && ("powerpc64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips32r6" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64r6" == target."arch" or null)) || ("x86" == target."arch" or null) || (("x86_64" == target."arch" or null) && ("64" == target."pointer_width" or null))))))); - } - { - name = "errno"; - packageId = "errno"; - rename = "libc_errno"; - usesDefaultFeatures = false; - target = { target, features }: (target."windows" or false); - } - { - name = "libc"; - packageId = "libc"; - optional = true; - usesDefaultFeatures = false; - target = { target, features }: ((!(target."rustix_use_libc" or false)) && (!(target."miri" or false)) && ("linux" == target."os" or null) && ("little" == target."endian" or null) && (("arm" == target."arch" or null) || (("aarch64" == target."arch" or null) && ("64" == target."pointer_width" or null)) || ("riscv64" == target."arch" or null) || ((target."rustix_use_experimental_asm" or false) && ("powerpc64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips32r6" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64r6" == target."arch" or null)) || ("x86" == target."arch" or null) || (("x86_64" == target."arch" or null) && ("64" == target."pointer_width" or null)))); - } - { - name = "libc"; - packageId = "libc"; - usesDefaultFeatures = false; - target = { target, features }: ((!(target."windows" or false)) && ((target."rustix_use_libc" or false) || (target."miri" or false) || (!(("linux" == target."os" or null) && ("little" == target."endian" or null) && (("arm" == target."arch" or null) || (("aarch64" == target."arch" or null) && ("64" == target."pointer_width" or null)) || ("riscv64" == target."arch" or null) || ((target."rustix_use_experimental_asm" or false) && ("powerpc64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips32r6" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64r6" == target."arch" or null)) || ("x86" == target."arch" or null) || (("x86_64" == target."arch" or null) && ("64" == target."pointer_width" or null))))))); - } - { - name = "linux-raw-sys"; - packageId = "linux-raw-sys"; - usesDefaultFeatures = false; - target = { target, features }: ((("android" == target."os" or null) || ("linux" == target."os" or null)) && ((target."rustix_use_libc" or false) || (target."miri" or false) || (!(("linux" == target."os" or null) && ("little" == target."endian" or null) && (("arm" == target."arch" or null) || (("aarch64" == target."arch" or null) && ("64" == target."pointer_width" or null)) || ("riscv64" == target."arch" or null) || ((target."rustix_use_experimental_asm" or false) && ("powerpc64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips32r6" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64r6" == target."arch" or null)) || ("x86" == target."arch" or null) || (("x86_64" == target."arch" or null) && ("64" == target."pointer_width" or null))))))); - features = [ "general" "ioctl" "no_std" ]; - } - { - name = "linux-raw-sys"; - packageId = "linux-raw-sys"; - usesDefaultFeatures = false; - target = { target, features }: ((!(target."rustix_use_libc" or false)) && (!(target."miri" or false)) && ("linux" == target."os" or null) && ("little" == target."endian" or null) && (("arm" == target."arch" or null) || (("aarch64" == target."arch" or null) && ("64" == target."pointer_width" or null)) || ("riscv64" == target."arch" or null) || ((target."rustix_use_experimental_asm" or false) && ("powerpc64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips32r6" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64r6" == target."arch" or null)) || ("x86" == target."arch" or null) || (("x86_64" == target."arch" or null) && ("64" == target."pointer_width" or null)))); - features = [ "general" "errno" "ioctl" "no_std" "elf" ]; - } - { - name = "windows-sys"; - packageId = "windows-sys 0.52.0"; - target = { target, features }: (target."windows" or false); - features = [ "Win32_Foundation" "Win32_Networking_WinSock" "Win32_NetworkManagement_IpHelper" "Win32_System_Threading" ]; - } - ]; - devDependencies = [ - { - name = "errno"; - packageId = "errno"; - rename = "libc_errno"; - usesDefaultFeatures = false; - } - { - name = "libc"; - packageId = "libc"; - } - ]; - features = { - "all-apis" = [ "event" "fs" "io_uring" "mm" "mount" "net" "param" "pipe" "process" "procfs" "pty" "rand" "runtime" "shm" "stdio" "system" "termios" "thread" "time" ]; - "compiler_builtins" = [ "dep:compiler_builtins" ]; - "core" = [ "dep:core" ]; - "default" = [ "std" "use-libc-auxv" ]; - "io_uring" = [ "event" "fs" "net" "linux-raw-sys/io_uring" ]; - "itoa" = [ "dep:itoa" ]; - "libc" = [ "dep:libc" ]; - "libc-extra-traits" = [ "libc?/extra_traits" ]; - "libc_errno" = [ "dep:libc_errno" ]; - "linux_latest" = [ "linux_4_11" ]; - "net" = [ "linux-raw-sys/net" "linux-raw-sys/netlink" "linux-raw-sys/if_ether" "linux-raw-sys/xdp" ]; - "once_cell" = [ "dep:once_cell" ]; - "param" = [ "fs" ]; - "process" = [ "linux-raw-sys/prctl" ]; - "procfs" = [ "once_cell" "itoa" "fs" ]; - "pty" = [ "itoa" "fs" ]; - "runtime" = [ "linux-raw-sys/prctl" ]; - "rustc-dep-of-std" = [ "core" "rustc-std-workspace-alloc" "compiler_builtins" "linux-raw-sys/rustc-dep-of-std" "bitflags/rustc-dep-of-std" "compiler_builtins?/rustc-dep-of-std" ]; - "rustc-std-workspace-alloc" = [ "dep:rustc-std-workspace-alloc" ]; - "shm" = [ "fs" ]; - "std" = [ "bitflags/std" "alloc" "libc?/std" "libc_errno?/std" "libc-extra-traits" ]; - "system" = [ "linux-raw-sys/system" ]; - "thread" = [ "linux-raw-sys/prctl" ]; - "use-libc" = [ "libc_errno" "libc" "libc-extra-traits" ]; - }; - resolvedDefaultFeatures = [ "alloc" "default" "fs" "libc-extra-traits" "std" "use-libc-auxv" ]; - }; "rustls" = rec { crateName = "rustls"; version = "0.23.12"; @@ -6841,7 +6414,7 @@ rec { "OSX_10_15" = [ "OSX_10_14" ]; "default" = [ "OSX_10_12" ]; }; - resolvedDefaultFeatures = [ "OSX_10_10" "OSX_10_11" "OSX_10_12" "OSX_10_9" "default" ]; + resolvedDefaultFeatures = [ "OSX_10_10" "OSX_10_11" "OSX_10_12" "OSX_10_9" ]; }; "semver" = rec { crateName = "semver"; @@ -7467,52 +7040,6 @@ rec { }; resolvedDefaultFeatures = [ "futures" "futures-core" ]; }; - "system-configuration" = rec { - crateName = "system-configuration"; - version = "0.6.1"; - edition = "2021"; - sha256 = "0sxslml567zm0v8g732314vd2gk9sd3k4xj22xk6p64xir29v1rw"; - libName = "system_configuration"; - authors = [ - "Mullvad VPN" - ]; - dependencies = [ - { - name = "bitflags"; - packageId = "bitflags"; - } - { - name = "core-foundation"; - packageId = "core-foundation"; - } - { - name = "system-configuration-sys"; - packageId = "system-configuration-sys"; - } - ]; - - }; - "system-configuration-sys" = rec { - crateName = "system-configuration-sys"; - version = "0.6.0"; - edition = "2021"; - sha256 = "1i5sqrmgy58l4704hibjbl36hclddglh73fb3wx95jnmrq81n7cf"; - libName = "system_configuration_sys"; - authors = [ - "Mullvad VPN" - ]; - dependencies = [ - { - name = "core-foundation-sys"; - packageId = "core-foundation-sys"; - } - { - name = "libc"; - packageId = "libc"; - } - ]; - - }; "tempdir" = rec { crateName = "tempdir"; version = "0.3.7"; @@ -7533,48 +7060,6 @@ rec { ]; }; - "tempfile" = rec { - crateName = "tempfile"; - version = "3.12.0"; - edition = "2021"; - sha256 = "0r3sm3323crr50ranvask8z4qb3x5zfqxs1mrzab1swlqz8cvjq4"; - authors = [ - "Steven Allen " - "The Rust Project Developers" - "Ashley Mannix " - "Jason White " - ]; - dependencies = [ - { - name = "cfg-if"; - packageId = "cfg-if"; - } - { - name = "fastrand"; - packageId = "fastrand"; - } - { - name = "once_cell"; - packageId = "once_cell"; - usesDefaultFeatures = false; - features = [ "std" ]; - } - { - name = "rustix"; - packageId = "rustix"; - target = { target, features }: ((target."unix" or false) || ("wasi" == target."os" or null)); - features = [ "fs" ]; - } - { - name = "windows-sys"; - packageId = "windows-sys 0.59.0"; - target = { target, features }: (target."windows" or false); - features = [ "Win32_Storage_FileSystem" "Win32_Foundation" ]; - } - ]; - features = { - }; - }; "termtree" = rec { crateName = "termtree"; version = "0.5.1"; @@ -7847,36 +7332,6 @@ rec { ]; }; - "tokio-native-tls" = rec { - crateName = "tokio-native-tls"; - version = "0.3.1"; - edition = "2018"; - sha256 = "1wkfg6zn85zckmv4im7mv20ca6b1vmlib5xwz9p7g19wjfmpdbmv"; - libName = "tokio_native_tls"; - authors = [ - "Tokio Contributors " - ]; - dependencies = [ - { - name = "native-tls"; - packageId = "native-tls"; - } - { - name = "tokio"; - packageId = "tokio"; - } - ]; - devDependencies = [ - { - name = "tokio"; - packageId = "tokio"; - features = [ "macros" "rt" "rt-multi-thread" "io-util" "net" ]; - } - ]; - features = { - "vendored" = [ "native-tls/vendored" ]; - }; - }; "tokio-rustls" = rec { crateName = "tokio-rustls"; version = "0.26.0"; @@ -8945,16 +8400,6 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "std" ]; }; - "vcpkg" = rec { - crateName = "vcpkg"; - version = "0.2.15"; - edition = "2015"; - sha256 = "09i4nf5y8lig6xgj3f7fyrvzd3nlaw4znrihw8psidvv5yk4xkdc"; - authors = [ - "Jim McGrath " - ]; - - }; "version_check" = rec { crateName = "version_check"; version = "0.9.5"; @@ -10149,7 +9594,7 @@ rec { "Win32_Web" = [ "Win32" ]; "Win32_Web_InternetExplorer" = [ "Win32_Web" ]; }; - resolvedDefaultFeatures = [ "Wdk" "Wdk_Foundation" "Wdk_Storage" "Wdk_Storage_FileSystem" "Wdk_System" "Wdk_System_IO" "Win32" "Win32_Foundation" "Win32_NetworkManagement" "Win32_NetworkManagement_IpHelper" "Win32_Networking" "Win32_Networking_WinSock" "Win32_Security" "Win32_Security_Authentication" "Win32_Security_Authentication_Identity" "Win32_Security_Credentials" "Win32_Security_Cryptography" "Win32_Storage" "Win32_Storage_FileSystem" "Win32_System" "Win32_System_Console" "Win32_System_Diagnostics" "Win32_System_Diagnostics_Debug" "Win32_System_IO" "Win32_System_Memory" "Win32_System_Pipes" "Win32_System_SystemServices" "Win32_System_Threading" "Win32_System_WindowsProgramming" "Win32_UI" "Win32_UI_Input" "Win32_UI_Input_KeyboardAndMouse" "default" ]; + resolvedDefaultFeatures = [ "Wdk" "Wdk_Foundation" "Wdk_Storage" "Wdk_Storage_FileSystem" "Wdk_System" "Wdk_System_IO" "Win32" "Win32_Foundation" "Win32_Networking" "Win32_Networking_WinSock" "Win32_Security" "Win32_Security_Authentication" "Win32_Security_Authentication_Identity" "Win32_Security_Credentials" "Win32_Security_Cryptography" "Win32_Storage" "Win32_Storage_FileSystem" "Win32_System" "Win32_System_Console" "Win32_System_IO" "Win32_System_Memory" "Win32_System_Pipes" "Win32_System_SystemServices" "Win32_System_Threading" "Win32_System_WindowsProgramming" "Win32_UI" "Win32_UI_Input" "Win32_UI_Input_KeyboardAndMouse" "default" ]; }; "windows-sys 0.59.0" = rec { crateName = "windows-sys"; diff --git a/Cargo.toml b/Cargo.toml index 85710de..4a8edf9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ clap = { version = "4.5.13", features = [ "derive" ] } indicatif = { version = "0.17.8", features = ["futures", "tokio"] } object_store = { version = "0.10.2", features = [ "aws" ] } regex = "1.10.6" -reqwest = { version = "0.12.5", features = ["brotli"] } +reqwest = { version = "0.12.5", default-features = false, features = ["brotli", "http2", "rustls-tls-native-roots"] } serde = "1.0.204" tempdir = "0.3.7" textwrap = "0.16.1" @@ -36,4 +36,4 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } opentelemetry = "0.24.0" opentelemetry_sdk = { version = "0.24.1", features = ["rt-tokio", "trace"] } tracing-opentelemetry = { version = "0.25.0", features = ["metrics"] } -opentelemetry-otlp = "0.17.0" +opentelemetry-otlp = { version = "0.17.0", features = ["http-json", "reqwest-client", "reqwest-rustls"] } diff --git a/src/main.rs b/src/main.rs index dab925c..5d94e5f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -232,7 +232,7 @@ async fn main() -> std::io::Result<()> { opentelemetry::KeyValue::new("service.name", env!("CARGO_PKG_NAME")), opentelemetry::KeyValue::new("service.version", env!("CARGO_PKG_VERSION")), ]))) - .with_exporter(opentelemetry_otlp::new_exporter().tonic()) + .with_exporter(opentelemetry_otlp::new_exporter().http()) .install_batch(opentelemetry_sdk::runtime::Tokio) .expect("Couldn't create OTLP tracer");