Skip to content

Commit 2aab77f

Browse files
chore: check bottlecap with the latest libdatadog and serverless compats
1 parent b5a5cdf commit 2aab77f

File tree

4 files changed

+42
-73
lines changed

4 files changed

+42
-73
lines changed

bottlecap/Cargo.lock

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

bottlecap/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ ddsketch-agent = { version = "0.1.0", default-features = false, git = "https://g
1313
ddcommon = { git = "https://github.com/DataDog/libdatadog", branch = "aleksandr.pasechnik/svls-6242-fips-features-for-bottlecap"}
1414
datadog-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", branch = "aleksandr.pasechnik/svls-6242-fips-features-for-bottlecap" }
1515
datadog-trace-utils = { git = "https://github.com/DataDog/libdatadog", branch = "aleksandr.pasechnik/svls-6242-fips-features-for-bottlecap", features = ["compression"] }
16-
datadog-trace-mini-agent = { git = "https://github.com/DataDog/libdatadog", branch = "aleksandr.pasechnik/svls-6242-fips-features-for-bottlecap" }
1716
datadog-trace-normalization = { git = "https://github.com/DataDog/libdatadog", branch = "aleksandr.pasechnik/svls-6242-fips-features-for-bottlecap"}
1817
datadog-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", branch = "aleksandr.pasechnik/svls-6242-fips-features-for-bottlecap" }
1918
dogstatsd = { git = "https://github.com/DataDog/serverless-components", branch = "aleksandr.pasechnik/svls-6242-fips-builds", default-features = false }
19+
trace-agent = { git = "https://github.com/DataDog/serverless-components", branch = "aleksandr.pasechnik/svls-6242-fips-builds" }
2020
figment = { version = "0.10", default-features = false, features = ["yaml", "env"] }
2121
hyper = { version = "1.6", default-features = false, features = ["server"] }
2222
hyper-util = { version = "0.1.10", features = [

bottlecap/src/traces/stats_processor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use datadog_trace_protobuf::pb;
1313
use datadog_trace_utils::stats_utils;
1414

1515
use super::trace_agent::MAX_CONTENT_LENGTH;
16-
use datadog_trace_mini_agent::http_utils::{self, log_and_create_http_response};
16+
use trace_agent::http_utils::{self, log_and_create_http_response};
1717

1818
#[async_trait]
1919
pub trait StatsProcessor {

bottlecap/src/traces/trace_agent.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ use crate::tags::provider;
2424
use crate::traces::{
2525
stats_aggregator, stats_processor, trace_aggregator, trace_processor, INVOCATION_SPAN_RESOURCE,
2626
};
27-
use datadog_trace_mini_agent::http_utils::{
28-
self, log_and_create_http_response, log_and_create_traces_success_http_response,
29-
};
3027
use datadog_trace_protobuf::pb;
3128
use datadog_trace_utils::trace_utils::{self, SendData};
29+
use trace_agent::http_utils::{
30+
self, log_and_create_http_response, log_and_create_traces_success_http_response,
31+
};
3232

3333
const TRACE_AGENT_PORT: usize = 8126;
3434
const V4_TRACE_ENDPOINT_PATH: &str = "/v0.4/traces";

0 commit comments

Comments
 (0)