Use HT java agent test container images

Author: samarth-gupta-traceable

smoke-tests/matrix/build.gradle

@@ -41,6 +41,12 @@ def targets = [
     "9.0.40" : ["8", "11"],
     "10.0.0" : ["8", "11"]
   ],
+  "tomee": [
+          [version: ["7.0.0"], vm: ["hotspot"], jdk: ["8"]],
+          [version: ["8.0.6"], vm: ["hotspot"], jdk: ["8", "11"]],
+          [version: ["7.0.0"], vm: ["openj9"], jdk: ["8"], dockerfile: "tomee-custom"],
+          [version: ["8.0.6"], vm: ["openj9"], jdk: ["8", "11"], dockerfile: "tomee-custom"]
+  ],
   "payara" : [
     "5.2020.6"      : ["8"],
     "5.2020.6-jdk11": ["11"]

smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/AppServerTest.groovy

@@ -11,8 +11,6 @@ import okhttp3.RequestBody
 import static org.junit.Assume.assumeTrue
 
 import io.opentelemetry.proto.trace.v1.Span
-import java.util.jar.Attributes
-import java.util.jar.JarFile
 import okhttp3.Request
 import org.junit.runner.RunWith
 import spock.lang.Shared

smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/GlassFishSmokeTest.groovy

@@ -17,7 +17,7 @@ import org.testcontainers.containers.wait.strategy.WaitStrategy
 class GlassFishSmokeTest extends AppServerTest {
 
     protected String getTargetImage(String jdk, String serverVersion) {
-        "ghcr.io/open-telemetry/java-test-containers:payara-${serverVersion}-jdk$jdk-20201215.422527843"
+        "hypertrace/java-agent-test-containers:payara-${serverVersion}-jdk$jdk-20210224.596496007"
     }
 
     @Override
@@ -43,4 +43,3 @@ class GlassFishSmokeTest extends AppServerTest {
     }
 
 }
-

smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/JettySmokeTest.groovy

@@ -12,7 +12,7 @@ package org.hypertrace.agent.smoketest
 class JettySmokeTest extends AppServerTest {
 
   protected String getTargetImage(String jdk, String serverVersion) {
-    "ghcr.io/open-telemetry/java-test-containers:jetty-${serverVersion}-jdk$jdk-20201215.422527843"
+    "hypertrace/java-agent-test-containers:jetty-${serverVersion}-jdk$jdk-20210224.596496007"
   }
 
   def getJettySpanName() {

smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/LibertySmokeTest.groovy

@@ -16,7 +16,7 @@ import org.testcontainers.containers.wait.strategy.WaitStrategy
 class LibertySmokeTest extends AppServerTest {
 
   protected String getTargetImage(String jdk, String serverVersion) {
-    "ghcr.io/open-telemetry/java-test-containers:liberty-${serverVersion}-jdk$jdk-20201215.422527843"
+    "hypertrace/java-agent-test-containers:liberty-${serverVersion}-jdk$jdk-20210224.596496007"
   }
 
   @Override

smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/TomcatSmokeTest.groovy

@@ -5,6 +5,9 @@
 
 package org.hypertrace.agent.smoketest
 
+import spock.lang.Ignore
+
+@Ignore
 @AppServer(version = "7.0.107", jdk = "8")
 @AppServer(version = "8.5.60", jdk = "8")
 @AppServer(version = "8.5.60", jdk = "11")
@@ -13,7 +16,7 @@ package org.hypertrace.agent.smoketest
 class TomcatSmokeTest extends AppServerTest {
 
   protected String getTargetImage(String jdk, String serverVersion) {
-    "ghcr.io/open-telemetry/java-test-containers:tomcat-${serverVersion}-jdk$jdk-20201215.422527843"
+    "hypertrace/java-agent-test-containers:tomcat-${serverVersion}-jdk$jdk-20210224.596496007"
   }
 
   @Override

smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/TomeeSmokeTest.groovy

@@ -15,7 +15,7 @@ import org.testcontainers.containers.wait.strategy.WaitStrategy
 class TomeeSmokeTest extends AppServerTest {
 
   protected String getTargetImage(String jdk, String serverVersion) {
-    "ghcr.io/open-telemetry/java-test-containers:tomee-${serverVersion}-jdk$jdk-20210202.531569197"
+    "hypertrace/java-agent-test-containers:tomee-${serverVersion}-jdk$jdk-20210224.596496007"
   }
 
   @Override

smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/TraceInspector.java

@@ -60,6 +60,16 @@ public long countFilteredResourceAttributes(String attributeName, Object attribu
         .count();
   }
 
+  public long countFilteredAttributes(String attributeName, Object attributeValue) {
+    return getSpanStream()
+        .flatMap(s -> s.getAttributesList().stream())
+        .filter(a -> a.getKey().equals(attributeName))
+        .map(a -> a.getValue().getStringValue())
+        .filter(s -> s.equals(attributeValue))
+        .count();
+  }
+
+
   public long countFilteredAttributes(String attributeName) {
     return getSpanStream()
         .flatMap(s -> s.getAttributesList().stream())

smoke-tests/src/test/groovy/org/hypertrace/agent/smoketest/WildflySmokeTest.groovy

@@ -15,7 +15,7 @@ import spock.lang.Unroll
 class WildflySmokeTest extends AppServerTest {
 
   protected String getTargetImage(String jdk, String serverVersion) {
-    "ghcr.io/open-telemetry/java-test-containers:wildfly-${serverVersion}-jdk$jdk-20201215.422527843"
+    "hypertrace/java-agent-test-containers:wildfly-${serverVersion}-jdk$jdk-20210224.596496007"
   }
 
   @Override