feat: update Rust version

Author: geoffreyclaude

Cargo.lock

@@ -30,11 +30,11 @@ resolver = "2"
 [workspace.package]
 description = "DataFusion tracing of execution plans"
 version = "50.0.2"
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 repository = "https://github.com/datafusion-contrib/datafusion-tracing"
 authors = ["DataDog <[email protected]>"]
-rust-version = "1.82.0"
+rust-version = "1.86.0"
 
 [workspace.dependencies]
 datafusion = { version = "50.0.0", default-features = false }

Cargo.toml

@@ -20,14 +20,14 @@
 use crate::instrumented::InstrumentedExec;
 use crate::instrumented::SpanCreateFn;
 use crate::options::InstrumentationOptions;
-use datafusion::common::runtime::{set_join_set_tracer, JoinSetTracer};
+use datafusion::common::runtime::{JoinSetTracer, set_join_set_tracer};
 use datafusion::common::tree_node::{Transformed, TransformedResult, TreeNode};
 use datafusion::{
     config::ConfigOptions, physical_optimizer::PhysicalOptimizerRule,
     physical_plan::ExecutionPlan,
 };
-use futures::future::BoxFuture;
 use futures::FutureExt;
+use futures::future::BoxFuture;
 use std::any::Any;
 use std::fmt::Debug;
 use std::sync::Arc;

datafusion-tracing/src/instrument_rule.rs

@@ -31,6 +31,8 @@ use datafusion::{
     execution::{SendableRecordBatchStream, TaskContext},
     physical_expr::{Distribution, OrderingRequirements},
     physical_plan::{
+        DisplayAs, DisplayFormatType, ExecutionPlan, ExecutionPlanProperties,
+        PhysicalExpr, PlanProperties,
         execution_plan::{CardinalityEffect, InvariantLevel},
         filter_pushdown::{
             ChildPushdownResult, FilterDescription, FilterPushdownPhase,
@@ -39,8 +41,6 @@ use datafusion::{
         metrics::MetricsSet,
         projection::ProjectionExec,
         stream::RecordBatchStreamAdapter,
-        DisplayAs, DisplayFormatType, ExecutionPlan, ExecutionPlanProperties,
-        PhysicalExpr, PlanProperties,
     },
 };
 use delegate::delegate;
@@ -50,7 +50,7 @@ use std::{
     fmt::{self, Debug},
     sync::{Arc, OnceLock},
 };
-use tracing::{field, Span};
+use tracing::{Span, field};
 use tracing_futures::Instrument;
 
 /// Type alias for a function that creates a tracing span.

datafusion-tracing/src/instrumented.rs

@@ -26,7 +26,7 @@ use pin_project::pin_project;
 use std::pin::Pin;
 use std::sync::Arc;
 use std::task::{Context, Poll};
-use tracing::{field, Span};
+use tracing::{Span, field};
 
 /// Records execution metrics and automatically logs them via tracing upon completion.
 ///

datafusion-tracing/src/metrics.rs

@@ -27,7 +27,7 @@ use pin_project::pin_project;
 use std::pin::Pin;
 use std::sync::Arc;
 use std::task::{Context, Poll};
-use tracing::{field, Span};
+use tracing::{Span, field};
 
 /// Records the `datafusion.node` span field once execution completes across all
 /// partitions, when the value is fully qualified.

datafusion-tracing/src/node.rs

@@ -165,7 +165,7 @@ impl RecordBatchStream for PreviewRecordingStream {
 }
 
 fn default_preview_fn(batch: &RecordBatch) -> Result<String, ArrowError> {
-    pretty_format_batches(&[batch.clone()]).map(|b| b.to_string())
+    pretty_format_batches(std::slice::from_ref(batch)).map(|b| b.to_string())
 }
 
 impl PreviewRecorder {

datafusion-tracing/src/preview.rs

@@ -141,7 +141,7 @@ mod tests {
     use datafusion::arrow::datatypes::{DataType, Field, Schema};
     use datafusion::arrow::error::ArrowError;
     use datafusion::arrow::record_batch::RecordBatch;
-    use insta::{assert_snapshot, Settings};
+    use insta::{Settings, assert_snapshot};
     use std::sync::Arc;
 
     fn insta_settings() -> Settings {
@@ -206,7 +206,7 @@ mod tests {
         let description = Arc::new(StringArray::from(vec![
             "Paris is renowned as the City of Light, celebrated for its rich history, magnificent architecture, and vibrant arts scene. The city boasts iconic landmarks such as the Eiffel Tower and the Louvre, along with charming streets, quaint cafés, and a deep cultural heritage that continues to inspire artists, writers, and travelers from around the world.",
             "London is a dynamic and cosmopolitan metropolis that seamlessly blends its storied past with modern innovation. The city offers an array of historical sites, diverse neighborhoods, and world-class museums and theaters. Its bustling markets, green parks, and ever-evolving cultural scene make London a hub of creativity, commerce, and community life.",
-            "Barcelona is a lively coastal city known for its striking modernist architecture, Mediterranean beaches, and eclectic cultural offerings. From the whimsical creations of Antoni Gaudí to the vibrant street life and renowned culinary delights, Barcelona captivates visitors with its unique blend of historic charm and contemporary energy."
+            "Barcelona is a lively coastal city known for its striking modernist architecture, Mediterranean beaches, and eclectic cultural offerings. From the whimsical creations of Antoni Gaudí to the vibrant street life and renowned culinary delights, Barcelona captivates visitors with its unique blend of historic charm and contemporary energy.",
         ]));
         let city_name = Arc::new(StringArray::from(vec!["Paris", "London", "Barcelona"]));
         let emojis = Arc::new(StringArray::from(vec![

datafusion-tracing/src/preview_utils.rs

@@ -54,11 +54,11 @@ use std::time::Duration;
 
 use datafusion::{common::internal_datafusion_err, error::Result};
 use integration_utils::{init_session, run_traced_query};
-use opentelemetry::{trace::TracerProvider, KeyValue};
+use opentelemetry::{KeyValue, trace::TracerProvider};
 use opentelemetry_otlp::WithExportConfig;
-use opentelemetry_sdk::{trace::Sampler, Resource};
-use tracing::{instrument, Level};
-use tracing_subscriber::{fmt, prelude::*, Registry};
+use opentelemetry_sdk::{Resource, trace::Sampler};
+use tracing::{Level, instrument};
+use tracing_subscriber::{Registry, fmt, prelude::*};
 
 // Query to be executed for demonstration purposes.
 const QUERY_NAME: &str = "tpch_scrabble";

examples/otlp.rs

@@ -19,17 +19,17 @@
 
 use async_trait::async_trait;
 use bytes::Bytes;
-use futures::stream::BoxStream;
 use futures::StreamExt;
+use futures::stream::BoxStream;
 use object_store::{
-    path::Path, GetOptions, GetResult, ListResult, MultipartUpload, ObjectMeta,
-    ObjectStore, PutMultipartOptions, PutOptions, PutPayload, PutResult, Result,
-    UploadPart,
+    GetOptions, GetResult, ListResult, MultipartUpload, ObjectMeta, ObjectStore,
+    PutMultipartOptions, PutOptions, PutPayload, PutResult, Result, UploadPart,
+    path::Path,
 };
 use std::fmt::{Display, Formatter};
 use std::ops::Range;
 use std::sync::Arc;
-use tracing::{instrument, Span};
+use tracing::{Span, instrument};
 use tracing_futures::Instrument;
 
 /// Instruments the provided `ObjectStore` with tracing.