Skip to content

Commit f1aef49

Browse files
committed
lint
1 parent 4befd67 commit f1aef49

File tree

4 files changed

+23
-16
lines changed

4 files changed

+23
-16
lines changed

bottlecap/src/lifecycle/invocation/triggers/s3_event.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use crate::lifecycle::invocation::{
1010
processor::MS_TO_NS,
1111
triggers::{ServiceNameResolver, Trigger, FUNCTION_TRIGGER_EVENT_SOURCE_TAG},
1212
};
13-
use crate::span_pointers::{SpanPointer, generate_span_pointer_hash};
13+
use crate::span_pointers::{generate_span_pointer_hash, SpanPointer};
1414

1515
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
1616
pub struct S3Event {

bottlecap/src/span_pointers/helpers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use sha2::{Sha256, Digest};
1+
use sha2::{Digest, Sha256};
22

33
#[derive(Clone)]
44
pub struct SpanPointer {

bottlecap/src/span_pointers/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
mod helpers;
2-
pub use helpers::SpanPointer;
32
pub use helpers::generate_span_pointer_hash;
3+
pub use helpers::SpanPointer;

bottlecap/src/traces/trace_processor.rs

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ use std::str::FromStr;
1212
use std::sync::Arc;
1313

1414
use crate::config;
15+
use crate::span_pointers::SpanPointer;
1516
use crate::traces::{
1617
AWS_XRAY_DAEMON_ADDRESS_URL_PREFIX, DNS_LOCAL_HOST_ADDRESS_URL_PREFIX,
1718
DNS_NON_ROUTABLE_ADDRESS_URL_PREFIX, INVOCATION_SPAN_RESOURCE, LAMBDA_EXTENSION_URL_PREFIX,
@@ -22,7 +23,6 @@ use datadog_trace_protobuf::pb::Span;
2223
use datadog_trace_utils::trace_utils::SendData;
2324
use datadog_trace_utils::trace_utils::{self};
2425
use serde_json::{json, Value};
25-
use crate::span_pointers::SpanPointer;
2626

2727
#[derive(Clone)]
2828
#[allow(clippy::module_name_repetitions)]
@@ -58,20 +58,21 @@ impl TraceChunkProcessor for ChunkProcessor {
5858
.iter()
5959
.map(|sp| {
6060
json!({
61-
"attributes": {
62-
"link.kind": "span-pointer",
63-
"ptr.dir": "u",
64-
"ptr.hash": sp.hash,
65-
"ptr.kind": sp.kind,
66-
},
67-
"span_id": "0",
68-
"trace_id": "0"
69-
})
61+
"attributes": {
62+
"link.kind": "span-pointer",
63+
"ptr.dir": "u",
64+
"ptr.hash": sp.hash,
65+
"ptr.kind": sp.kind,
66+
},
67+
"span_id": "0",
68+
"trace_id": "0"
69+
})
7070
})
7171
.collect();
7272

7373
if let Ok(span_links_json) = serde_json::to_string(&span_links) {
74-
span.meta.insert("_dd.span_links".to_string(), span_links_json);
74+
span.meta
75+
.insert("_dd.span_links".to_string(), span_links_json);
7576
}
7677
}
7778
}
@@ -301,8 +302,14 @@ mod tests {
301302
};
302303
let config = create_test_config();
303304
let tags_provider = create_tags_provider(config.clone());
304-
let tracer_payload =
305-
trace_processor.process_traces(config, tags_provider.clone(), header_tags, traces, 100, None);
305+
let tracer_payload = trace_processor.process_traces(
306+
config,
307+
tags_provider.clone(),
308+
header_tags,
309+
traces,
310+
100,
311+
None
312+
);
306313

307314
let expected_tracer_payload = pb::TracerPayload {
308315
container_id: "33".to_string(),

0 commit comments

Comments
 (0)