Update tracing setup for compatibility with OpenTelemetry 0.27.0

- Updated tracing initialization to align with OpenTelemetry API (0.27.0) and SDK (0.26.0) requirements, moving from the older 0.18.0 version.
- Adjusted the tracing configuration in tracing.rs to reflect changes in layer setup and API separation in the new versions, specifically adapting to the SDK and API split in OpenTelemetry.
- Centralized layer creation in tracing.rs to maintain all tracing configuration in a single module, reducing tracing setup in main.rs for cleaner organization.
- Updated Cargo.toml dependencies to reflect new versions and restructured OpenTelemetry and tracing crates.

Author: peytonr18

Cargo.toml

@@ -14,7 +14,6 @@ anyhow = "1.0.81"
 tokio = { version = "1", features = ["full"] }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 tracing = "0.1.40"
-tracing-opentelemetry = "0.18.0"
 # We work fine with any version of 4, but 4.5 bumped MSRV to 1.74
 clap = { version = "<=4.4", features = ["derive", "cargo", "env"] }
 sysinfo = "0.27"

libazureinit/Cargo.toml

@@ -20,16 +20,21 @@ block-utils = "0.11.1"
 tracing = "0.1.40"
 strum = { version = "0.26.3", features = ["derive"] }
 fstab = "0.4.0"
+regex = "1"
+lazy_static = "1.4"
+tempfile = "3.3.0"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
-opentelemetry = "0.18.0"
+opentelemetry = "0.26"
+opentelemetry_sdk = "0.26"
+tracing-opentelemetry = "0.27"
 uuid = { version = "1.2", features = ["v4"] }
 anyhow = "1.0.81"
 sysinfo = "0.27"
 chrono = "0.4"
 
 [dev-dependencies]
-tracing-test = { version = "0.2", features = ["no-env-filter"] }
 tempfile = "3"
+tracing-test = { version = "0.2", features = ["no-env-filter"] }
 tokio = { version = "1", features = ["full"] }
 tokio-util = "0.7.11"
 whoami = "1"

libazureinit/src/tracing.rs

@@ -1,16 +1,54 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-use opentelemetry::{global, sdk::trace as sdktrace, trace::TracerProvider};
-
-/// Initializes the tracing system by setting up a tracing provider and
-/// registering it globally. This function returns a tracer instance
-/// associated with the "azure-kvp" application.
-///
-/// # Returns
-/// A sdktrace::Tracer object that can be used to create and manage spans.
+use opentelemetry::{global, trace::TracerProvider};
+use opentelemetry_sdk::trace::{
+    self as sdktrace, Config, Sampler, TracerProvider as SdkTracerProvider,
+};
+use tracing::{event, Level};
+use tracing_opentelemetry::OpenTelemetryLayer;
+use tracing_subscriber::fmt::format::FmtSpan;
+use tracing_subscriber::{
+    fmt, layer::SubscriberExt, EnvFilter, Layer, Registry,
+};
+
+use crate::EmitKVPLayer;
+
 pub fn initialize_tracing() -> sdktrace::Tracer {
-    let provider = sdktrace::TracerProvider::builder().build();
+    let config = Config::default().with_sampler(Sampler::AlwaysOn);
+
+    let provider = SdkTracerProvider::builder().with_config(config).build();
+
     global::set_tracer_provider(provider.clone());
     provider.tracer("azure-kvp")
 }
+
+pub fn setup_layers(
+    tracer: sdktrace::Tracer,
+) -> Result<(), Box<dyn std::error::Error>> {
+    let otel_layer = OpenTelemetryLayer::new(tracer);
+
+    let emit_kvp_layer = match EmitKVPLayer::new(std::path::PathBuf::from(
+        "/var/lib/hyperv/.kvp_pool_1",
+    )) {
+        Ok(layer) => Some(layer),
+        Err(e) => {
+            event!(Level::ERROR, "Failed to initialize EmitKVPLayer: {}. Continuing without KVP logging.", e);
+            None
+        }
+    };
+
+    let stderr_layer = fmt::layer()
+        .with_span_events(FmtSpan::NEW | FmtSpan::CLOSE)
+        .with_writer(std::io::stderr)
+        .with_filter(EnvFilter::from_env("AZURE_INIT_LOG"));
+
+    let subscriber = Registry::default()
+        .with(stderr_layer)
+        .with(otel_layer)
+        .with(emit_kvp_layer);
+
+    tracing::subscriber::set_global_default(subscriber)?;
+
+    Ok(())
+}

src/main.rs

@@ -3,6 +3,7 @@
 use anyhow::Context;
 use clap::Parser;
 use libazureinit::imds::InstanceMetadata;
+use libazureinit::tracing::{initialize_tracing, setup_layers};
 use libazureinit::User;
 use libazureinit::{
     error::Error as LibError,
@@ -16,14 +17,6 @@ use std::time::Duration;
 use sysinfo::{System, SystemExt};
 use tracing::instrument;
 use tracing::{event, Level};
-use tracing_opentelemetry::OpenTelemetryLayer;
-use tracing_subscriber::fmt::format::FmtSpan;
-use tracing_subscriber::{
-    fmt, layer::SubscriberExt, EnvFilter, Layer, Registry,
-};
-
-use libazureinit::tracing::initialize_tracing;
-use libazureinit::EmitKVPLayer;
 
 const VERSION: &str = env!("CARGO_PKG_VERSION");
 
@@ -100,29 +93,9 @@ fn get_username(
 async fn main() -> ExitCode {
     let tracer = initialize_tracing();
 
-    let otel_layer = OpenTelemetryLayer::new(tracer);
-    let emit_kvp_layer = match EmitKVPLayer::new(std::path::PathBuf::from(
-        "/var/lib/hyperv/.kvp_pool_1",
-    )) {
-        Ok(layer) => Some(layer),
-        Err(e) => {
-            event!(Level::ERROR, "Failed to initialize EmitKVPLayer: {}. Continuing without KVP logging.", e);
-            None
-        }
-    };
-
-    let stderr_layer = fmt::layer()
-        .with_span_events(FmtSpan::NEW | FmtSpan::CLOSE)
-        .with_writer(std::io::stderr)
-        .with_filter(EnvFilter::from_env("AZURE_INIT_LOG"));
-
-    let subscriber = Registry::default()
-        .with(stderr_layer)
-        .with(otel_layer)
-        .with(emit_kvp_layer);
-
-    tracing::subscriber::set_global_default(subscriber)
-        .expect("Failed to set global tracing subscriber");
+    if let Err(e) = setup_layers(tracer) {
+        eprintln!("Warning: Failed to set up tracing layers: {:?}", e);
+    }
 
     let result = provision().await;