maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(tracing): upgrade to 2024 edition

Browse source 
Part of #114

Change-Id: I07f1c861c110cc2e0a3d8122bb6f240391212698
Reviewed-on: https://cl.snix.dev/c/snix/+/30378
Autosubmit: Bence Nemes <nemes.bence1@gmail.com>
Reviewed-by: Florian Klink <flokli@flokli.de>
Tested-by: besadii
This commit is contained in:
Starnick4444 2025-05-02 22:55:13 +02:00 • committed by clbot
parent 950d551fbc
commit bf59803f00
5 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
contrib/weave/Cargo.nix
View file

@ -6218,7 +6218,7 @@ rec {
"snix-tracing" = rec { "snix-tracing" = rec {
crateName = "snix-tracing"; crateName = "snix-tracing";
version = "0.1.0"; version = "0.1.0";
edition = "2021"; edition = "2024";
src = lib.cleanSourceWith { filter = sourceFilter; src = ../../snix/tracing; }; src = lib.cleanSourceWith { filter = sourceFilter; src = ../../snix/tracing; };
libName = "snix_tracing"; libName = "snix_tracing";
dependencies = [ dependencies = [

2
snix/Cargo.nix
View file

@ -14803,7 +14803,7 @@ rec {
"snix-tracing" = rec { "snix-tracing" = rec {
crateName = "snix-tracing"; crateName = "snix-tracing";
version = "0.1.0"; version = "0.1.0";
edition = "2021"; edition = "2024";
src = lib.cleanSourceWith { filter = sourceFilter; src = ./tracing; }; src = lib.cleanSourceWith { filter = sourceFilter; src = ./tracing; };
libName = "snix_tracing"; libName = "snix_tracing";
dependencies = [ dependencies = [

2
snix/tracing/Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "snix-tracing" name = "snix-tracing"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2024"
[dependencies] [dependencies]
tracing = { workspace = true, features = ["max_level_trace", "release_max_level_debug"] } tracing = { workspace = true, features = ["max_level_trace", "release_max_level_debug"] }

2
snix/tracing/rustfmt.toml Normal file
View file

@ -0,0 +1,2 @@
# FUTUREWORK: move to .. once all crates are migrated (#114)
edition = "2024"

6
snix/tracing/src/lib.rs
View file

@ -2,17 +2,17 @@ use indicatif::ProgressStyle;
use std::sync::LazyLock; use std::sync::LazyLock;
use tracing::level_filters::LevelFilter; use tracing::level_filters::LevelFilter;
use tracing_indicatif::{ use tracing_indicatif::{
filter::IndicatifFilter, util::FilteredFormatFields, writer, IndicatifLayer, IndicatifWriter, IndicatifLayer, IndicatifWriter, filter::IndicatifFilter, util::FilteredFormatFields, writer,
}; };
use tracing_subscriber::{ use tracing_subscriber::{
EnvFilter, Layer, Registry,
layer::{Identity, SubscriberExt}, layer::{Identity, SubscriberExt},
util::SubscriberInitExt as _, util::SubscriberInitExt as _,
EnvFilter, Layer, Registry,
}; };
#[cfg(feature = "otlp")] #[cfg(feature = "otlp")]
use opentelemetry_sdk::{ use opentelemetry_sdk::{
propagation::TraceContextPropagator, resource::SdkProvidedResourceDetector, Resource, Resource, propagation::TraceContextPropagator, resource::SdkProvidedResourceDetector,
}; };
#[cfg(feature = "tracy")] #[cfg(feature = "tracy")]
use tracing_tracy::TracyLayer; use tracing_tracy::TracyLayer;