diff --git a/src/main/java/com/datadog/ServerlessCompatAgent.java b/src/main/java/com/datadog/ServerlessCompatAgent.java index 97abbae..eef1526 100644 --- a/src/main/java/com/datadog/ServerlessCompatAgent.java +++ b/src/main/java/com/datadog/ServerlessCompatAgent.java @@ -169,12 +169,24 @@ public static void premain(String agentArgs, Instrumentation instrumentation) { String packageVersion = getPackageVersion(); log.debug("Found package version {}", packageVersion); - ProcessBuilder processBuilder = new ProcessBuilder(executableFile.getAbsolutePath()); - processBuilder.environment().put("DD_SERVERLESS_COMPAT_VERSION", packageVersion); + ProcessBuilder processBuilder = createProcessBuilder(executableFile, packageVersion); processBuilder.inheritIO(); processBuilder.start(); } catch (Exception e) { log.error("Exception when starting {}", fileName, e); } } + + static ProcessBuilder createProcessBuilder(File executable, String packageVersion) { + ProcessBuilder processBuilder = new ProcessBuilder(executable.getAbsolutePath()); + Map childEnvironment = processBuilder.environment(); + childEnvironment.put("DD_SERVERLESS_COMPAT_VERSION", packageVersion); + String javaVersion = System.getProperty("java.version"); + if (javaVersion != null && !javaVersion.trim().isEmpty()) { + childEnvironment.put("DD_SERVERLESS_COMPAT_RUNTIME", "java" + javaVersion.trim()); + } else { + childEnvironment.remove("DD_SERVERLESS_COMPAT_RUNTIME"); + } + return processBuilder; + } } diff --git a/src/test/java/com/datadog/ServerlessCompatAgentTest.java b/src/test/java/com/datadog/ServerlessCompatAgentTest.java index 8f20a84..9bc81a7 100644 --- a/src/test/java/com/datadog/ServerlessCompatAgentTest.java +++ b/src/test/java/com/datadog/ServerlessCompatAgentTest.java @@ -1,6 +1,7 @@ package com.datadog; import java.lang.reflect.Method; +import java.io.File; import java.util.HashMap; import java.util.Map; import org.junit.jupiter.api.Test; @@ -13,6 +14,21 @@ class ServerlessCompatAgentTest { + @Test + void childReceivesWrapperAndEngineVersionsForCustomBinary() { + File executable = new File("/custom/compat"); + String inheritedWorkerVersion = System.getenv("FUNCTIONS_WORKER_RUNTIME_VERSION"); + ProcessBuilder child = ServerlessCompatAgent.createProcessBuilder( + executable, "0.25.0"); + assertEquals(executable.getAbsolutePath(), child.command().get(0)); + assertEquals("0.25.0", child.environment().get("DD_SERVERLESS_COMPAT_VERSION")); + assertEquals("java" + System.getProperty("java.version"), child.environment().get("DD_SERVERLESS_COMPAT_RUNTIME")); + assertEquals(System.getenv("JAVA_VERSION"), child.environment().get("JAVA_VERSION")); + assertEquals(inheritedWorkerVersion, child.environment().get("FUNCTIONS_WORKER_RUNTIME_VERSION")); + assertEquals(inheritedWorkerVersion, System.getenv("FUNCTIONS_WORKER_RUNTIME_VERSION")); + assertEquals(System.getenv("DD_SERVICE"), child.environment().get("DD_SERVICE")); + } + @ParameterizedTest @CsvSource({ "TRACE, TRACE",