Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Serverless Mini Agent] Run in Azure Spring Apps #547

Merged
merged 12 commits into from
Jul 31, 2024
Merged

[Serverless Mini Agent] Run in Azure Spring Apps #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
45ddd11
add azure spring app environment type for serverless mini agent
duncanpharvey Jun 28, 2024
228161d
add config.statsd_port to mini agent info endpoint
duncanpharvey Jul 19, 2024
abed5b4
Merge tag 'sls-v0.5.0' into duncan-harvey/azure-spring
duncanpharvey Jul 19, 2024
0720004
update mini agent trace endpoint status code and response body to wor…
duncanpharvey Jul 24, 2024
ac071e5
use different environment variable to identify azure spring apps
duncanpharvey Jul 24, 2024
8919f25
only update http response for success responses to traces endpoint
duncanpharvey Jul 24, 2024
75cf587
address lint errors
duncanpharvey Jul 24, 2024
7838780
updates comment and formatting
duncanpharvey Jul 24, 2024
c92dd83
Merge branch 'main' into duncan-harvey/azure-spring
duncanpharvey Jul 24, 2024
0634c33
update trace-mini-agent description to include Azure Spring Apps
duncanpharvey Jul 31, 2024
540c5b5
Merge branch 'main' into duncan-harvey/azure-spring
duncanpharvey Jul 31, 2024
a277c71
fix formatting
duncanpharvey Jul 31, 2024
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 trace-mini-agent/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "datadog-trace-mini-agent"
description = "A subset of the trace agent that is shipped alongside tracers in a few serverless use cases (Google Cloud Functions and Azure Functions)"
description = "A subset of the trace agent that is shipped alongside tracers in a few serverless use cases (Google Cloud Functions, Azure Functions, and Azure Spring Apps)"
edition.workspace = true
version.workspace = true
rust-version.workspace = true
Expand Down
3 changes: 3 additions & 0 deletions trace-mini-agent/src/env_verifier.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@ impl EnvVerifier for ServerlessEnvVerifier {
.verify_gcp_environment_or_exit(verify_env_timeout)
.await;
}
trace_utils::EnvironmentType::AzureSpringApp => {
trace_utils::MiniAgentMetadata::default()
}
trace_utils::EnvironmentType::LambdaFunction => {
trace_utils::MiniAgentMetadata::default()
}
Expand Down
20 changes: 20 additions & 0 deletions trace-mini-agent/src/http_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,26 @@ pub fn log_and_create_http_response(
Response::builder().status(status).body(Body::from(body))
}

/// Does two things:
/// 1. Logs the given message
/// 2. Returns the rate_by_service map to use to set the sampling priority in the body of JSON
/// response with the given status code.
///
/// Response body format:
/// {
/// "rate_by_service": {
/// "service:,env:":1
/// }
/// }
pub fn log_and_create_traces_success_http_response(
message: &str,
status: StatusCode,
) -> http::Result<Response<Body>> {
info!("{message}");
let body = json!({"rate_by_service":{"service:,env:":1}}).to_string();
Response::builder().status(status).body(Body::from(body))
}

/// Takes a request's header map, and verifies that the "content-length" header is present, valid,
/// and less than the given max_content_length.
///
Expand Down
3 changes: 3 additions & 0 deletions trace-mini-agent/src/mini_agent.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,9 @@ impl MiniAgent {
INFO_ENDPOINT_PATH
],
"client_drop_p0s": true,
"config": {
"statsd_port": MINI_AGENT_PORT
}
}
);
Response::builder()
Expand Down
6 changes: 3 additions & 3 deletions trace-mini-agent/src/trace_processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use datadog_trace_utils::tracer_payload::TraceEncoding;

use crate::{
config::Config,
http_utils::{self, log_and_create_http_response},
http_utils::{self, log_and_create_http_response, log_and_create_traces_success_http_response},
};

#[async_trait]
Expand Down Expand Up @@ -105,9 +105,9 @@ impl TraceProcessor for ServerlessTraceProcessor {
// send trace payload to our trace flusher
match tx.send(send_data).await {
Ok(_) => {
return log_and_create_http_response(
return log_and_create_traces_success_http_response(
"Successfully buffered traces to be flushed.",
StatusCode::ACCEPTED,
StatusCode::OK,
);
}
Err(err) => {
Expand Down
4 changes: 4 additions & 0 deletions trace-utils/src/config_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ pub fn read_cloud_env() -> Option<(String, trace_utils::EnvironmentType)> {
// Set by Azure Functions
return Some((res, trace_utils::EnvironmentType::AzureFunction));
}
if let Ok(res) = env::var("ASCSVCRT_SPRING__APPLICATION__NAME") {
// Set by Azure Spring Apps
return Some((res, trace_utils::EnvironmentType::AzureSpringApp));
}
None
}

Expand Down
2 changes: 2 additions & 0 deletions trace-utils/src/trace_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,7 @@ pub fn set_serverless_root_span_tags(
let origin_tag = match env_type {
EnvironmentType::CloudFunction => "cloudfunction",
EnvironmentType::AzureFunction => "azurefunction",
EnvironmentType::AzureSpringApp => "azurespringapp",
EnvironmentType::LambdaFunction => "lambda", // historical reasons
};
span.meta
Expand All @@ -451,6 +452,7 @@ fn update_tracer_top_level(span: &mut pb::Span) {
pub enum EnvironmentType {
CloudFunction,
AzureFunction,
AzureSpringApp,
LambdaFunction,
}

Expand Down
Loading