Pass jvm arguments from env var on windows payara (#2874)

* Pass jvm arguments from env var on windows payara * enable more debug logging * capture test output * use the same fake backend as regular smoke test
open-telemetry · Apr 27, 2021 · 2df0bb4 · 2df0bb4
1 parent b1b5b14
commit 2df0bb4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/examples/distro/smoke-tests/build.gradle b/examples/distro/smoke-tests/build.gradle
@@ -16,6 +16,8 @@ dependencies {
 tasks.test {
   useJUnitPlatform()
 
+  testLogging.showStandardStreams = true
+
   def shadowTask = project(":agent").tasks.shadowJar
   inputs.files(layout.files(shadowTask))
 

diff --git a/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SmokeTest.java b/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SmokeTest.java
@@ -55,7 +55,7 @@ protected Map<String, String> getExtraEnv() {
   static void setupSpec() {
     backend =
         new GenericContainer<>(
-            "open-telemetry-docker-dev.bintray.io/java/smoke-fake-backend:latest")
+            "ghcr.io/open-telemetry/java-test-containers:smoke-fake-backend-20210324.684269693")
             .withExposedPorts(8080)
             .waitingFor(Wait.forHttp("/health").forPort(8080))
             .withNetwork(network)
@@ -172,7 +172,7 @@ private String waitForContent() throws IOException, InterruptedException {
 
       Request request =
           new Request.Builder()
-              .url(String.format("http://localhost:%d/get-requests", backend.getMappedPort(8080)))
+              .url(String.format("http://localhost:%d/get-traces", backend.getMappedPort(8080)))
               .build();
 
       try (ResponseBody body = client.newCall(request).execute().body()) {

diff --git a/examples/distro/smoke-tests/src/test/resources/logback.xml b/examples/distro/smoke-tests/src/test/resources/logback.xml
@@ -13,5 +13,10 @@
 
   <logger name="io.opentelemetry" level="debug"/>
   <logger name="com.example.javaagent" level="debug"/>
+  <logger name="org.testcontainers" level="debug"/>
+  <logger name="org.testcontainers.shaded" level="warn"/>
+  <logger name="org.testcontainers.containers.output.WaitingConsumer" level="warn"/>
+  <logger name="Collector" level="debug"/>
+  <logger name="Backend" level="debug"/>
 
 </configuration>
diff --git a/smoke-tests/fake-backend/src/docker/backend/windows.dockerfile b/smoke-tests/fake-backend/src/docker/backend/windows.dockerfile
@@ -1,3 +1,3 @@
-FROM winamd64/openjdk:11.0.10-jdk-windowsservercore-1809
+FROM winamd64/openjdk:11.0.11-jdk-windowsservercore-1809
 COPY fake-backend.jar /fake-backend.jar
 CMD ["java", "-jar", "/fake-backend.jar"]
diff --git a/smoke-tests/matrix/src/main/docker/payara/launch.bat b/smoke-tests/matrix/src/main/docker/payara/launch.bat
@@ -1,2 +1 @@
-java -jar glassfish/lib/client/appserver-cli.jar start-domain domain1
-powershell -command "Get-Content /server/glassfish/domains/domain1/logs/server.log -Wait"
+java %JVM_ARGS% -jar glassfish/lib/client/appserver-cli.jar start-domain --verbose domain1