From 98f5052138b6fc6b4c3331fa87e26bac891e1fb3 Mon Sep 17 00:00:00 2001 From: WUJingdi Date: Thu, 16 Nov 2023 10:41:28 +0800 Subject: [PATCH] chore: update dependence --- Cargo.lock | 1 + Cargo.toml | 2 +- src/common/telemetry/src/logging.rs | 4 ++-- tests-integration/tests/http.rs | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ab0debecb84a..9403b3483949 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3598,6 +3598,7 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "greptime-proto" version = "0.1.0" +source = "git+https://github.com/GreptimeTeam/greptime-proto.git?rev=25429306d0379ad29211a062a81da2554a0208ab#25429306d0379ad29211a062a81da2554a0208ab" dependencies = [ "prost 0.12.1", "serde", diff --git a/Cargo.toml b/Cargo.toml index 2ed4594e1496..285cfcd28467 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -84,7 +84,7 @@ derive_builder = "0.12" etcd-client = "0.12" futures = "0.3" futures-util = "0.3" -greptime-proto = { path = "/Users/wujingdi/data/greptime-proto" } +greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "25429306d0379ad29211a062a81da2554a0208ab" } humantime-serde = "1.1" itertools = "0.10" lazy_static = "1.4" diff --git a/src/common/telemetry/src/logging.rs b/src/common/telemetry/src/logging.rs index dd9684f1d887..978c1ece2788 100644 --- a/src/common/telemetry/src/logging.rs +++ b/src/common/telemetry/src/logging.rs @@ -31,7 +31,7 @@ use tracing_subscriber::{filter, EnvFilter, Registry}; pub use crate::{debug, error, info, trace, warn}; -const DEAFULT_OTLP_ENDPOINT: &str = "http://localhost:4317"; +const DEFAULT_OTLP_ENDPOINT: &str = "http://localhost:4317"; #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] #[serde(default)] @@ -195,7 +195,7 @@ pub fn init_global_logging( opts.otlp_endpoint .as_ref() .map(|e| format!("http://{}", e)) - .unwrap_or(DEAFULT_OTLP_ENDPOINT.to_string()), + .unwrap_or(DEFAULT_OTLP_ENDPOINT.to_string()), ), ) .with_trace_config(opentelemetry_sdk::trace::config().with_resource( diff --git a/tests-integration/tests/http.rs b/tests-integration/tests/http.rs index 574334de00d7..09652781fb4c 100644 --- a/tests-integration/tests/http.rs +++ b/tests-integration/tests/http.rs @@ -677,7 +677,7 @@ enable = true enable = true [frontend.logging] -enable_jaeger_tracing = false +enable_otlp_tracing = false [frontend.datanode.client] timeout = "10s" @@ -750,10 +750,10 @@ sst_write_buffer_size = "8MiB" [datanode.region_engine.file] [datanode.logging] -enable_jaeger_tracing = false +enable_otlp_tracing = false [logging] -enable_jaeger_tracing = false"#, +enable_otlp_tracing = false"#, store_type, num_cpus::get() / 2 );