Skip to content

Commit 748adeb

Browse files
* Fix licenses
* Fix clippy * Fix Dockerfile
1 parent 073e081 commit 748adeb

File tree

7 files changed

+32
-11
lines changed

7 files changed

+32
-11
lines changed

data-pipeline-ffi/src/stats_exporter.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2024-Present Datadog, Inc. https://www.datadoghq.com/
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
use std::{ptr::NonNull, time};
25

36
use crate::try_c;

data-pipeline/examples/stats_exporter_example.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2024-Present Datadog, Inc. https://www.datadoghq.com/
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
use std::{time::Duration, vec};
25

36
use data_pipeline::stats_exporter::{blocking, Configuration, LibraryMetadata, SpanStats};

data-pipeline/src/stats_exporter.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2024-Present Datadog, Inc. https://www.datadoghq.com/
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
use std::{
25
collections::HashMap,
36
ops::DerefMut,

tools/docker/Dockerfile.build

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,9 @@ COPY "ipc/tarpc/plugins/Cargo.toml" "ipc/tarpc/plugins/"
105105
COPY "data-pipeline/Cargo.toml" "data-pipeline/"
106106
COPY "data-pipeline-ffi/Cargo.toml" "data-pipeline-ffi/"
107107
COPY "bin_tests/Cargo.toml" "bin_tests/"
108+
COPY "ddsketch/Cargo.toml" "ddsketch/"
108109
RUN find -name "Cargo.toml" | sed -e s#Cargo.toml#src/lib.rs#g | xargs -n 1 sh -c 'mkdir -p $(dirname $1); touch $1; echo $1' create_stubs
109-
RUN echo profiling/benches/main.rs profiling/benches/interning_strings.rs trace-obfuscation/benches/trace_obfuscation.rs tools/src/bin/dedup_headers.rs tools/sidecar_mockgen/src/bin/sidecar_mockgen.rs ddtelemetry/examples/tm-worker-test.rs ipc/tarpc/tarpc/examples/compression.rs ipc/tarpc/tarpc/examples/custom_transport.rs ipc/tarpc/tarpc/examples/pubsub.rs ipc/tarpc/tarpc/examples/readme.rs ipc/tarpc/tarpc/examples/tracing.rs ipc/tarpc/tarpc/tests/compile_fail.rs ipc/tarpc/tarpc/tests/dataservice.rs ipc/tarpc/tarpc/tests/service_functional.rs bin_tests/src/bin/crashtracker_bin_test.rs bin_tests/src/bin/test_the_tests.rs | xargs -n 1 sh -c 'mkdir -p $(dirname $1); touch $1; echo $1' create_stubs
110+
RUN echo trace-normalization/benches/normalization_utils.rs profiling/benches/main.rs profiling/benches/interning_strings.rs trace-obfuscation/benches/credit_cards_bench.rs trace-obfuscation/benches/replace_trace_tags_bench.rs trace-obfuscation/benches/trace_obfuscation.rs tools/src/bin/dedup_headers.rs tools/sidecar_mockgen/src/bin/sidecar_mockgen.rs ddtelemetry/examples/tm-worker-test.rs ipc/benches/ipc.rs ipc/tarpc/tarpc/examples/compression.rs ipc/tarpc/tarpc/examples/custom_transport.rs ipc/tarpc/tarpc/examples/pubsub.rs ipc/tarpc/tarpc/examples/readme.rs ipc/tarpc/tarpc/examples/tracing.rs ipc/tarpc/tarpc/tests/compile_fail.rs ipc/tarpc/tarpc/tests/dataservice.rs ipc/tarpc/tarpc/tests/service_functional.rs bin_tests/src/bin/crashtracker_bin_test.rs bin_tests/src/bin/test_the_tests.rs | xargs -n 1 sh -c 'mkdir -p $(dirname $1); touch $1; echo $1' create_stubs
110111

111112
# cache dependencies
112113
RUN cargo fetch --locked

trace-normalization/benches/normalization_utils.rs

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
// Copyright 2024-Present Datadog, Inc. https://www.datadoghq.com/
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
use criterion::{criterion_group, criterion_main, BatchSize, BenchmarkId, Criterion};
25

36
fn normalize_service_bench(c: &mut Criterion) {
7+
let mut group = c.benchmark_group("normalization");
48
let cases = &[
59
("#test_starting_hash", "test_starting_hash"),
610
("TestCAPSandSuch", "testcapsandsuch"),
@@ -46,7 +50,7 @@ fn normalize_service_bench(c: &mut Criterion) {
4650
),
4751
];
4852

49-
c.bench_function("normalize_service", |b| {
53+
group.bench_function("normalize_service", |b| {
5054
b.iter_batched_ref(
5155
|| cases.iter().map(|(c, _)| c.to_string()).collect::<Vec<_>>(),
5256
|cases| {
@@ -60,20 +64,24 @@ fn normalize_service_bench(c: &mut Criterion) {
6064
}
6165

6266
fn normalize_name_bench(c: &mut Criterion) {
67+
let mut group = c.benchmark_group("normalization");
6368
let cases = &[
6469
"good",
6570
"bad-name",
6671
"Too-Long-.Too-Long-.Too-Long-.Too-Long-.Too-Long-.Too-Long-.Too-Long-.Too-Long-.Too-Long-.Too-Long-.Too-Long-.",
6772
];
68-
let mut group = c.benchmark_group("normalize_name");
6973
for case in cases {
70-
group.bench_with_input(BenchmarkId::new("", case), *case, |b, case| {
71-
b.iter_batched_ref(
72-
|| case.to_owned(),
73-
|c| datadog_trace_normalization::normalize_utils::normalize_name(c),
74-
BatchSize::NumIterations(100000),
75-
)
76-
});
74+
group.bench_with_input(
75+
BenchmarkId::new("normalize_name", case),
76+
*case,
77+
|b, case| {
78+
b.iter_batched_ref(
79+
|| case.to_owned(),
80+
datadog_trace_normalization::normalize_utils::normalize_name,
81+
BatchSize::NumIterations(100000),
82+
)
83+
},
84+
);
7785
}
7886
}
7987

trace-normalization/src/normalize_utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2023-Present Datadog, Inc. https://www.datadoghq.com/
1+
// Copyright 2024-Present Datadog, Inc. https://www.datadoghq.com/
22
// SPDX-License-Identifier: Apache-2.0
33

44
use std::time::SystemTime;

trace-normalization/src/utf8_helpers.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2024-Present Datadog, Inc. https://www.datadoghq.com/
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
/// Taken from the source of
25
/// https://doc.rust-lang.org/std/primitive.str.html#method.floor_char_boundary
36
/// TODO remove when str::floor_char_boundary is stable

0 commit comments

Comments
 (0)