From 77b838d917c72d11ff2948388bd62d389e9f85eb Mon Sep 17 00:00:00 2001 From: cleverchuk Date: Wed, 25 Feb 2026 12:11:05 -0500 Subject: [PATCH] remove proxy for lambda test --- .../src/test/java/com/solarwinds/LambdaTest.java | 7 +------ .../containers/PetClinicRestContainer.java | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/smoke-tests/src/test/java/com/solarwinds/LambdaTest.java b/smoke-tests/src/test/java/com/solarwinds/LambdaTest.java index caa20834..9aa31ad1 100644 --- a/smoke-tests/src/test/java/com/solarwinds/LambdaTest.java +++ b/smoke-tests/src/test/java/com/solarwinds/LambdaTest.java @@ -25,7 +25,6 @@ import com.solarwinds.containers.PetClinicRestContainer; import com.solarwinds.containers.PostgresContainer; import com.solarwinds.containers.SpringBootWebMvcContainer; -import com.solarwinds.containers.SquidContainer; import com.solarwinds.results.ResultsCollector; import com.solarwinds.util.LogStreamAnalyzer; import com.solarwinds.util.NamingConventions; @@ -76,9 +75,6 @@ static void runTestConfig() { } static void runAppOnce(Agent agent) throws Exception { - GenericContainer squid = new SquidContainer(NETWORK).build(); - squid.start(); - GenericContainer postgres = new PostgresContainer(NETWORK).build(); postgres.start(); @@ -91,10 +87,9 @@ static void runAppOnce(Agent agent) throws Exception { GenericContainer k6 = new K6Container(NETWORK, agent, namingConventions).build(); k6.start(); - petClinic.execInContainer("kill", "1"); + petClinic.execInContainer("kill", "1"); webMvc.execInContainer("kill", "1"); - squid.execInContainer("kill", "1"); postgres.stop(); } diff --git a/smoke-tests/src/test/java/com/solarwinds/containers/PetClinicRestContainer.java b/smoke-tests/src/test/java/com/solarwinds/containers/PetClinicRestContainer.java index ba6ed38e..d6ae71c0 100644 --- a/smoke-tests/src/test/java/com/solarwinds/containers/PetClinicRestContainer.java +++ b/smoke-tests/src/test/java/com/solarwinds/containers/PetClinicRestContainer.java @@ -85,7 +85,7 @@ public GenericContainer build() { .withCopyFileToContainer( MountableFile.forHostPath(agentPath), "/app/" + agentPath.getFileName()) - .withCommand(buildCommandline(agentPath)); + .withCommand(buildCommandlineLambda(agentPath)); } if (Objects.equals(System.getenv("SMOKEV2"), "true")){ @@ -167,4 +167,18 @@ private String[] buildCommandline(Path agentJarPath) { result.add("/app/spring-petclinic-rest.jar"); return result.toArray(new String[] {}); } + + @NotNull + private String[] buildCommandlineLambda(Path agentJarPath) { + List result = new ArrayList<>(); + result.add("java"); + + result.addAll(this.agent.getAdditionalJvmArgs()); + result.add("-javaagent:/app/" + agentJarPath.getFileName()); + result.add("-Dotel.metric.export.interval=100ms"); + + result.add("-jar"); + result.add("/app/spring-petclinic-rest.jar"); + return result.toArray(new String[] {}); + } }