Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ mini-agent:
- any-glob-to-any-file: [
'datadog-trace-normalization/**/*',
'datadog-trace-obfuscation/**/*',
'datadog-trace-utils/**/*',
'libdd-trace-utils/**/*',
]

telemetry:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
directory: [libdd-alloc, datadog-profiling, libdd-common-ffi, datadog-trace-utils]
directory: [libdd-alloc, datadog-profiling, libdd-common-ffi, libdd-trace-utils]
env:
CARGO_TERM_COLOR: always
steps:
Expand Down
84 changes: 42 additions & 42 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ members = [
"libdd-trace-normalization",
"datadog-trace-obfuscation",
"libdd-trace-protobuf",
"datadog-trace-utils",
"libdd-trace-utils",
"datadog-trace-stats",
"datadog-tracer-flare",
"libdd-common",
Expand Down
6 changes: 3 additions & 3 deletions LICENSE-3rdparty.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
root_name: builder, build_common, tools, libdd-alloc, datadog-crashtracker, libdd-common, libdd-telemetry, libdd-ddsketch, datadog-crashtracker-ffi, libdd-common-ffi, datadog-ffe, datadog-ipc, datadog-ipc-macros, libdd-tinybytes, tarpc, tarpc-plugins, spawn_worker, cc_utils, libdd-library-config, libdd-library-config-ffi, datadog-live-debugger, datadog-live-debugger-ffi, datadog-profiling, libdd-profiling-protobuf, datadog-profiling-ffi, data-pipeline-ffi, data-pipeline, datadog-trace-stats, datadog-trace-utils, libdd-trace-normalization, libdd-trace-protobuf, libdd-dogstatsd-client, libdd-log, libdd-ddsketch-ffi, libdd-log-ffi, libdd-telemetry-ffi, symbolizer-ffi, datadog-profiling-replayer, datadog-remote-config, datadog-sidecar, datadog-sidecar-macros, datadog-sidecar-ffi, datadog-trace-obfuscation, datadog-tracer-flare, sidecar_mockgen, test_spawn_from_lib
root_name: builder, build_common, tools, libdd-alloc, datadog-crashtracker, libdd-common, libdd-telemetry, libdd-ddsketch, datadog-crashtracker-ffi, libdd-common-ffi, datadog-ffe, datadog-ipc, datadog-ipc-macros, libdd-tinybytes, tarpc, tarpc-plugins, spawn_worker, cc_utils, libdd-library-config, libdd-library-config-ffi, datadog-live-debugger, datadog-live-debugger-ffi, datadog-profiling, libdd-profiling-protobuf, datadog-profiling-ffi, data-pipeline-ffi, data-pipeline, datadog-trace-stats, libdd-trace-protobuf, libdd-trace-utils, libdd-trace-normalization, libdd-dogstatsd-client, libdd-log, libdd-ddsketch-ffi, libdd-log-ffi, libdd-telemetry-ffi, symbolizer-ffi, datadog-profiling-replayer, datadog-remote-config, datadog-sidecar, datadog-sidecar-macros, datadog-sidecar-ffi, datadog-trace-obfuscation, datadog-tracer-flare, sidecar_mockgen, test_spawn_from_lib
third_party_libraries:
- package_name: addr2line
package_version: 0.24.2
Expand Down Expand Up @@ -27693,9 +27693,9 @@ third_party_libraries:
- package_name: stringmetrics
package_version: 2.2.2
repository: https://github.com/pluots/stringmetrics
license: License specified in file ($CARGO_HOME/registry/src/github.com-25cdd57fae9f0462/stringmetrics-2.2.2/LICENSE)
license: License specified in file ($CARGO_HOME/registry/src/index.crates.io-6f17d22bba15001f/stringmetrics-2.2.2/LICENSE)
licenses:
- license: License specified in file ($CARGO_HOME/registry/src/github.com-25cdd57fae9f0462/stringmetrics-2.2.2/LICENSE)
- license: License specified in file ($CARGO_HOME/registry/src/index.crates.io-6f17d22bba15001f/stringmetrics-2.2.2/LICENSE)
text: |
Copyright 2022 Trevor Gross

Expand Down
2 changes: 1 addition & 1 deletion data-pipeline-ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ build_common = { path = "../build-common" }
[dev-dependencies]
httpmock = "0.8.0-alpha.1"
rmp-serde = "1.1.1"
datadog-trace-utils = { path = "../datadog-trace-utils" }
libdd-trace-utils = { path = "../libdd-trace-utils" }

[dependencies]
data-pipeline = { path = "../data-pipeline" }
Expand Down
2 changes: 1 addition & 1 deletion data-pipeline-ffi/src/trace_exporter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -544,9 +544,9 @@ pub unsafe extern "C" fn ddog_trace_exporter_send(
mod tests {
use super::*;
use crate::error::ddog_trace_exporter_error_free;
use datadog_trace_utils::span::SpanSlice;
use httpmock::prelude::*;
use httpmock::MockServer;
use libdd_trace_utils::span::SpanSlice;
use std::{borrow::Borrow, mem::MaybeUninit};

#[test]
Expand Down
6 changes: 3 additions & 3 deletions data-pipeline/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ libdd-common = { version = "1.0.0", path = "../libdd-common", default-features =
libdd-telemetry = { version = "1.0.0", path = "../libdd-telemetry", default-features = false }
libdd-trace-protobuf = { version = "1.0.0", path = "../libdd-trace-protobuf" }
datadog-trace-stats = { path = "../datadog-trace-stats"}
datadog-trace-utils = { path = "../datadog-trace-utils", default-features = false }
libdd-trace-utils = { version = "1.0.0", path = "../libdd-trace-utils", default-features = false }
libdd-ddsketch = { version = "1.0.0", path = "../libdd-ddsketch" }
libdd-dogstatsd-client = { version = "1.0.0", path = "../libdd-dogstatsd-client", default-features = false }
libdd-tinybytes = { version = "1.0.0", path = "../libdd-tinybytes", features = [
Expand All @@ -50,7 +50,7 @@ bench = false
libdd-log = { path = "../libdd-log" }
clap = { version = "4.0", features = ["derive"] }
criterion = "0.5.1"
datadog-trace-utils = { path = "../datadog-trace-utils", features = [
libdd-trace-utils = { path = "../libdd-trace-utils", features = [
"test-utils",
] }
httpmock = "0.8.0-alpha.1"
Expand All @@ -68,7 +68,7 @@ default = ["https"]
https = [
"libdd-common/https",
"libdd-telemetry/https",
"datadog-trace-utils/https",
"libdd-trace-utils/https",
"libdd-dogstatsd-client/https",
]
test-utils = []
6 changes: 3 additions & 3 deletions data-pipeline/src/stats_exporter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ use std::{

use crate::trace_exporter::TracerMetadata;
use datadog_trace_stats::span_concentrator::SpanConcentrator;
use datadog_trace_utils::send_with_retry::{send_with_retry, RetryStrategy};
use hyper;
use libdd_common::{worker::Worker, Endpoint, HttpClient};
use libdd_trace_protobuf::pb;
use libdd_trace_utils::send_with_retry::{send_with_retry, RetryStrategy};
use tokio::select;
use tokio_util::sync::CancellationToken;
use tracing::error;
Expand Down Expand Up @@ -192,11 +192,11 @@ pub fn stats_url_from_agent_url(agent_url: &str) -> anyhow::Result<hyper::Uri> {
#[cfg(test)]
mod tests {
use super::*;
use datadog_trace_utils::span::{trace_utils, SpanSlice};
use datadog_trace_utils::test_utils::poll_for_mock_hit;
use httpmock::prelude::*;
use httpmock::MockServer;
use libdd_common::hyper_migration::new_default_client;
use libdd_trace_utils::span::{trace_utils, SpanSlice};
use libdd_trace_utils::test_utils::poll_for_mock_hit;
use time::Duration;
use time::SystemTime;

Expand Down
8 changes: 4 additions & 4 deletions data-pipeline/src/telemetry/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ pub mod error;
pub mod metrics;
use crate::telemetry::error::TelemetryError;
use crate::telemetry::metrics::Metrics;
use datadog_trace_utils::{
send_with_retry::{SendWithRetryError, SendWithRetryResult},
trace_utils::SendDataResult,
};
use libdd_common::tag::Tag;
use libdd_telemetry::worker::{
LifecycleAction, TelemetryActions, TelemetryWorker, TelemetryWorkerBuilder,
TelemetryWorkerFlavor, TelemetryWorkerHandle,
};
use libdd_trace_utils::{
send_with_retry::{SendWithRetryError, SendWithRetryResult},
trace_utils::SendDataResult,
};
use std::{collections::HashMap, time::Duration};
use tokio::runtime::Handle;

Expand Down
22 changes: 11 additions & 11 deletions data-pipeline/src/trace_exporter/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@ use crate::{
health_metrics::HealthMetric,
};
use arc_swap::{ArcSwap, ArcSwapOption};
use datadog_trace_utils::msgpack_decoder;
use datadog_trace_utils::send_with_retry::{
send_with_retry, RetryStrategy, SendWithRetryError, SendWithRetryResult,
};
use datadog_trace_utils::span::{Span, SpanText};
use datadog_trace_utils::trace_utils::TracerHeaderTags;
use http_body_util::BodyExt;
use hyper::http::uri::PathAndQuery;
use hyper::Uri;
Expand All @@ -44,6 +38,12 @@ use libdd_common::{tag, tag::Tag};
use libdd_common::{HttpClient, MutexExt};
use libdd_dogstatsd_client::Client;
use libdd_telemetry::worker::TelemetryWorker;
use libdd_trace_utils::msgpack_decoder;
use libdd_trace_utils::send_with_retry::{
send_with_retry, RetryStrategy, SendWithRetryError, SendWithRetryResult,
};
use libdd_trace_utils::span::{Span, SpanText};
use libdd_trace_utils::trace_utils::TracerHeaderTags;
use std::io;
use std::sync::{Arc, Mutex};
use std::time::Duration;
Expand Down Expand Up @@ -992,12 +992,12 @@ pub trait ResponseCallback {
mod tests {
use self::error::AgentErrorKind;
use super::*;
use datadog_trace_utils::msgpack_encoder;
use datadog_trace_utils::span::v05;
use datadog_trace_utils::span::SpanBytes;
use httpmock::prelude::*;
use httpmock::MockServer;
use libdd_tinybytes::{Bytes, BytesString};
use libdd_trace_utils::msgpack_encoder;
use libdd_trace_utils::span::v05;
use libdd_trace_utils::span::SpanBytes;
use std::collections::HashMap;
use std::net;
use std::time::Duration;
Expand Down Expand Up @@ -2003,9 +2003,9 @@ mod tests {
mod single_threaded_tests {
use super::*;
use crate::agent_info;
use datadog_trace_utils::msgpack_encoder;
use datadog_trace_utils::span::SpanBytes;
use httpmock::prelude::*;
use libdd_trace_utils::msgpack_encoder;
use libdd_trace_utils::span::SpanBytes;
use std::time::Duration;
use tokio::time::sleep;

Expand Down
Loading
Loading