From fccd242987b7f94c6d2ee1e4e655cd7de4d42e1b Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Fri, 12 Nov 2021 15:23:25 +0100 Subject: [PATCH] Change format of user agent to be aligned with the original PR from @msailes --- .../cloud/function/adapter/aws/CustomRuntimeEventLoop.java | 6 +++--- .../function/adapter/aws/CustomRuntimeEventLoopTest.java | 2 +- 2 files changed, 4 insertions(+), 4 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 3fbececdc..499297c64 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 @@ -64,9 +64,9 @@ public final class CustomRuntimeEventLoop implements SmartLifecycle { private static final String LAMBDA_RUNTIME_URL_TEMPLATE = "http://{0}/{1}/runtime/invocation/next"; private static final String LAMBDA_INVOCATION_URL_TEMPLATE = "http://{0}/{1}/runtime/invocation/{2}/response"; private static final String USER_AGENT_VALUE = String.format( - "spring-cloud-function:%s/JAVA-%s", - extractVersion(), - System.getProperty("java.vm.name")); + "spring-cloud-function/%s-%s", + System.getProperty("java.runtime.version"), + extractVersion()); private final ConfigurableApplicationContext applicationContext; diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoopTest.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoopTest.java index a57748063..f2ba21d9f 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoopTest.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoopTest.java @@ -49,7 +49,7 @@ public class CustomRuntimeEventLoopTest { AWSCustomRuntime aws = userContext.getBean(AWSCustomRuntime.class); Message replyMessage = aws.exchange("\"ricky\""); assertThat(replyMessage.getHeaders()).containsKey("user-agent"); - assertThat(((String) replyMessage.getHeaders().get("user-agent"))).startsWith("spring-cloud-function:"); + assertThat(((String) replyMessage.getHeaders().get("user-agent"))).startsWith("spring-cloud-function"); assertThat(aws.exchange("\"ricky\"").getPayload()).isEqualTo("\"RICKY\""); assertThat(aws.exchange("\"julien\"").getPayload()).isEqualTo("\"JULIEN\""); assertThat(aws.exchange("\"bubbles\"").getPayload()).isEqualTo("\"BUBBLES\"");