Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement Scalatest support #6331

Merged
merged 3 commits into from
Dec 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ dd-java-agent/instrumentation/jacoco/ @DataDog/ci-app-libraries-java
dd-java-agent/instrumentation/junit-4.10/ @DataDog/ci-app-libraries-java
dd-java-agent/instrumentation/junit-5.3/ @DataDog/ci-app-libraries-java
dd-java-agent/instrumentation/karate/ @DataDog/ci-app-libraries-java
dd-java-agent/instrumentation/scalatest/ @DataDog/ci-app-libraries-java
dd-java-agent/instrumentation/testng/ @DataDog/ci-app-libraries-java
dd-java-agent/instrumentation/gradle/ @DataDog/ci-app-libraries-java
dd-java-agent/instrumentation/maven-3.2.1/ @DataDog/ci-app-libraries-java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,18 @@ public int hashCode() {
@Override
public int compareTo(TestFramework o) {
int nameComparison = name.compareTo(o.name);
return nameComparison != 0 ? nameComparison : version.compareTo(o.version);
if (nameComparison != 0) {
return nameComparison;
}
if (version == null && o.version == null) {
return 0;
}
if (version == null) {
return -1;
}
if (o.version == null) {
return 1;
}
return version.compareTo(o.version);
}
}
33 changes: 33 additions & 0 deletions dd-java-agent/instrumentation/scalatest/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
apply from: "$rootDir/gradle/java.gradle"
apply plugin: 'scala'

muzzle {
pass {
group = 'org.scalatest'
module = 'scalatest_2.12'
versions = '[3.0.8,)'
extraDependency 'org.scala-lang:scala-library:2.12.15'
}
}

addTestSuiteForDir('latestDepTest', 'test')

dependencies {
compileOnly group: 'org.scalatest', name: 'scalatest_2.13', version: '3.0.8'

testImplementation testFixtures(project(':dd-java-agent:agent-ci-visibility'))

testImplementation group: 'org.scala-lang', name: 'scala-library', version: '2.12.15'
testImplementation group: 'org.scalatest', name: 'scalatest_2.12', version: '3.1.0'

latestDepTestImplementation group: 'org.scalatest', name: 'scalatest_2.12', version: '+'
}

compileTestGroovy {
dependsOn compileTestScala
classpath += files(sourceSets.test.scala.destinationDirectory)
}
compileLatestDepTestGroovy {
dependsOn compileLatestDepTestScala
classpath += files(sourceSets.latestDepTest.scala.destinationDirectory)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,247 @@
package datadog.trace.instrumentation.scalatest;

import datadog.trace.api.civisibility.InstrumentationBridge;
import datadog.trace.api.civisibility.config.SkippableTest;
import datadog.trace.api.civisibility.events.TestEventsHandler;
import java.lang.reflect.Method;
import java.util.Collection;
import java.util.Collections;
import org.scalatest.events.Event;
import org.scalatest.events.RunAborted;
import org.scalatest.events.RunCompleted;
import org.scalatest.events.RunStarting;
import org.scalatest.events.RunStopped;
import org.scalatest.events.SuiteAborted;
import org.scalatest.events.SuiteCompleted;
import org.scalatest.events.SuiteStarting;
import org.scalatest.events.TestCanceled;
import org.scalatest.events.TestFailed;
import org.scalatest.events.TestIgnored;
import org.scalatest.events.TestPending;
import org.scalatest.events.TestStarting;
import org.scalatest.events.TestSucceeded;

public class DatadogReporter {

private static final String TEST_FRAMEWORK = "scalatest";
private static final String TEST_FRAMEWORK_VERSION = ScalatestUtils.getScalatestVersion();

public static void handle(Event event) {
if (event instanceof RunStarting) {
start(event);

} else if (event instanceof RunCompleted) {
stop(event);

} else if (event instanceof RunAborted) {
stop(event);

} else if (event instanceof RunStopped) {
stop(event);

} else if (event instanceof SuiteStarting) {
onSuiteStart((SuiteStarting) event);

} else if (event instanceof SuiteCompleted) {
onSuiteFinish((SuiteCompleted) event);

} else if (event instanceof SuiteAborted) {
onSuiteAbort((SuiteAborted) event);

} else if (event instanceof TestStarting) {
onTestStart((TestStarting) event);

} else if (event instanceof TestSucceeded) {
onTestSuccess((TestSucceeded) event);

} else if (event instanceof TestFailed) {
onTestFailure((TestFailed) event);

} else if (event instanceof TestIgnored) {
onTestIgnore((TestIgnored) event);

} else if (event instanceof TestCanceled) {
onTestCancel((TestCanceled) event);

} else if (event instanceof TestPending) {
onTestPending((TestPending) event);
}
}

private static void start(Event event) {
int runStamp = event.ordinal().runStamp();
RunContext.getOrCreate(runStamp);
}

private static void stop(Event event) {
int runStamp = event.ordinal().runStamp();
RunContext.destroy(runStamp);
}

private static void onSuiteStart(SuiteStarting event) {
int runStamp = event.ordinal().runStamp();
RunContext context = RunContext.getOrCreate(runStamp);
TestEventsHandler eventHandler = context.getEventHandler();

String testSuiteName = event.suiteId();
Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
Collection<String> categories = Collections.emptyList();
boolean parallelized = true;

eventHandler.onTestSuiteStart(
testSuiteName, TEST_FRAMEWORK, TEST_FRAMEWORK_VERSION, testClass, categories, parallelized);
}

private static void onSuiteFinish(SuiteCompleted event) {
int runStamp = event.ordinal().runStamp();
RunContext context = RunContext.getOrCreate(runStamp);
TestEventsHandler eventHandler = context.getEventHandler();

String testSuiteName = event.suiteId();
Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
eventHandler.onTestSuiteFinish(testSuiteName, testClass);
}

private static void onSuiteAbort(SuiteAborted event) {
int runStamp = event.ordinal().runStamp();
RunContext context = RunContext.getOrCreate(runStamp);
TestEventsHandler eventHandler = context.getEventHandler();

String testSuiteName = event.suiteId();
Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
Throwable throwable = event.throwable().getOrElse(null);
eventHandler.onTestSuiteFailure(testSuiteName, testClass, throwable);
eventHandler.onTestSuiteFinish(testSuiteName, testClass);
}

private static void onTestStart(TestStarting event) {
int runStamp = event.ordinal().runStamp();
RunContext context = RunContext.getOrCreate(runStamp);
TestEventsHandler eventHandler = context.getEventHandler();

String testSuiteName = event.suiteId();
String testName = event.testName();
Object testQualifier = null;
String testParameters = null;
Collection<String> categories;
if (context.unskippable(new SkippableTest(testSuiteName, testName, null, null))) {
categories = Collections.singletonList(InstrumentationBridge.ITR_UNSKIPPABLE_TAG);
} else {
categories = Collections.emptyList();
}
Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
String testMethodName = null;
Method testMethod = null;

eventHandler.onTestStart(
testSuiteName,
testName,
testQualifier,
TEST_FRAMEWORK,
TEST_FRAMEWORK_VERSION,
testParameters,
categories,
testClass,
testMethodName,
testMethod);
}

private static void onTestSuccess(TestSucceeded event) {
int runStamp = event.ordinal().runStamp();
RunContext context = RunContext.getOrCreate(runStamp);
TestEventsHandler eventHandler = context.getEventHandler();

String testSuiteName = event.suiteId();
Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
String testName = event.testName();
Object testQualifier = null;
String testParameters = null;
eventHandler.onTestFinish(testSuiteName, testClass, testName, testQualifier, testParameters);
}

private static void onTestFailure(TestFailed event) {
int runStamp = event.ordinal().runStamp();
RunContext context = RunContext.getOrCreate(runStamp);
TestEventsHandler eventHandler = context.getEventHandler();

String testSuiteName = event.suiteId();
Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
String testName = event.testName();
Object testQualifier = null;
String testParameters = null;
Throwable throwable = event.throwable().getOrElse(null);
eventHandler.onTestFailure(
testSuiteName, testClass, testName, testQualifier, testParameters, throwable);
eventHandler.onTestFinish(testSuiteName, testClass, testName, testQualifier, testParameters);
}

private static void onTestIgnore(TestIgnored event) {
int runStamp = event.ordinal().runStamp();
RunContext context = RunContext.getOrCreate(runStamp);
TestEventsHandler eventHandler = context.getEventHandler();

String testSuiteName = event.suiteId();
String testName = event.testName();
Object testQualifier = null;
String testParameters = null;
Collection<String> categories = Collections.emptyList();
Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
String testMethodName = null;
Method testMethod = null;

String reason;
SkippableTest skippableTest = new SkippableTest(testSuiteName, testName, null, null);
if (context.skipped(skippableTest)) {
reason = InstrumentationBridge.ITR_SKIP_REASON;
} else {
reason = null;
}

eventHandler.onTestIgnore(
testSuiteName,
testName,
testQualifier,
TEST_FRAMEWORK,
TEST_FRAMEWORK_VERSION,
testParameters,
categories,
testClass,
testMethodName,
testMethod,
reason);
}

private static void onTestCancel(TestCanceled event) {
int runStamp = event.ordinal().runStamp();
RunContext context = RunContext.getOrCreate(runStamp);
TestEventsHandler eventHandler = context.getEventHandler();

String testSuiteName = event.suiteId();
String testName = event.testName();
Object testQualifier = null;
String testParameters = null;
Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
Throwable throwable = event.throwable().getOrElse(null);
String reason = throwable != null ? throwable.getMessage() : null;
eventHandler.onTestSkip(
testSuiteName, testClass, testName, testQualifier, testParameters, reason);
eventHandler.onTestFinish(testSuiteName, testClass, testName, testQualifier, testParameters);
}

private static void onTestPending(TestPending event) {
int runStamp = event.ordinal().runStamp();
RunContext context = RunContext.getOrCreate(runStamp);
TestEventsHandler eventHandler = context.getEventHandler();

String testSuiteName = event.suiteId();
String testName = event.testName();
Object testQualifier = null;
String testParameters = null;
Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
String reason = "pending";

eventHandler.onTestSkip(
testSuiteName, testClass, testName, testQualifier, testParameters, reason);
eventHandler.onTestFinish(testSuiteName, testClass, testName, testQualifier, testParameters);
}
}
Loading
Loading