add x-ray trace id header in lambda-http #557
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bnusunny
changed the title
bnusunny
approved these changes
Oct 28, 2022
|
Please check the format and clippy related issues. |
calavera
suggested changes
Oct 28, 2022
lambda-http/src/request.rs
Outdated
| 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(";")) { //Github issue #552 |
There was a problem hiding this comment.
remove this comment, it's not necessary
lambda-http/src/request.rs
Outdated
| @@ -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); //Github issue #552 | |||
There was a problem hiding this comment.
remove the comment, it's not necessary
lambda-http/src/request.rs
Outdated
| @@ -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); //Github issue #552 | |||
There was a problem hiding this comment.
remove the comment, it's not necessary
lambda-http/src/request.rs
Outdated
| @@ -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); //Github issue #552 | |||
There was a problem hiding this comment.
remove the comment, it's not necessary
lambda-runtime/src/types.rs
Outdated
| @@ -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>, //Github issue #552 | |||
There was a problem hiding this comment.
remove the comment, it's not necessary
lambda-runtime/src/types.rs
Outdated
| @@ -139,8 +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()? | |||
| .map(|v| String::from_utf8_lossy(v.as_bytes()).to_string()) //Github issue #552 | |||
There was a problem hiding this comment.
remove the comment, it's not necessary
calavera
reviewed
Oct 28, 2022
bnusunny
approved these changes
Oct 28, 2022
lambda-http/src/request.rs
Outdated
| 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(";")) { //Github issue #552 |
calavera
approved these changes
Oct 28, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #, if available:
Issue #552
Description of changes:
change xray_trace_id from string to option enum, and set the value in a env var through pattern match to make sure overwrite the incorrect xray_trace_id value
By submitting this pull request