Skip to content

Commit b97e18e

Browse files
feat: update Rust version
1 parent f0aee9e commit b97e18e

File tree

14 files changed

+221
-220
lines changed

14 files changed

+221
-220
lines changed

Cargo.lock

Lines changed: 195 additions & 194 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ resolver = "2"
3030
[workspace.package]
3131
description = "DataFusion tracing of execution plans"
3232
version = "50.0.2"
33-
edition = "2021"
33+
edition = "2024"
3434
license = "Apache-2.0"
3535
repository = "https://github.com/datafusion-contrib/datafusion-tracing"
3636
authors = ["DataDog <[email protected]>"]
37-
rust-version = "1.82.0"
37+
rust-version = "1.86.0"
3838

3939
[workspace.dependencies]
4040
datafusion = { version = "50.0.0", default-features = false }

datafusion-tracing/src/instrument_rule.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
use crate::instrumented::InstrumentedExec;
2121
use crate::instrumented::SpanCreateFn;
2222
use crate::options::InstrumentationOptions;
23-
use datafusion::common::runtime::{set_join_set_tracer, JoinSetTracer};
23+
use datafusion::common::runtime::{JoinSetTracer, set_join_set_tracer};
2424
use datafusion::common::tree_node::{Transformed, TransformedResult, TreeNode};
2525
use datafusion::{
2626
config::ConfigOptions, physical_optimizer::PhysicalOptimizerRule,
2727
physical_plan::ExecutionPlan,
2828
};
29-
use futures::future::BoxFuture;
3029
use futures::FutureExt;
30+
use futures::future::BoxFuture;
3131
use std::any::Any;
3232
use std::fmt::Debug;
3333
use std::sync::Arc;

datafusion-tracing/src/instrumented.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ use datafusion::{
3131
execution::{SendableRecordBatchStream, TaskContext},
3232
physical_expr::{Distribution, OrderingRequirements},
3333
physical_plan::{
34+
DisplayAs, DisplayFormatType, ExecutionPlan, ExecutionPlanProperties,
35+
PhysicalExpr, PlanProperties,
3436
execution_plan::{CardinalityEffect, InvariantLevel},
3537
filter_pushdown::{
3638
ChildPushdownResult, FilterDescription, FilterPushdownPhase,
@@ -39,8 +41,6 @@ use datafusion::{
3941
metrics::MetricsSet,
4042
projection::ProjectionExec,
4143
stream::RecordBatchStreamAdapter,
42-
DisplayAs, DisplayFormatType, ExecutionPlan, ExecutionPlanProperties,
43-
PhysicalExpr, PlanProperties,
4444
},
4545
};
4646
use delegate::delegate;
@@ -50,7 +50,7 @@ use std::{
5050
fmt::{self, Debug},
5151
sync::{Arc, OnceLock},
5252
};
53-
use tracing::{field, Span};
53+
use tracing::{Span, field};
5454
use tracing_futures::Instrument;
5555

5656
/// Type alias for a function that creates a tracing span.

datafusion-tracing/src/metrics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use pin_project::pin_project;
2626
use std::pin::Pin;
2727
use std::sync::Arc;
2828
use std::task::{Context, Poll};
29-
use tracing::{field, Span};
29+
use tracing::{Span, field};
3030

3131
/// Records execution metrics and automatically logs them via tracing upon completion.
3232
///

datafusion-tracing/src/node.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use pin_project::pin_project;
2727
use std::pin::Pin;
2828
use std::sync::Arc;
2929
use std::task::{Context, Poll};
30-
use tracing::{field, Span};
30+
use tracing::{Span, field};
3131

3232
/// Records the `datafusion.node` span field once execution completes across all
3333
/// partitions, when the value is fully qualified.

datafusion-tracing/src/preview.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ impl RecordBatchStream for PreviewRecordingStream {
165165
}
166166

167167
fn default_preview_fn(batch: &RecordBatch) -> Result<String, ArrowError> {
168-
pretty_format_batches(&[batch.clone()]).map(|b| b.to_string())
168+
pretty_format_batches(std::slice::from_ref(batch)).map(|b| b.to_string())
169169
}
170170

171171
impl PreviewRecorder {

datafusion-tracing/src/preview_utils.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ mod tests {
141141
use datafusion::arrow::datatypes::{DataType, Field, Schema};
142142
use datafusion::arrow::error::ArrowError;
143143
use datafusion::arrow::record_batch::RecordBatch;
144-
use insta::{assert_snapshot, Settings};
144+
use insta::{Settings, assert_snapshot};
145145
use std::sync::Arc;
146146

147147
fn insta_settings() -> Settings {
@@ -206,7 +206,7 @@ mod tests {
206206
let description = Arc::new(StringArray::from(vec![
207207
"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.",
208208
"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.",
209-
"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."
209+
"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.",
210210
]));
211211
let city_name = Arc::new(StringArray::from(vec!["Paris", "London", "Barcelona"]));
212212
let emojis = Arc::new(StringArray::from(vec![

examples/otlp.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ use std::time::Duration;
5454

5555
use datafusion::{common::internal_datafusion_err, error::Result};
5656
use integration_utils::{init_session, run_traced_query};
57-
use opentelemetry::{trace::TracerProvider, KeyValue};
57+
use opentelemetry::{KeyValue, trace::TracerProvider};
5858
use opentelemetry_otlp::WithExportConfig;
59-
use opentelemetry_sdk::{trace::Sampler, Resource};
60-
use tracing::{instrument, Level};
61-
use tracing_subscriber::{fmt, prelude::*, Registry};
59+
use opentelemetry_sdk::{Resource, trace::Sampler};
60+
use tracing::{Level, instrument};
61+
use tracing_subscriber::{Registry, fmt, prelude::*};
6262

6363
// Query to be executed for demonstration purposes.
6464
const QUERY_NAME: &str = "tpch_scrabble";

instrumented-object-store/src/instrumented_object_store.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919

2020
use async_trait::async_trait;
2121
use bytes::Bytes;
22-
use futures::stream::BoxStream;
2322
use futures::StreamExt;
23+
use futures::stream::BoxStream;
2424
use object_store::{
25-
path::Path, GetOptions, GetResult, ListResult, MultipartUpload, ObjectMeta,
26-
ObjectStore, PutMultipartOptions, PutOptions, PutPayload, PutResult, Result,
27-
UploadPart,
25+
GetOptions, GetResult, ListResult, MultipartUpload, ObjectMeta, ObjectStore,
26+
PutMultipartOptions, PutOptions, PutPayload, PutResult, Result, UploadPart,
27+
path::Path,
2828
};
2929
use std::fmt::{Display, Formatter};
3030
use std::ops::Range;
3131
use std::sync::Arc;
32-
use tracing::{instrument, Span};
32+
use tracing::{Span, instrument};
3333
use tracing_futures::Instrument;
3434

3535
/// Instruments the provided `ObjectStore` with tracing.

0 commit comments

Comments
 (0)