Support for WildFly version detection (#57)

* Support for WildFly version detection

* Format

* Better test name

* Instrument ServerEnvironment

Author: iNikem

instrumentation/build.gradle

@@ -12,6 +12,7 @@ subprojects {
             dependencies {
                 compileOnly("io.opentelemetry:opentelemetry-sdk:${versions.opentelemetry}")
                 compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:${versions.opentelemetryJavaagent}")
+                compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-api:${versions.opentelemetryJavaagent}")
                 compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-spi:${versions.opentelemetryJavaagent}")
                 compileOnly("net.bytebuddy:byte-buddy:1.10.10")
                 annotationProcessor("com.google.auto.service:auto-service:1.0-rc3")

instrumentation/wildfly/build.gradle

@@ -0,0 +1,7 @@
+plugins {
+    id "java"
+}
+
+dependencies {
+    compileOnly('org.wildfly.core:wildfly-version:13.0.0.Final')
+}

instrumentation/wildfly/src/main/java/com/splunk/opentelemetry/middleware/WildFlyAttributesInstrumentationModule.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright Splunk Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.splunk.opentelemetry.middleware;
+
+import static io.opentelemetry.javaagent.tooling.ClassLoaderMatcher.hasClassesNamed;
+import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
+import static net.bytebuddy.matcher.ElementMatchers.named;
+
+import com.google.auto.service.AutoService;
+import com.splunk.opentelemetry.javaagent.bootstrap.MiddlewareHolder;
+import io.opentelemetry.javaagent.instrumentation.api.CallDepthThreadLocalMap;
+import io.opentelemetry.javaagent.tooling.InstrumentationModule;
+import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.description.method.MethodDescription;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.matcher.ElementMatcher;
+import org.jboss.as.version.ProductConfig;
+
+@AutoService(InstrumentationModule.class)
+public class WildFlyAttributesInstrumentationModule extends InstrumentationModule {
+
+  public WildFlyAttributesInstrumentationModule() {
+    super("wildfly");
+  }
+
+  @Override
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+    return hasClassesNamed("org.jboss.as.version.ProductConfig");
+  }
+
+  @Override
+  public List<TypeInstrumentation> typeInstrumentations() {
+    return Collections.singletonList(new Instrumentation());
+  }
+
+  public static class Instrumentation implements TypeInstrumentation {
+
+    @Override
+    public ElementMatcher<? super TypeDescription> typeMatcher() {
+      return named("org.jboss.as.server.ServerEnvironment");
+    }
+
+    @Override
+    public Map<? extends ElementMatcher<? super MethodDescription>, String> transformers() {
+      return Collections.singletonMap(
+          isConstructor(),
+          WildFlyAttributesInstrumentationModule.class.getName() + "$MiddlewareInitializedAdvice");
+    }
+  }
+
+  @SuppressWarnings("unused")
+  public static class MiddlewareInitializedAdvice {
+    @Advice.OnMethodEnter
+    public static void onEnter() {
+      CallDepthThreadLocalMap.incrementCallDepth(ProductConfig.class);
+    }
+
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onExit(@Advice.FieldValue("productConfig") ProductConfig productConfig) {
+      if (CallDepthThreadLocalMap.decrementCallDepth(ProductConfig.class) == 0
+          && productConfig != null) {
+        MiddlewareHolder.trySetName(productConfig.resolveName());
+        MiddlewareHolder.trySetVersion(productConfig.resolveVersion());
+      }
+    }
+  }
+}

settings.gradle.kts

@@ -18,5 +18,6 @@ include("agent",
   "instrumentation:glassfish",
   "instrumentation:liberty",
   "instrumentation:tomcat",
+  "instrumentation:wildfly",
   "smoke-tests",
   "matrix")

smoke-tests/src/test/java/com/splunk/opentelemetry/GlassFishSmokeTest.java

@@ -54,7 +54,7 @@ protected Map<String, String> getExtraEnv() {
   @Override
   protected WaitStrategy getWaitStrategy() {
     return Wait.forLogMessage(".*app was successfully deployed.*", 1)
-        .withStartupTimeout(Duration.ofMinutes(15));
+        .withStartupTimeout(Duration.ofMinutes(5));
   }
 
   @ParameterizedTest

smoke-tests/src/test/java/com/splunk/opentelemetry/WildFlySmokeTest.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright Splunk Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.splunk.opentelemetry;
+
+import static org.junit.jupiter.params.provider.Arguments.arguments;
+
+import java.io.IOException;
+import java.util.stream.Stream;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class WildFlySmokeTest extends AppServerTest {
+
+  public static final ExpectedServerAttributes WILDFLY_13_SERVER_ATTRIBUTES =
+      new ExpectedServerAttributes(
+          "/this-is-definitely-not-there-but-there-should-be-a-trace-nevertheless",
+          "WildFly Full",
+          "13.0.0.Final");
+  public static final ExpectedServerAttributes WILDFLY_17_SERVER_ATTRIBUTES =
+      new ExpectedServerAttributes(
+          "/this-is-definitely-not-there-but-there-should-be-a-trace-nevertheless",
+          "WildFly Full",
+          "17.0.1.Final");
+  public static final ExpectedServerAttributes WILDFLY_21_SERVER_ATTRIBUTES =
+      new ExpectedServerAttributes(
+          "/this-is-definitely-not-there-but-there-should-be-a-trace-nevertheless",
+          "WildFly Full",
+          "21.0.0.Final");
+
+  private static Stream<Arguments> supportedConfigurations() {
+    return Stream.of(
+        arguments(
+            "ghcr.io/open-telemetry/java-test-containers:wildfly-13.0.0.Final-jdk8-20201207.405832649",
+            WILDFLY_13_SERVER_ATTRIBUTES),
+        arguments(
+            "ghcr.io/open-telemetry/java-test-containers:wildfly-17.0.1.Final-jdk8-20201207.405832649",
+            WILDFLY_17_SERVER_ATTRIBUTES),
+        arguments(
+            "ghcr.io/open-telemetry/java-test-containers:wildfly-17.0.1.Final-jdk11-20201207.405832649",
+            WILDFLY_17_SERVER_ATTRIBUTES),
+        arguments(
+            "ghcr.io/open-telemetry/java-test-containers:wildfly-21.0.0.Final-jdk8-20201207.405832649",
+            WILDFLY_21_SERVER_ATTRIBUTES),
+        arguments(
+            "ghcr.io/open-telemetry/java-test-containers:wildfly-21.0.0.Final-jdk11-20201207.405832649",
+            WILDFLY_21_SERVER_ATTRIBUTES));
+  }
+
+  @ParameterizedTest(name = "[{index}] {0}")
+  @MethodSource("supportedConfigurations")
+  void wildflySmokeTest(String imageName, ExpectedServerAttributes expectedServerAttributes)
+      throws IOException, InterruptedException {
+    startTarget(imageName);
+
+    // TODO support 404
+    //    assertServerHandler(expectedServerAttributes);
+    assertWebAppTrace(expectedServerAttributes);
+  }
+}