Skip to content

Commit 1933219

Browse files
committed
fix: deepsource
1 parent c4d0790 commit 1933219

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

src/query/mod.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ use crate::utils::time::TimeRange;
7878
// pub static QUERY_SESSION: Lazy<SessionContext> =
7979
// Lazy::new(|| Query::create_session_context(PARSEABLE.storage()));
8080

81-
pub type RB = Either<
81+
/// Takes care of both streaming and non-streaming query flows
82+
pub type QueryResult = Either<
8283
Vec<RecordBatch>,
8384
Pin<
8485
Box<
@@ -159,7 +160,7 @@ pub async fn execute(
159160
query: Query,
160161
is_streaming: bool,
161162
tenant_id: &Option<String>,
162-
) -> Result<(RB, Vec<String>), ExecuteError> {
163+
) -> Result<(QueryResult, Vec<String>), ExecuteError> {
163164
let id = tenant_id.clone();
164165

165166
// W3C TraceContext propagation across QUERY_RUNTIME (separate OS-thread runtime).
@@ -293,7 +294,7 @@ impl Query {
293294
&self,
294295
is_streaming: bool,
295296
tenant_id: &Option<String>,
296-
) -> Result<(RB, Vec<String>), ExecuteError> {
297+
) -> Result<(QueryResult, Vec<String>), ExecuteError> {
297298
let df = QUERY_SESSION
298299
.get_ctx()
299300
.execute_logical_plan(self.final_logical_plan(tenant_id))

src/telemetry.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ use opentelemetry_sdk::{
2525
trace::{BatchSpanProcessor, SdkTracerProvider},
2626
};
2727

28+
const EXPORTER_OTLP_ENDPOINT: &str = "OTEL_EXPORTER_OTLP_ENDPOINT";
29+
const EXPORTER_OTLP_PROTOCOL: &str = "OTEL_EXPORTER_OTLP_PROTOCOL";
30+
2831
/// Initialise an OTLP tracer provider.
2932
///
3033
/// **Required env var:**
@@ -48,10 +51,10 @@ use opentelemetry_sdk::{
4851
pub fn init_otel_tracer() -> Option<SdkTracerProvider> {
4952
// Only used to decide whether OTEL is enabled; the SDK reads it again
5053
// from env to build the exporter (which also appends /v1/traces for HTTP).
51-
std::env::var("OTEL_EXPORTER_OTLP_ENDPOINT").ok()?;
54+
std::env::var(EXPORTER_OTLP_ENDPOINT).ok()?;
5255

5356
let protocol =
54-
std::env::var("OTEL_EXPORTER_OTLP_PROTOCOL").unwrap_or_else(|_| "http/json".to_string());
57+
std::env::var(EXPORTER_OTLP_PROTOCOL).unwrap_or_else(|_| "http/json".to_string());
5558

5659
// Build the exporter using the SDK's env-var-aware builders.
5760
// We intentionally do NOT call .with_endpoint() / .with_headers() /

0 commit comments

Comments
 (0)