Skip to content

Commit 04de067

Browse files
committed
Add lambda check to prevent extra checks on non-lambda environments
1 parent 0414305 commit 04de067

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

core/aws-core/src/main/java/software/amazon/awssdk/awscore/interceptor/TraceIdExecutionInterceptor.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class TraceIdExecutionInterceptor implements ExecutionInterceptor {
4040
@Override
4141
public void beforeExecution(Context.BeforeExecution context, ExecutionAttributes executionAttributes) {
4242
String traceId = SdkInternalThreadLocal.get(CONCURRENT_TRACE_ID_KEY);
43-
if (traceId != null) {
43+
if (traceId != null && lambdaFunctionNameEnvironmentVariable().isPresent()) {
4444
executionAttributes.putAttribute(TRACE_ID, traceId);
4545
}
4646
}
@@ -61,12 +61,16 @@ public SdkHttpRequest modifyHttpRequest(Context.ModifyHttpRequest context, Execu
6161

6262
@Override
6363
public void afterExecution(Context.AfterExecution context, ExecutionAttributes executionAttributes) {
64-
saveTraceId(executionAttributes);
64+
if (lambdaFunctionNameEnvironmentVariable().isPresent()) {
65+
saveTraceId(executionAttributes);
66+
}
6567
}
6668

6769
@Override
6870
public void onExecutionFailure(Context.FailedExecution context, ExecutionAttributes executionAttributes) {
69-
saveTraceId(executionAttributes);
71+
if (lambdaFunctionNameEnvironmentVariable().isPresent()) {
72+
saveTraceId(executionAttributes);
73+
}
7074
}
7175

7276
/**

0 commit comments

Comments
 (0)