From cb315cf507c7d7870aaf7dba19c5a9ffa33baf59 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 17 Jan 2023 11:09:54 +0100 Subject: [PATCH] polishing previous commit --- .../cloud/function/adapter/aws/CustomRuntimeEventLoop.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java index c23c260c9..44c3049ef 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java @@ -43,6 +43,7 @@ import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; import org.springframework.messaging.Message; import org.springframework.util.Assert; +import org.springframework.util.StringUtils; import org.springframework.web.client.RestTemplate; @@ -148,20 +149,20 @@ public final class CustomRuntimeEventLoop implements SmartLifecycle { .format(LAMBDA_INVOCATION_URL_TEMPLATE, runtimeApi, LAMBDA_VERSION_DATE, requestId); String traceId = response.getHeaders().getFirst("Lambda-Runtime-Trace-Id"); - if (traceId != null) { + if (StringUtils.hasText(traceId)) { if (logger.isDebugEnabled()) { logger.debug("Lambda-Runtime-Trace-Id: " + traceId); } try { // The X-Ray SDK uses this value to connect trace data between services. System.setProperty("com.amazonaws.xray.traceHeader", traceId); - } catch (Exception e) { + } + catch (Exception e) { if (logger.isDebugEnabled()) { logger.debug("Failed to set amazon x-ray trace id", e); } } } - try { Message responseMessage = (Message) function.apply(eventMessage);