Skip to content

Commit

Permalink
Upgrade arrow, opentelemetry crates (#62)
Browse files Browse the repository at this point in the history
  • Loading branch information
xmakro authored Dec 24, 2024
1 parent 57705c5 commit faea43e
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 32 deletions.
12 changes: 6 additions & 6 deletions snowflake-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ license = "Apache-2.0"
name = "snowflake-api"
readme = "README.md"
repository = "https://github.com/mycelial/snowflake-rs"
version = "0.10.0"
version = "0.11.0"

[features]
all = ["cert-auth", "polars"]
Expand All @@ -19,7 +19,7 @@ default = ["cert-auth"]
polars = ["dep:polars-core", "dep:polars-io"]

[dependencies]
arrow = "53"
arrow = "54"
async-trait = "0.1"
base64 = "0.22"
bytes = "1"
Expand All @@ -31,12 +31,12 @@ reqwest = { version = "0.12", default-features = false, features = [
"json",
"rustls-tls",
] }
reqwest-middleware = { version = "0.3", features = ["json"] }
reqwest-retry = "0.6"
reqwest-middleware = { version = "0.4", features = ["json"] }
reqwest-retry = "0.7"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
snowflake-jwt = { version = "0.3", optional = true }
thiserror = "1"
thiserror = "2"
url = "2"
uuid = { version = "1", features = ["v4"] }

Expand All @@ -54,7 +54,7 @@ tokio = { version = "1", features = ["macros", "rt-multi-thread"] }

[dev-dependencies]
anyhow = "1"
arrow = { version = "53", features = ["prettyprint"] }
arrow = { version = "54", features = ["prettyprint"] }
clap = { version = "4", features = ["derive"] }
pretty_env_logger = "0.5"
tokio = { version = "1.35", features = ["macros", "rt-multi-thread"] }
14 changes: 7 additions & 7 deletions snowflake-api/examples/tracing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ version = "0.1.0"

[dependencies]
anyhow = "1"
arrow = { version = "53", features = ["prettyprint"] }
arrow = { version = "54", features = ["prettyprint"] }
dotenv = "0.15"
snowflake-api = { path = "../../../snowflake-api" }

opentelemetry = "0.24"
opentelemetry-otlp = "0.17"
opentelemetry-semantic-conventions = "0.16"
opentelemetry_sdk = { version = "0.24", features = ["rt-tokio"] }
reqwest-middleware = "0.3"
opentelemetry = "0.27"
opentelemetry-otlp = "0.27"
opentelemetry-semantic-conventions = "0.27"
opentelemetry_sdk = { version = "0.27", features = ["rt-tokio"] }
reqwest-middleware = "0.4"
reqwest-tracing = { version = "0.5", features = ["opentelemetry_0_21"] }
tokio = { version = "1", features = ["full"] }
tracing = "0.1"
tracing-opentelemetry = "0.25"
tracing-opentelemetry = "0.28"
tracing-subscriber = "0.3"
34 changes: 15 additions & 19 deletions snowflake-api/examples/tracing/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use opentelemetry::global;
use opentelemetry::trace::TracerProvider;
use opentelemetry::KeyValue;
use opentelemetry_otlp::WithExportConfig;
use opentelemetry_sdk::{runtime, trace as sdktrace, Resource};
use opentelemetry_sdk::Resource;
use reqwest_middleware::Extension;
use reqwest_tracing::{OtelName, SpanBackendWithUrl};
use tracing_subscriber::layer::SubscriberExt;
Expand All @@ -14,30 +14,26 @@ use snowflake_api::{AuthArgs, QueryResult, SnowflakeApiBuilder};

#[tokio::main]
async fn main() -> Result<()> {
let tracer = opentelemetry_otlp::new_pipeline()
.tracing()
.with_exporter(
opentelemetry_otlp::new_exporter()
.tonic()
.with_endpoint("http://localhost:4317"),
)
.with_trace_config(
sdktrace::Config::default().with_resource(Resource::new(vec![KeyValue::new(
opentelemetry_semantic_conventions::resource::SERVICE_NAME,
"snowflake-rust-client-demo",
)])),
)
.install_batch(runtime::Tokio)?
.tracer("snowflake");
let exporter = opentelemetry_otlp::SpanExporter::builder()
.with_tonic()
.with_endpoint("http://localhost:4317")
.build()?;
let provider = opentelemetry_sdk::trace::TracerProvider::builder()
.with_batch_exporter(exporter, opentelemetry_sdk::runtime::Tokio)
.with_resource(Resource::new(vec![KeyValue::new(
opentelemetry_semantic_conventions::resource::SERVICE_NAME,
"snowflake-rust-client-demo",
)]))
.build();
let tracer = provider.tracer("snowflake");

let telemetry = tracing_opentelemetry::layer().with_tracer(tracer.clone());
let telemetry = tracing_opentelemetry::layer().with_tracer(tracer);
let subscriber = tracing_subscriber::Registry::default().with(telemetry);
tracing::subscriber::set_global_default(subscriber)?;

dotenv::dotenv().ok();

let mut client = Connection::default_client_builder()?;
client = client
let client = Connection::default_client_builder()?
.with_init(Extension(OtelName(std::borrow::Cow::Borrowed(
"snowflake-api",
))))
Expand Down

0 comments on commit faea43e

Please sign in to comment.