Skip to content

add x-ray trace id header in lambda-http #557

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

Merged
merged 4 commits into from
Oct 28, 2022
Merged

add x-ray trace id header in lambda-http #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef43f9b
fix for Github issue #552
twu-AWS Oct 28, 2022
36f0832
Github issue #552 fmt check
twu-AWS Oct 28, 2022
1007991
github issue #552 apply clippy fix
twu-AWS Oct 28, 2022
7382b72
remove unnessecory comment
twu-AWS Oct 28, 2022
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
17 changes: 14 additions & 3 deletions lambda-http/src/request.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ use aws_lambda_events::apigw::{ApiGatewayV2httpRequest, ApiGatewayV2httpRequestC
use aws_lambda_events::apigw::{ApiGatewayWebsocketProxyRequest, ApiGatewayWebsocketProxyRequestContext};
use aws_lambda_events::{encodings::Body, query_map::QueryMap};
use http::header::HeaderName;
use http::HeaderMap;
use http::{HeaderMap, HeaderValue};
use serde::Deserialize;
use serde_json::error::Error as JsonError;
use std::future::Future;
use std::pin::Pin;
use std::{io::Read, mem};
use std::{env, io::Read, mem};
use url::Url;

/// Internal representation of an Lambda http event from
Expand Down Expand Up @@ -119,8 +119,9 @@ fn into_api_gateway_v2_request(ag: ApiGatewayV2httpRequest) -> http::Request<Bod
.extension(RequestContext::ApiGatewayV2(ag.request_context));

let mut headers = ag.headers;
update_xray_trace_id_header(&mut headers);
if let Some(cookies) = ag.cookies {
if let Ok(header_value) = http::header::HeaderValue::from_str(&cookies.join(";")) {
if let Ok(header_value) = HeaderValue::from_str(&cookies.join(";")) {
headers.append(http::header::COOKIE, header_value);
}
}
Expand All @@ -142,6 +143,13 @@ fn into_api_gateway_v2_request(ag: ApiGatewayV2httpRequest) -> http::Request<Bod
req
}

fn update_xray_trace_id_header(headers: &mut HeaderMap) {
if let Ok(xray_trace_id) = env::var("_X_AMZN_TRACE_ID") {
if let Ok(header_value) = HeaderValue::from_str(&xray_trace_id) {
headers.insert(HeaderName::from_static("x-amzn-trace-id"), header_value);
}
}
}
#[cfg(feature = "apigw_rest")]
fn into_proxy_request(ag: ApiGatewayProxyRequest) -> http::Request<Body> {
let http_method = ag.http_method;
Expand Down Expand Up @@ -179,6 +187,7 @@ fn into_proxy_request(ag: ApiGatewayProxyRequest) -> http::Request<Body> {
// multi-value_headers our cannoncial source of request headers
let mut headers = ag.multi_value_headers;
headers.extend(ag.headers);
update_xray_trace_id_header(&mut headers);

let base64 = ag.is_base64_encoded.unwrap_or_default();
let mut req = builder
Expand Down Expand Up @@ -229,6 +238,7 @@ fn into_alb_request(alb: AlbTargetGroupRequest) -> http::Request<Body> {
// multi-value_headers our cannoncial source of request headers
let mut headers = alb.multi_value_headers;
headers.extend(alb.headers);
update_xray_trace_id_header(&mut headers);

let base64 = alb.is_base64_encoded;

Expand Down Expand Up @@ -291,6 +301,7 @@ fn into_websocket_request(ag: ApiGatewayWebsocketProxyRequest) -> http::Request<
// multi-value_headers our cannoncial source of request headers
let mut headers = ag.multi_value_headers;
headers.extend(ag.headers);
update_xray_trace_id_header(&mut headers);

let base64 = ag.is_base64_encoded.unwrap_or_default();
let mut req = builder
Expand Down
6 changes: 4 additions & 2 deletions lambda-runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,10 @@ where
let request_id = &ctx.request_id.clone();

let xray_trace_id = &ctx.xray_trace_id.clone();
env::set_var("_X_AMZN_TRACE_ID", xray_trace_id);

match xray_trace_id {
Some(trace_id) => env::set_var("_X_AMZN_TRACE_ID", trace_id),
None => env::remove_var("_X_AMZN_TRACE_ID"),
}
let body = match serde_json::from_slice(&body) {
Ok(body) => body,
Err(err) => {
Expand Down
6 changes: 2 additions & 4 deletions lambda-runtime/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ pub struct Context {
/// The ARN of the Lambda function being invoked.
pub invoked_function_arn: String,
/// The X-Ray trace ID for the current invocation.
pub xray_trace_id: String,
pub xray_trace_id: Option<String>,
/// The client context object sent by the AWS mobile SDK. This field is
/// empty unless the function is invoked using an AWS mobile SDK.
pub client_context: Option<ClientContext>,
Expand Down Expand Up @@ -139,9 +139,7 @@ impl TryFrom<HeaderMap> for Context {
.to_owned(),
xray_trace_id: headers
.get("lambda-runtime-trace-id")
.unwrap_or(&HeaderValue::from_static(""))
.to_str()?
.to_owned(),
.map(|v| String::from_utf8_lossy(v.as_bytes()).to_string()),
client_context,
identity,
..Default::default()
Expand Down