Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
215 changes: 215 additions & 0 deletions Cargo.lock

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

19 changes: 17 additions & 2 deletions icechunk-python/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ use conflicts::{
PyConflictType, PyVersionSelection,
};
use errors::{IcechunkError, PyConflictError, PyRebaseFailedError};
use icechunk::TelemetryConfig;
use icechunk::{format::format_constants::SpecVersionBin, initialize_tracing};
use pyo3::prelude::*;
use pyo3::types::PyMapping;
Expand Down Expand Up @@ -79,11 +80,24 @@ fn log_filters_from_env(py: Python) -> PyResult<Option<String>> {
Ok(value)
}

fn telemetry_from_env(py: Python) -> PyResult<Option<TelemetryConfig>> {
let os = py.import("os")?;
let environ = os.getattr("environ")?;
let environ: &Bound<PyMapping> = environ.downcast()?;
let value = environ
.get_item("ICECHUNK_TELEMETRY_ENDPOINT")
.ok()
.and_then(|v| v.extract().ok());
let value = value.map(|v| TelemetryConfig { endpoint: v, ..Default::default() });
Ok(value)
}

#[pyfunction]
fn initialize_logs(py: Python) -> PyResult<()> {
if env::var("ICECHUNK_NO_LOGS").is_err() {
let log_filter_directive = log_filters_from_env(py)?;
initialize_tracing(log_filter_directive.as_deref())
let telemetry = telemetry_from_env(py)?;
initialize_tracing(log_filter_directive.as_deref(), telemetry.as_ref())
}
Ok(())
}
Expand All @@ -92,7 +106,8 @@ fn initialize_logs(py: Python) -> PyResult<()> {
fn set_logs_filter(py: Python, log_filter_directive: Option<String>) -> PyResult<()> {
let log_filter_directive =
log_filter_directive.or_else(|| log_filters_from_env(py).ok().flatten());
initialize_tracing(log_filter_directive.as_deref());
let telemetry = telemetry_from_env(py)?;
initialize_tracing(log_filter_directive.as_deref(), telemetry.as_ref());
Ok(())
}

Expand Down
16 changes: 15 additions & 1 deletion icechunk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,14 @@ dirs = { version = "6.0.0", optional = true }
assert_fs = { version = "1.1.3", optional = true }
flatbuffers = "25.2.10"

opentelemetry = { version = "0.30.0", optional = true }
opentelemetry_sdk = { version = "0.30.0", optional = true }
tracing-opentelemetry = { version = "0.31.0", optional = true }
opentelemetry-otlp = { version = "0.30.0", features = [
"grpc-tonic",
"tonic",
], optional = true }

[dev-dependencies]
icechunk-macros = { path = "../icechunk-macros", version = "0.1.0" }
pretty_assertions = "1.4.1"
Expand All @@ -82,7 +90,13 @@ test-log = { version = "0.2.18", default-features = false, features = [
workspace = true

[features]
logs = ["dep:tracing-subscriber"]
logs = [
"dep:tracing-subscriber",
"dep:opentelemetry",
"dep:opentelemetry_sdk",
"dep:opentelemetry-otlp",
"dep:tracing-opentelemetry",
]
cli = ["dep:clap", "dep:anyhow", "dep:dialoguer", "dep:dirs", "dep:assert_fs"]

[[bin]]
Expand Down
23 changes: 23 additions & 0 deletions icechunk/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -566,3 +566,26 @@ pub enum Credentials {
Gcs(GcsCredentials),
Azure(AzureCredentials),
}

#[derive(Clone, Debug)]
pub struct TelemetryConfig {
pub endpoint: String,
pub tracer_name: String,
}

impl Default for TelemetryConfig {
fn default() -> Self {
Self { endpoint: "localhost".to_string(), tracer_name: "icechunk".to_string() }
}
}

#[derive(Clone, Debug)]
pub struct LogsConfig {
pub env_var_name: String,
}

impl Default for LogsConfig {
fn default() -> Self {
Self { env_var_name: "ICECHUNK_LOG".to_string() }
}
}
Loading