diff --git a/Cargo.lock b/Cargo.lock index d62c2f64a8..b08d71984c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1808,7 +1808,6 @@ dependencies = [ "lazy_static", "prost", "regex", - "reqwest", "serde", "serde_json", "snafu", @@ -3218,21 +3217,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.0" @@ -4430,19 +4414,6 @@ dependencies = [ "tokio-io-timeout", ] -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - [[package]] name = "iana-time-zone" version = "0.1.57" @@ -5729,24 +5700,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "new_debug_unreachable" version = "1.0.4" @@ -6107,50 +6060,12 @@ dependencies = [ "tokio-rustls 0.24.1", ] -[[package]] -name = "openssl" -version = "0.10.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" -dependencies = [ - "bitflags 1.3.2", - "cfg-if 1.0.0", - "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.28", -] - [[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.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "opentelemetry" version = "0.17.0" @@ -7679,13 +7594,11 @@ dependencies = [ "http-body", "hyper", "hyper-rustls", - "hyper-tls", "ipnet", "js-sys", "log", "mime", "mime_guess", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite", @@ -7696,7 +7609,6 @@ dependencies = [ "serde_json", "serde_urlencoded", "tokio", - "tokio-native-tls", "tokio-rustls 0.24.1", "tokio-util", "tower-service", @@ -7705,6 +7617,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", + "webpki-roots 0.22.6", "winreg", ] @@ -10206,16 +10119,6 @@ dependencies = [ "syn 2.0.28", ] -[[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-postgres" version = "0.7.8" diff --git a/src/common/greptimedb-telemetry/Cargo.toml b/src/common/greptimedb-telemetry/Cargo.toml index 63fb4cf84d..32f37cee41 100644 --- a/src/common/greptimedb-telemetry/Cargo.toml +++ b/src/common/greptimedb-telemetry/Cargo.toml @@ -9,10 +9,13 @@ async-trait.workspace = true common-error = { path = "../error" } common-runtime = { path = "../runtime" } common-telemetry = { path = "../telemetry" } +reqwest = { version = "0.11", features = [ + "json", + "rustls-tls", +], default-features = false } serde.workspace = true serde_json.workspace = true tokio.workspace = true -reqwest = { version = "0.11", features = ["json"] } uuid.workspace = true once_cell = "1.17.0" diff --git a/src/common/greptimedb-telemetry/src/lib.rs b/src/common/greptimedb-telemetry/src/lib.rs index 551f137570..e701276dec 100644 --- a/src/common/greptimedb-telemetry/src/lib.rs +++ b/src/common/greptimedb-telemetry/src/lib.rs @@ -19,12 +19,12 @@ use std::time::Duration; use common_runtime::error::{Error, Result}; use common_runtime::{BoxedTaskFunction, RepeatedTask, Runtime, TaskFunction}; -use common_telemetry::debug; +use common_telemetry::{debug, info}; use once_cell::sync::Lazy; use reqwest::{Client, Response}; use serde::{Deserialize, Serialize}; -pub const TELEMETRY_URL: &str = "https://api-preview.greptime.cloud/db/otel/statistics"; +pub const TELEMETRY_URL: &str = "https://api.greptime.cloud/db/otel/statistics"; // Getting the right path when running on windows static TELEMETRY_UUID_FILE_NAME: Lazy = Lazy::new(|| { @@ -206,7 +206,7 @@ impl GreptimeDBTelemetry { }; if let Some(client) = self.client.as_ref() { - debug!("report version: {:?}", data); + info!("reporting greptimedb version: {:?}", data); let result = client.post(self.telemetry_url).json(&data).send().await; debug!("report version result: {:?}", result); result.ok() diff --git a/src/common/meta/Cargo.toml b/src/common/meta/Cargo.toml index 9474ccc20d..5ffc393192 100644 --- a/src/common/meta/Cargo.toml +++ b/src/common/meta/Cargo.toml @@ -24,7 +24,6 @@ snafu.workspace = true store-api = { path = "../../store-api" } table = { path = "../../table" } tokio.workspace = true -reqwest = { version = "0.11", features = ["json"] } [dev-dependencies] chrono.workspace = true