From 38411d424b7a585244eb8a2f703ccd70a707263d Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 1 Mar 2023 13:01:02 +0100 Subject: [PATCH] GH-995 Wrapped SCF version discovery in AWS Custom Runtime with try/catch Resolves #995 --- .../adapter/aws/CustomRuntimeEventLoop.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 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 eb932b259..ce35d1508 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 @@ -266,17 +266,19 @@ public final class CustomRuntimeEventLoop implements SmartLifecycle { } private static String extractVersion() { - String path = CustomRuntimeEventLoop.class.getProtectionDomain().getCodeSource().getLocation().toString(); - int endIndex = path.lastIndexOf('.'); - if (endIndex < 0) { - return "UNKNOWN-VERSION"; - } - int startIndex = path.lastIndexOf("/") + 1; try { + String path = CustomRuntimeEventLoop.class.getProtectionDomain().getCodeSource().getLocation().toString(); + int endIndex = path.lastIndexOf('.'); + if (endIndex < 0) { + return "UNKNOWN-VERSION"; + } + int startIndex = path.lastIndexOf("/") + 1; return path.substring(startIndex, endIndex).replace("spring-cloud-function-adapter-aws-", ""); } - catch (Throwable e) { - logger.info("Failed to deterimine framework version"); + catch (Exception e) { + if (logger.isDebugEnabled()) { + logger.debug("Failed to detect version", e); + } return "UNKNOWN-VERSION"; } }