Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/main/java/com/datadog/ServerlessCompatAgent.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, String> 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;
}
}
16 changes: 16 additions & 0 deletions src/test/java/com/datadog/ServerlessCompatAgentTest.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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",
Expand Down