weaver instrumentation skeleton

Author: daniel-mohedano

dd-java-agent/instrumentation/weaver/build.gradle

@@ -0,0 +1,33 @@
+apply from: "$rootDir/gradle/java.gradle"
+apply plugin: 'scala'
+
+muzzle {
+  pass {
+    group = 'com.disneystreaming'
+    module = 'weaver-cats_3'
+    versions = '[0.8.4,)'
+  }
+}
+
+addTestSuiteForDir('latestDepTest', 'test')
+
+dependencies {
+  compileOnly group: 'com.disneystreaming', name: 'weaver-cats_3', version: '0.8.4'
+
+  testImplementation testFixtures(project(':dd-java-agent:agent-ci-visibility'))
+
+  testImplementation group: 'org.scala-lang', name: 'scala-library', version: '2.12.15'
+  testImplementation group: 'com.disneystreaming', name: 'weaver-cats_3', version: '0.8.4'
+
+  testImplementation group: 'com.disneystreaming', name: 'weaver-cats_3', version: '+'
+}
+
+compileTestGroovy {
+  dependsOn compileTestScala
+  classpath += files(sourceSets.test.scala.destinationDirectory)
+}
+
+compileLatestDepTestGroovy {
+  dependsOn compileLatestDepTestScala
+  classpath += files(sourceSets.latestDepTest.scala.destinationDirectory)
+}

dd-java-agent/instrumentation/weaver/gradle.lockfile

@@ -0,0 +1,19 @@
+package datadog.trace.instrumentation.weaver;
+
+import weaver.framework.SuiteEvent;
+import weaver.framework.SuiteFinished;
+import weaver.framework.SuiteStarted;
+import weaver.framework.TestFinished;
+
+public class DatadogWeaverReporter {
+
+  public static void handle(SuiteEvent event) {
+    if (event instanceof SuiteStarted) {
+      System.out.println("!!! Suite started");
+    } else if (event instanceof SuiteFinished) {
+      System.out.println("!!! Suite Finished");
+    } else if (event instanceof TestFinished) {
+      System.out.println("!!! Test finished");
+    }
+  }
+}

dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/DatadogWeaverReporter.java

@@ -0,0 +1,62 @@
+package datadog.trace.instrumentation.weaver;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.InstrumenterModule;
+import java.util.Set;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.matcher.ElementMatcher;
+import weaver.framework.SuiteEvent;
+
+@AutoService(InstrumenterModule.class)
+public class WeaverInstrumentation extends InstrumenterModule.CiVisibility
+    implements Instrumenter.ForTypeHierarchy {
+
+  public WeaverInstrumentation() {
+    super("ci-visibility", "weaver");
+  }
+
+  @Override
+  public boolean isApplicable(Set<TargetSystem> enabledSystems) {
+    return super.isApplicable(enabledSystems);
+  }
+
+  @Override
+  public String hierarchyMarkerType() {
+    return null;
+  }
+
+  @Override
+  public ElementMatcher<TypeDescription> hierarchyMatcher() {
+    return implementsInterface(named("weaver.framework.RunnerCompat.SuiteEventBroker"));
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".DatadogWeaverReporter",
+    };
+  }
+
+  @Override
+  public void methodAdvice(MethodTransformer transformer) {
+    transformer.applyAdvice(
+        named("send")
+            .and(takesArguments(1))
+            .and(takesArgument(0, named("weaver.framework.SuiteEvent"))),
+        WeaverInstrumentation.class.getName() + "$SendEventAdvice");
+  }
+
+  public static class SendEventAdvice {
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void onSendEvent(@Advice.Argument(value = 0) SuiteEvent event) {
+      DatadogWeaverReporter.handle(event);
+    }
+  }
+}

dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/WeaverInstrumentation.java

@@ -0,0 +1,37 @@
+import datadog.trace.api.DisableTestTrace
+import datadog.trace.civisibility.CiVisibilityInstrumentationTest
+import cats.effect.IO
+import weaver.Runner
+
+@DisableTestTrace(reason = "avoid self-tracing")
+class WeaverTest extends CiVisibilityInstrumentationTest {
+
+  def "default test"() {
+    expect:
+    2 + 2 == 4
+  }
+
+  //def "simple weaver test"() {
+  //  given: "test runner instantiated"
+  //  List<String> args = []
+  //  int maxConcurrentSuites = 1
+  //  def printLine = { String line -> IO(println(line)) }
+  //  def runner = new Runner[IO](args, maxConcurrentSuites)(printLine)
+
+  //  when: "we run the IO effect"
+  //  runner.printLine("Runner is running inside a Spock test!")
+
+  //  then: "no exceptions are thrown"
+
+  //}
+
+  @Override
+  String instrumentedLibraryName() {
+    return "weaver"
+  }
+
+  @Override
+  String instrumentedLibraryVersion() {
+    return "0.8.4"
+  }
+}

dd-java-agent/instrumentation/weaver/src/test/groovy/WeaverTest.groovy

@@ -0,0 +1,30 @@
+package org.example
+
+import weaver.SimpleIOSuite
+import cats.effect._
+
+// Suites must be "objects" for them to be picked by the framework
+object TestSucceed extends SimpleIOSuite {
+
+  pureTest("non-effectful (pure) test"){
+    expect("hello".length == 6)
+  }
+
+  private val random = IO(java.util.UUID.randomUUID())
+
+  test("test with side-effects") {
+    for {
+      x <- random
+      y <- random
+    } yield expect(x != y)
+  }
+
+  loggedTest("test with side-effects and a logger"){ log =>
+    for {
+      x <- random
+      _ <- log.info(s"x : $x")
+      y <- random
+      _ <- log.info(s"y : $y")
+    } yield expect(x != y)
+  }
+}

dd-java-agent/instrumentation/weaver/src/test/scala/org/example/TestSucceed.scala

@@ -503,6 +503,7 @@ include ':dd-java-agent:instrumentation:redisson'
 include ':dd-java-agent:instrumentation:redisson:redisson-2.0.0'
 include ':dd-java-agent:instrumentation:redisson:redisson-2.3.0'
 include ':dd-java-agent:instrumentation:redisson:redisson-3.10.3'
+include ':dd-java-agent:instrumentation:weaver'
 include ':dd-java-agent:instrumentation:websphere-jmx'
 include ':dd-java-agent:instrumentation:zio'
 include ':dd-java-agent:instrumentation:zio:zio-2.0'