Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
d00b501
Serverless Trace Mini Agent (#124)
thedavl Apr 4, 2023
eaa5439
Mini Agent: add trace normalization, root span calculation, logging (…
thedavl Apr 10, 2023
d694acc
Mini Agent: Modify flushing logic, Serverless root span tags (#133)
thedavl Apr 25, 2023
16ae363
Mini Agent: Trace stats (#139)
thedavl Apr 28, 2023
6271ac7
Mini Agent: Verify GCP Env (#142)
thedavl May 1, 2023
a71b1de
Reformat License and add SPDX headers
bantonsson Mar 5, 2024
ebeba8a
Make verify timeout test in datadog-trace-mini-agent trigger timeout
bantonsson Apr 16, 2024
ba11dba
Enable all benchmarks
bantonsson Jul 9, 2024
5b52ba4
bump versions of datadog-serverless-trace-mini-agent and datadog-trac…
duncanpharvey Jul 11, 2024
4038cf3
[Serverless Mini Agent] Add _dd.mini_agent_version tag to all spans f…
duncanpharvey Jul 31, 2024
dbd4772
bump datadog-serverless-trace-mini-agent version to 0.6.0 (#555)
duncanpharvey Jul 31, 2024
efcf894
[Serverless Mini Agent] bump version to 0.6.1 (#575)
apiarian-datadog Aug 5, 2024
f51e7e9
[Serverless Mini Agent] Use DogStatsD in Serverless (#616)
duncanpharvey Sep 13, 2024
35c3bc1
bump datadog-serverless-trace-mini-agent version to 0.7.0 (#623)
duncanpharvey Sep 13, 2024
f8c7a2c
feat: Support DD_HTTP_PROXY and DD_HTTPS_PROXY (#631)
astuyve Sep 16, 2024
88b34c6
bump datadog-serverless-trace-mini-agent version to 0.7.1 (#633)
duncanpharvey Sep 16, 2024
c3d075c
bump datadog-serverless-trace-mini-agent version to 0.7.2 (#635)
duncanpharvey Sep 17, 2024
045f374
Upstream dogstatsd refactors (#617)
alexgallotta Sep 23, 2024
43006ed
Support http-proxy for trace agent, remove proxy from dsd (#658)
astuyve Oct 2, 2024
d89654e
bump datadog-serverless-trace-mini-agent version to 0.8.0 (#677)
duncanpharvey Oct 15, 2024
c671a6c
feat: Prefer DD_PROXY_HTTPS over HTTPS_PROXY (#673)
astuyve Oct 16, 2024
c38161a
Increase DogStatsD Buffer Size and Pattern Match Container Ids (#698)
duncanpharvey Oct 30, 2024
e46eaa8
bump datadog-serverless-trace-mini-agent version to 0.9.0 (#723)
duncanpharvey Nov 11, 2024
4e14f26
Svls 6036 set timeouts (#800)
alexgallotta Dec 19, 2024
d14d7fd
bump datadog-serverless-trace-mini-agent version to 0.10.0 (#824)
duncanpharvey Jan 15, 2025
956a13b
chore: [SVLS-5992] clearer dogstatsd Flusher API (#822)
apiarian-datadog Jan 16, 2025
1f00b03
Rename Mini Agent Version tag to Serverless Compat Version (#830)
duncanpharvey Jan 17, 2025
d9bc627
bump datadog-serverless-trace-mini-agent to 0.11.0 (#845)
duncanpharvey Jan 28, 2025
5b62b85
don't set serverless compat version from binary (#872)
duncanpharvey Feb 18, 2025
7145d39
bump datadog-serverless-trace-mini-agent to 0.12.0 (#873)
duncanpharvey Feb 18, 2025
23f9bd9
[trace-mini-agent] add trace aggregator (#907)
duncanista Mar 6, 2025
d5e453e
ekump/APMSP-1827 add warnings for panics (#915)
ekump Mar 14, 2025
33bedf2
Push retry strategy into client (#940)
astuyve Mar 19, 2025
eb31e49
Remove Serverless Specific DogStatsD Server Implementation (#973)
duncanpharvey Mar 26, 2025
e53a4c1
Add origin tag to metrics emitted from mini agent (#982)
duncanpharvey Apr 7, 2025
edba93e
chore(serverless): update components to drop hashbrown v0.14 (#1013)
morrisonlevi Apr 9, 2025
b3bf230
Add 'crates/datadog-serverless-trace-mini-agent/' from commit 'edba93…
duncanpharvey Apr 18, 2025
722593f
rename to serverless-compat, pin dependencies with libdatadog commit …
duncanpharvey Apr 16, 2025
f829c64
use trace_agent instead of datadog_trace_mini_agent
duncanpharvey Apr 16, 2025
a3b078a
remove version for datadog-serverless-compat
duncanpharvey Apr 18, 2025
b889a4f
add release profile
duncanpharvey Apr 18, 2025
fc0cb06
add description to datadog-serverless-compat crate
duncanpharvey Apr 21, 2025
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
64 changes: 63 additions & 1 deletion Cargo.lock

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

6 changes: 6 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,9 @@ edition = "2021"
license = "Apache-2.0"
homepage = "https://github.com/DataDog/serverless-components"
repository = "https://github.com/DataDog/serverless-components"

[profile.release]
opt-level = "z"
lto = true
codegen-units = 1
strip = true
22 changes: 22 additions & 0 deletions crates/serverless-compat/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[package]
name = "datadog-serverless-compat"
version = "0.1.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A description of what is this would be nice tho

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

description = "Binary to run trace-agent and dogstatsd servers in Serverless environments"

edition.workspace = true
license.workspace = true
description = "Binary to run trace-agent and dogstatsd servers in Serverless environments"

[dependencies]
log = "0.4"
env_logger = "0.10.0"
trace-agent = { path = "../trace-agent" }
datadog-trace-protobuf = { git = "https://github.com/DataDog/libdatadog/", rev = "3dab0bed2e144ce78c10a2378d1aff8fb5974f7d" }
datadog-trace-utils = { git = "https://github.com/DataDog/libdatadog/", rev = "3dab0bed2e144ce78c10a2378d1aff8fb5974f7d" }
dogstatsd = { path = "../dogstatsd", default-features = false }
tokio = { version = "1", features = ["macros", "rt-multi-thread"]}
tokio-util = { version = "0.7", default-features = false }
tracing = { version = "0.1", default-features = false }
tracing-core = { version = "0.1", default-features = false }
tracing-subscriber = { version = "0.3", default-features = false, features = ["std", "registry", "fmt", "env-filter", "tracing-log"] }

[[bin]]
name = "datadog-serverless-compat"
226 changes: 226 additions & 0 deletions crates/serverless-compat/src/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,226 @@
// Copyright 2023-Present Datadog, Inc. https://www.datadoghq.com/
// SPDX-License-Identifier: Apache-2.0

#![cfg_attr(not(test), deny(clippy::panic))]
#![cfg_attr(not(test), deny(clippy::unwrap_used))]
#![cfg_attr(not(test), deny(clippy::expect_used))]
#![cfg_attr(not(test), deny(clippy::todo))]
#![cfg_attr(not(test), deny(clippy::unimplemented))]

use env_logger::Builder;
use log::{debug, error, info};
use std::{env, str::FromStr, sync::Arc, sync::Mutex};
use tokio::{
sync::Mutex as TokioMutex,
time::{interval, Duration},
};
use tracing_subscriber::EnvFilter;

use trace_agent::{
aggregator::TraceAggregator,
config, env_verifier, mini_agent, stats_flusher, stats_processor,
trace_flusher::{self, TraceFlusher},
trace_processor,
};

use datadog_trace_utils::{config_utils::read_cloud_env, trace_utils::EnvironmentType};

use dogstatsd::{
aggregator::Aggregator as MetricsAggregator,
constants::CONTEXTS,
datadog::{MetricsIntakeUrlPrefix, RetryStrategy, Site},
dogstatsd::{DogStatsD, DogStatsDConfig},
flusher::{Flusher, FlusherConfig},
};

use dogstatsd::metric::{SortedTags, EMPTY_TAGS};
use tokio_util::sync::CancellationToken;

const DOGSTATSD_FLUSH_INTERVAL: u64 = 10;
const DOGSTATSD_TIMEOUT_DURATION: Duration = Duration::from_secs(5);
const DEFAULT_DOGSTATSD_PORT: u16 = 8125;
const AGENT_HOST: &str = "0.0.0.0";

#[tokio::main]
pub async fn main() {
let log_level = env::var("DD_LOG_LEVEL")
.map(|val| val.to_lowercase())
.unwrap_or("info".to_string());
let level_filter = log::LevelFilter::from_str(&log_level).unwrap_or(log::LevelFilter::Info);
Builder::new().filter_level(level_filter).init();

let (_, env_type) = match read_cloud_env() {
Some(value) => value,
None => {
error!("Unable to identify environment. Shutting down Mini Agent.");
return;
}
};

let dogstatsd_tags = match env_type {
EnvironmentType::CloudFunction => "origin:cloudfunction,dd.origin:cloudfunction",
EnvironmentType::AzureFunction => "origin:azurefunction,dd.origin:azurefunction",
EnvironmentType::AzureSpringApp => "origin:azurespringapp,dd.origin:azurespringapp",
EnvironmentType::LambdaFunction => "origin:lambda,dd.origin:lambda", // historical reasons
};

let dd_api_key: Option<String> = env::var("DD_API_KEY").ok();
let dd_dogstatsd_port: u16 = env::var("DD_DOGSTATSD_PORT")
.ok()
.and_then(|port| port.parse::<u16>().ok())
.unwrap_or(DEFAULT_DOGSTATSD_PORT);
let dd_site = env::var("DD_SITE").unwrap_or_else(|_| "datadoghq.com".to_string());
let dd_use_dogstatsd = env::var("DD_USE_DOGSTATSD")
.map(|val| val.to_lowercase() != "false")
.unwrap_or(true);

let https_proxy = env::var("DD_PROXY_HTTPS")
.or_else(|_| env::var("HTTPS_PROXY"))
.ok();
debug!("Starting serverless trace mini agent");

let env_filter = format!("h2=off,hyper=off,rustls=off,{}", log_level);

#[allow(clippy::expect_used)]
let subscriber = tracing_subscriber::fmt::Subscriber::builder()
.with_env_filter(
EnvFilter::try_new(env_filter).expect("could not parse log level in configuration"),
)
.with_level(true)
.with_thread_names(false)
.with_thread_ids(false)
.with_line_number(false)
.with_file(false)
.with_target(false)
.without_time()
.finish();

#[allow(clippy::expect_used)]
tracing::subscriber::set_global_default(subscriber).expect("setting default subscriber failed");

debug!("Logging subsystem enabled");

let env_verifier = Arc::new(env_verifier::ServerlessEnvVerifier::default());

let trace_processor = Arc::new(trace_processor::ServerlessTraceProcessor {});

let stats_flusher = Arc::new(stats_flusher::ServerlessStatsFlusher {});
let stats_processor = Arc::new(stats_processor::ServerlessStatsProcessor {});

let config = match config::Config::new() {
Ok(c) => Arc::new(c),
Err(e) => {
error!("Error creating config on serverless trace mini agent startup: {e}");
return;
}
};

let trace_aggregator = Arc::new(TokioMutex::new(TraceAggregator::default()));
let trace_flusher = Arc::new(trace_flusher::ServerlessTraceFlusher::new(
trace_aggregator,
Arc::clone(&config),
));

let mini_agent = Box::new(mini_agent::MiniAgent {
config: Arc::clone(&config),
env_verifier,
trace_processor,
trace_flusher,
stats_processor,
stats_flusher,
});

tokio::spawn(async move {
let res = mini_agent.start_mini_agent().await;
if let Err(e) = res {
error!("Error when starting serverless trace mini agent: {e:?}");
}
});

let mut metrics_flusher = if dd_use_dogstatsd {
debug!("Starting dogstatsd");
let (_, metrics_flusher) = start_dogstatsd(
dd_dogstatsd_port,
dd_api_key,
dd_site,
https_proxy,
dogstatsd_tags,
)
.await;
info!("dogstatsd-udp: starting to listen on port {dd_dogstatsd_port}");
metrics_flusher
} else {
info!("dogstatsd disabled");
None
};

let mut flush_interval = interval(Duration::from_secs(DOGSTATSD_FLUSH_INTERVAL));
flush_interval.tick().await; // discard first tick, which is instantaneous

loop {
flush_interval.tick().await;

if let Some(metrics_flusher) = metrics_flusher.as_mut() {
debug!("Flushing dogstatsd metrics");
metrics_flusher.flush().await;
}
}
}

async fn start_dogstatsd(
port: u16,
dd_api_key: Option<String>,
dd_site: String,
https_proxy: Option<String>,
dogstatsd_tags: &str,
) -> (CancellationToken, Option<Flusher>) {
#[allow(clippy::expect_used)]
let metrics_aggr = Arc::new(Mutex::new(
MetricsAggregator::new(
SortedTags::parse(dogstatsd_tags).unwrap_or(EMPTY_TAGS),
CONTEXTS,
)
.expect("Failed to create metrics aggregator"),
));

let dogstatsd_config = DogStatsDConfig {
host: AGENT_HOST.to_string(),
port,
};
let dogstatsd_cancel_token = tokio_util::sync::CancellationToken::new();
let dogstatsd_client = DogStatsD::new(
&dogstatsd_config,
Arc::clone(&metrics_aggr),
dogstatsd_cancel_token.clone(),
)
.await;

tokio::spawn(async move {
dogstatsd_client.spin().await;
});

let metrics_flusher = match dd_api_key {
Some(dd_api_key) => {
#[allow(clippy::expect_used)]
let metrics_flusher = Flusher::new(FlusherConfig {
api_key: dd_api_key,
aggregator: Arc::clone(&metrics_aggr),
metrics_intake_url_prefix: MetricsIntakeUrlPrefix::new(
Some(Site::new(dd_site).expect("Failed to parse site")),
None,
)
.expect("Failed to create intake URL prefix"),
https_proxy,
timeout: DOGSTATSD_TIMEOUT_DURATION,
retry_strategy: RetryStrategy::LinearBackoff(3, 1),
});
Some(metrics_flusher)
}
None => {
error!("DD_API_KEY not set, won't flush metrics");
None
}
};

(dogstatsd_cancel_token, metrics_flusher)
}
Loading