Skip to content

Commit 74c7cb7

Browse files
committed
Fix formatting.
1 parent 0960f25 commit 74c7cb7

File tree

12 files changed

+17
-23
lines changed

12 files changed

+17
-23
lines changed

datadog-sidecar-ffi/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use crate::span::TracesBytes;
1313
use datadog_ipc::platform::{
1414
FileBackedHandle, MappedMem, NamedShmHandle, PlatformHandle, ShmHandle,
1515
};
16-
use libdd_live_debugger::debugger_defs::DebuggerPayload;
1716
use datadog_remote_config::fetch::ConfigInvariants;
1817
use datadog_remote_config::{RemoteConfigCapabilities, RemoteConfigProduct, Target};
1918
use datadog_sidecar::agent_remote_config::{
@@ -39,6 +38,7 @@ use libdd_common_ffi::{self as ffi, MaybeError};
3938
#[cfg(windows)]
4039
use libdd_crashtracker_ffi::Metadata;
4140
use libdd_dogstatsd_client::DogStatsDActionOwned;
41+
use libdd_live_debugger::debugger_defs::DebuggerPayload;
4242
use libdd_telemetry::{
4343
data::{self, Dependency, Integration},
4444
worker::{LifecycleAction, LogIdentifier, TelemetryActions},

datadog-sidecar/src/service/blocking.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ use super::{
77
};
88
use datadog_ipc::platform::{Channel, FileBackedHandle, ShmHandle};
99
use datadog_ipc::transport::blocking::BlockingTransport;
10-
use libdd_live_debugger::debugger_defs::DebuggerPayload;
11-
use libdd_live_debugger::sender::DebuggerType;
1210
use libdd_common::tag::Tag;
1311
use libdd_common::MutexExt;
1412
use libdd_dogstatsd_client::DogStatsDActionOwned;
13+
use libdd_live_debugger::debugger_defs::DebuggerPayload;
14+
use libdd_live_debugger::sender::DebuggerType;
1515
use serde::Serialize;
1616
use std::sync::{Mutex, MutexGuard};
1717
use std::{

datadog-sidecar/src/service/debugger_diagnostics_bookkeeper.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
// Copyright 2021-Present Datadog, Inc. https://www.datadoghq.com/
22
// SPDX-License-Identifier: Apache-2.0
3-
use libdd_live_debugger::debugger_defs::{
4-
DebuggerData, DebuggerPayload, Diagnostics, ProbeStatus,
5-
};
63
use libdd_common::MutexExt;
4+
use libdd_live_debugger::debugger_defs::{DebuggerData, DebuggerPayload, Diagnostics, ProbeStatus};
75
use serde::{Deserialize, Serialize};
86
use std::collections::HashMap;
97
use std::sync::{Arc, Mutex};

datadog-sidecar/src/service/runtime_info.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use crate::service::session_info::SessionInfo;
66
use crate::service::{
77
remote_configs::RemoteConfigsGuard, DynamicInstrumentationConfigState, InstanceId, QueueId,
88
};
9-
use libdd_live_debugger::sender::{generate_tags, PayloadSender};
109
use libdd_common::{tag::Tag, MutexExt};
10+
use libdd_live_debugger::sender::{generate_tags, PayloadSender};
1111
use simd_json::prelude::ArrayTrait;
1212
use std::collections::HashMap;
1313
use std::fmt::Display;

datadog-sidecar/src/service/session_info.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ use futures::future;
1212

1313
use crate::log::{MultiEnvFilterGuard, MultiWriterGuard};
1414
use crate::{spawn_map_err, tracer};
15-
use libdd_live_debugger::sender::{DebuggerType, PayloadSender};
1615
use datadog_remote_config::fetch::ConfigOptions;
1716
use libdd_common::MutexExt;
17+
use libdd_live_debugger::sender::{DebuggerType, PayloadSender};
1818
use tracing::log::warn;
1919
use tracing::{debug, error, info, trace};
2020

datadog-sidecar/src/service/sidecar_interface.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ use crate::service::{
1010
use anyhow::Result;
1111
use datadog_ipc::platform::ShmHandle;
1212
use datadog_ipc::tarpc;
13-
use libdd_live_debugger::sender::DebuggerType;
1413
use libdd_common::tag::Tag;
1514
use libdd_dogstatsd_client::DogStatsDActionOwned;
15+
use libdd_live_debugger::sender::DebuggerType;
1616
use serde::{Deserialize, Serialize};
1717
use std::time::Duration;
1818

datadog-sidecar/src/service/sidecar_server.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,10 @@ use crate::service::tracing::trace_flusher::TraceFlusherStats;
4747
use crate::tokio_util::run_or_spawn_shared;
4848
use datadog_ipc::platform::FileBackedHandle;
4949
use datadog_ipc::tarpc::server::{Channel, InFlightRequest};
50-
use libdd_live_debugger::sender::{
51-
agent_info_supports_dedicated_snapshots_endpoint, DebuggerType,
52-
};
5350
use datadog_remote_config::fetch::{ConfigInvariants, ConfigOptions, MultiTargetStats};
5451
use libdd_common::tag::Tag;
5552
use libdd_dogstatsd_client::{new, DogStatsDActionOwned};
53+
use libdd_live_debugger::sender::{agent_info_supports_dedicated_snapshots_endpoint, DebuggerType};
5654
use libdd_telemetry::config::Config;
5755
use libdd_tinybytes as tinybytes;
5856
use libdd_trace_utils::tracer_header_tags::TracerHeaderTags;

libdd-live-debugger-ffi/src/data.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Unless explicitly stated otherwise all files in this repository are licensed under the Apache
22
// License Version 2.0. This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021-Present Datadog, Inc.
33

4+
use libdd_common_ffi::slice::AsBytes;
5+
use libdd_common_ffi::{CharSlice, Option};
46
use libdd_live_debugger::debugger_defs::{ProbeMetadata, ProbeMetadataLocation, ProbeStatus};
57
use libdd_live_debugger::{
68
CaptureConfiguration, DslString, EvaluateAt, InBodyLocation, MetricKind, ProbeCondition,
79
ProbeValue, SpanProbeTarget,
810
};
9-
use libdd_common_ffi::slice::AsBytes;
10-
use libdd_common_ffi::{CharSlice, Option};
1111
use std::borrow::Cow;
1212

1313
#[repr(C)]

libdd-live-debugger-ffi/src/evaluator.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Unless explicitly stated otherwise all files in this repository are licensed under the Apache
22
// License Version 2.0. This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021-Present Datadog, Inc.
33

4-
use libdd_live_debugger::debugger_defs::SnapshotEvaluationError;
5-
use libdd_live_debugger::{DslString, ProbeCondition, ProbeValue, ResultError, ResultValue};
64
use libdd_common_ffi::slice::AsBytes;
75
use libdd_common_ffi::CharSlice;
6+
use libdd_live_debugger::debugger_defs::SnapshotEvaluationError;
7+
use libdd_live_debugger::{DslString, ProbeCondition, ProbeValue, ResultError, ResultValue};
88
use std::borrow::Cow;
99
use std::ffi::c_void;
1010

libdd-live-debugger-ffi/src/parse.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ pub unsafe extern "C" fn ddog_parse_live_debugger_json(
2323
// we have the box. Rust doesn't allow us to specify a self-referential struct, so
2424
// pretend it's 'static
2525
data: unsafe {
26-
std::mem::transmute::<&_, &'static libdd_live_debugger::LiveDebuggingData>(
27-
&*parsed,
28-
)
26+
std::mem::transmute::<&_, &'static libdd_live_debugger::LiveDebuggingData>(&*parsed)
2927
}
3028
.into(),
3129
opaque_data: Some(parsed),

0 commit comments

Comments
 (0)