Skip to content

Fix for otel-metrics JSON #1477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nitisht merged 2 commits into from
Dec 11, 2025
Merged

Fix for otel-metrics JSON #1477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6752bee
Fix for otel-metrics JSON
parmesant Dec 11, 2025
8f63a79
cargo fmt and address coderabbit comments
parmesant Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 58 additions & 43 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 23 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ build = "build.rs"
# Arrow and DataFusion ecosystem
arrow = "57.1.0"
arrow-array = "57.1.0"
arrow-flight = { version = "57.1.0", features = ["tls-aws-lc","tls-native-roots"] }
arrow-flight = { version = "57.1.0", features = [
"tls-aws-lc",
"tls-native-roots",
] }
arrow-ipc = { version = "57.1.0", features = ["zstd"] }
arrow-json = "57.1.0"
arrow-schema = { version = "57.1.0", features = ["serde"] }
Expand All @@ -33,7 +36,13 @@ actix-web-prometheus = { version = "0.1" }
actix-web-static-files = "4.0"
http = "0.2.7"
http-auth-basic = "0.3.3"
tonic = { version = "0.14.1", features = ["tls-aws-lc", "tls-native-roots", "transport", "gzip", "zstd"] }
tonic = { version = "0.14.1", features = [
"tls-aws-lc",
"tls-native-roots",
"transport",
"gzip",
"zstd",
] }
tonic-prost = "0.14.1"
tonic-web = "0.14.1"
tower-http = { version = "0.6.1", features = ["cors"] }
Expand Down Expand Up @@ -77,8 +86,17 @@ tokio = { version = "^1.43", default-features = false, features = [
tokio-stream = { version = "0.1", features = ["fs"] }
tokio-util = { version = "0.7" }

# Logging and Metrics
opentelemetry-proto = { version = "0.30.0", features = [
# # Logging and Metrics
# opentelemetry-proto = { version = "0.30.0", features = [
# "gen-tonic",
# "with-serde",
# "logs",
# "metrics",
# "trace",
# ] }

# add custom branch with fix until it gets merged
opentelemetry-proto = { git = "https://github.com/parmesant/opentelemetry-rust/", rev = "45fb828769e6ade96d56ca1f5fa14cf0986a5341", features = [
"gen-tonic",
"with-serde",
"logs",
Expand Down Expand Up @@ -133,7 +151,7 @@ reqwest = { version = "0.11.27", default-features = false, features = [
"json",
"gzip",
"brotli",
"stream"
"stream",
] } # cannot update cause rustls is not latest `see rustls`
semver = "1.0"
static-files = "0.2"
Expand Down
2 changes: 2 additions & 0 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,13 @@ pub mod validator;

use std::time::Duration;

// Public re-exports of crates being used in enterprise
pub use datafusion;
pub use handlers::http::modal::{
ParseableServer, ingest_server::IngestServer, query_server::QueryServer, server::Server,
};
use once_cell::sync::Lazy;
pub use opentelemetry_proto;
use parseable::PARSEABLE;
use reqwest::{Client, ClientBuilder};

Expand Down
5 changes: 1 addition & 4 deletions src/query/stream_schema_provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,7 @@ impl StandardTableProvider {
let file_format = ParquetFormat::default().with_enable_pruning(true);

// create file groups from vec file partitions
let file_groups = partitions
.into_iter()
.map(FileGroup::new)
.collect_vec();
let file_groups = partitions.into_iter().map(FileGroup::new).collect_vec();

// parquet file source, default table parquet options
let file_source = if let Some(phyiscal_expr) = filters {
Expand Down
Loading