From 212ed98ebea80de2c96c67aa43dc8444c93af3ab Mon Sep 17 00:00:00 2001 From: Jan Eschbacher Date: Wed, 1 Apr 2026 21:02:02 +0200 Subject: [PATCH 1/2] enhancement: support DD_ENV_TYPE override for cloud environment detection --- crates/datadog-serverless-compat/src/main.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/crates/datadog-serverless-compat/src/main.rs b/crates/datadog-serverless-compat/src/main.rs index d50798f..010a684 100644 --- a/crates/datadog-serverless-compat/src/main.rs +++ b/crates/datadog-serverless-compat/src/main.rs @@ -50,7 +50,7 @@ pub async fn main() { .map(|val| val.to_lowercase()) .unwrap_or("info".to_string()); - let (_, env_type) = match read_cloud_env() { + let (_, mut env_type) = match read_cloud_env() { Some(value) => value, None => { error!("Unable to identify environment. Shutting down Mini Agent."); @@ -58,6 +58,15 @@ pub async fn main() { } }; + if let Ok(res) = env::var("DD_ENV_TYPE") { + match res.to_lowercase().as_str() { + "cloudfunction" => env_type = EnvironmentType::CloudFunction, + "azurefunction" => env_type = EnvironmentType::AzureFunction, + "azurespringapp" => env_type = EnvironmentType::AzureSpringApp, + _ => {} + } + } + let dogstatsd_tags = match env_type { EnvironmentType::CloudFunction => "origin:cloudfunction,dd.origin:cloudfunction", EnvironmentType::AzureFunction => "origin:azurefunction,dd.origin:azurefunction", From b8897922b3c01e48132508a827252d6e6d85a4d0 Mon Sep 17 00:00:00 2001 From: Jan Eschbacher Date: Fri, 3 Apr 2026 19:25:34 +0200 Subject: [PATCH 2/2] enhancement: added logging for env_type overwritting --- crates/datadog-serverless-compat/src/main.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/datadog-serverless-compat/src/main.rs b/crates/datadog-serverless-compat/src/main.rs index 010a684..b227c15 100644 --- a/crates/datadog-serverless-compat/src/main.rs +++ b/crates/datadog-serverless-compat/src/main.rs @@ -63,7 +63,9 @@ pub async fn main() { "cloudfunction" => env_type = EnvironmentType::CloudFunction, "azurefunction" => env_type = EnvironmentType::AzureFunction, "azurespringapp" => env_type = EnvironmentType::AzureSpringApp, - _ => {} + _ => { + debug!("DD_ENV_TYPE value not recognized, env_type not overwritten"); + } } }