Skip to content

Commit

Permalink
Depend Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
wyatt-herkamp committed Nov 27, 2024
1 parent ca85bd4 commit f08441d
Show file tree
Hide file tree
Showing 8 changed files with 1,022 additions and 1,093 deletions.
421 changes: 219 additions & 202 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ derive_builder = "0.20"
# Error Handling
schemars = { git = "https://github.com/wyatt-herkamp/schemars.git", branch = "if_for_adjacent" }

thiserror = "1"
thiserror = "2"
anyhow = "1"
badge-maker = { git = "https://github.com/wyatt-herkamp/badge-maker.git", branch = "updates_and_improvements" }
auto_impl = "1.2"
Expand Down
8 changes: 4 additions & 4 deletions nitro_repo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@ tracing-subscriber.workspace = true
tracing-appender.workspace = true

# OpenTelemetry - Tracing framework
tracing-opentelemetry = "0.27"
opentelemetry = { version = "0.26", features = [] }
opentelemetry_sdk = { version = "0.26", features = ["rt-tokio"] }
opentelemetry-otlp = { version = "0.26", default-features = true }
tracing-opentelemetry = "0.28"
opentelemetry = { version = "0.27", features = [] }
opentelemetry_sdk = { version = "0.27", features = ["rt-tokio"] }
opentelemetry-otlp = { version = "0.27", default-features = true }
lettre = { version = "0.11.9", features = [
"builder",
"tokio1",
Expand Down
21 changes: 10 additions & 11 deletions nitro_repo/src/app/logging.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
use std::path::PathBuf;

use ahash::{HashMap, HashMapExt};
use opentelemetry::trace::TracerProvider;
use opentelemetry::trace::TracerProvider as _;
use opentelemetry::StringValue;
use opentelemetry::{global, KeyValue};
use opentelemetry_otlp::{new_exporter, WithExportConfig};
use opentelemetry_sdk::trace::{Config as SDKTraceConfig, Tracer};
use opentelemetry_otlp::{SpanExporter, WithExportConfig};
use opentelemetry_sdk::trace::{Tracer, TracerProvider};
use opentelemetry_sdk::{propagation::TraceContextPropagator, Resource};
use serde::{Deserialize, Serialize};
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
Expand Down Expand Up @@ -53,14 +53,13 @@ impl TracingConfig {
.into_iter()
.map(|(k, v)| KeyValue::new(k, Into::<StringValue>::into(v.clone())))
.collect();
let trace_config = SDKTraceConfig::default().with_resource(Resource::new(resources));

let exporter = new_exporter().tonic().with_endpoint(&self.endpoint);
let provider = opentelemetry_otlp::new_pipeline()
.tracing()
.with_exporter(exporter)
.with_trace_config(trace_config)
.install_batch(opentelemetry_sdk::runtime::Tokio)?;
let exporter = SpanExporter::builder()
.with_tonic()
.with_endpoint(&self.endpoint);
let provider = TracerProvider::builder()
.with_resource(Resource::new(resources))
.with_batch_exporter(exporter.build()?, opentelemetry_sdk::runtime::Tokio)
.build();
Ok(provider.tracer("tracing-otel-subscriber"))
}
}
Expand Down
2 changes: 1 addition & 1 deletion site/.node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v22
v20
Loading

0 comments on commit f08441d

Please sign in to comment.