Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 6e9eadb

Browse files
Implement Scalatest support (DataDog#6331)
1 parent e200ff1 commit 6e9eadb

File tree

42 files changed

+2589
-2
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2589
-2
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ dd-java-agent/instrumentation/jacoco/ @DataDog/ci-app-libraries-java
2020
dd-java-agent/instrumentation/junit-4.10/ @DataDog/ci-app-libraries-java
2121
dd-java-agent/instrumentation/junit-5.3/ @DataDog/ci-app-libraries-java
2222
dd-java-agent/instrumentation/karate/ @DataDog/ci-app-libraries-java
23+
dd-java-agent/instrumentation/scalatest/ @DataDog/ci-app-libraries-java
2324
dd-java-agent/instrumentation/testng/ @DataDog/ci-app-libraries-java
2425
dd-java-agent/instrumentation/gradle/ @DataDog/ci-app-libraries-java
2526
dd-java-agent/instrumentation/maven-3.2.1/ @DataDog/ci-app-libraries-java

‎dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/TestFramework.java‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,18 @@ public int hashCode() {
3939
@Override
4040
public int compareTo(TestFramework o) {
4141
int nameComparison = name.compareTo(o.name);
42-
return nameComparison != 0 ? nameComparison : version.compareTo(o.version);
42+
if (nameComparison != 0) {
43+
return nameComparison;
44+
}
45+
if (version == null && o.version == null) {
46+
return 0;
47+
}
48+
if (version == null) {
49+
return -1;
50+
}
51+
if (o.version == null) {
52+
return 1;
53+
}
54+
return version.compareTo(o.version);
4355
}
4456
}
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
apply from: "$rootDir/gradle/java.gradle"
2+
apply plugin: 'scala'
3+
4+
muzzle {
5+
pass {
6+
group = 'org.scalatest'
7+
module = 'scalatest_2.12'
8+
versions = '[3.0.8,)'
9+
extraDependency 'org.scala-lang:scala-library:2.12.15'
10+
}
11+
}
12+
13+
addTestSuiteForDir('latestDepTest', 'test')
14+
15+
dependencies {
16+
compileOnly group: 'org.scalatest', name: 'scalatest_2.13', version: '3.0.8'
17+
18+
testImplementation testFixtures(project(':dd-java-agent:agent-ci-visibility'))
19+
20+
testImplementation group: 'org.scala-lang', name: 'scala-library', version: '2.12.15'
21+
testImplementation group: 'org.scalatest', name: 'scalatest_2.12', version: '3.1.0'
22+
23+
latestDepTestImplementation group: 'org.scalatest', name: 'scalatest_2.12', version: '+'
24+
}
25+
26+
compileTestGroovy {
27+
dependsOn compileTestScala
28+
classpath += files(sourceSets.test.scala.destinationDirectory)
29+
}
30+
compileLatestDepTestGroovy {
31+
dependsOn compileLatestDepTestScala
32+
classpath += files(sourceSets.latestDepTest.scala.destinationDirectory)
33+
}
Lines changed: 247 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,247 @@
1+
package datadog.trace.instrumentation.scalatest;
2+
3+
import datadog.trace.api.civisibility.InstrumentationBridge;
4+
import datadog.trace.api.civisibility.config.SkippableTest;
5+
import datadog.trace.api.civisibility.events.TestEventsHandler;
6+
import java.lang.reflect.Method;
7+
import java.util.Collection;
8+
import java.util.Collections;
9+
import org.scalatest.events.Event;
10+
import org.scalatest.events.RunAborted;
11+
import org.scalatest.events.RunCompleted;
12+
import org.scalatest.events.RunStarting;
13+
import org.scalatest.events.RunStopped;
14+
import org.scalatest.events.SuiteAborted;
15+
import org.scalatest.events.SuiteCompleted;
16+
import org.scalatest.events.SuiteStarting;
17+
import org.scalatest.events.TestCanceled;
18+
import org.scalatest.events.TestFailed;
19+
import org.scalatest.events.TestIgnored;
20+
import org.scalatest.events.TestPending;
21+
import org.scalatest.events.TestStarting;
22+
import org.scalatest.events.TestSucceeded;
23+
24+
public class DatadogReporter {
25+
26+
private static final String TEST_FRAMEWORK = "scalatest";
27+
private static final String TEST_FRAMEWORK_VERSION = ScalatestUtils.getScalatestVersion();
28+
29+
public static void handle(Event event) {
30+
if (event instanceof RunStarting) {
31+
start(event);
32+
33+
} else if (event instanceof RunCompleted) {
34+
stop(event);
35+
36+
} else if (event instanceof RunAborted) {
37+
stop(event);
38+
39+
} else if (event instanceof RunStopped) {
40+
stop(event);
41+
42+
} else if (event instanceof SuiteStarting) {
43+
onSuiteStart((SuiteStarting) event);
44+
45+
} else if (event instanceof SuiteCompleted) {
46+
onSuiteFinish((SuiteCompleted) event);
47+
48+
} else if (event instanceof SuiteAborted) {
49+
onSuiteAbort((SuiteAborted) event);
50+
51+
} else if (event instanceof TestStarting) {
52+
onTestStart((TestStarting) event);
53+
54+
} else if (event instanceof TestSucceeded) {
55+
onTestSuccess((TestSucceeded) event);
56+
57+
} else if (event instanceof TestFailed) {
58+
onTestFailure((TestFailed) event);
59+
60+
} else if (event instanceof TestIgnored) {
61+
onTestIgnore((TestIgnored) event);
62+
63+
} else if (event instanceof TestCanceled) {
64+
onTestCancel((TestCanceled) event);
65+
66+
} else if (event instanceof TestPending) {
67+
onTestPending((TestPending) event);
68+
}
69+
}
70+
71+
private static void start(Event event) {
72+
int runStamp = event.ordinal().runStamp();
73+
RunContext.getOrCreate(runStamp);
74+
}
75+
76+
private static void stop(Event event) {
77+
int runStamp = event.ordinal().runStamp();
78+
RunContext.destroy(runStamp);
79+
}
80+
81+
private static void onSuiteStart(SuiteStarting event) {
82+
int runStamp = event.ordinal().runStamp();
83+
RunContext context = RunContext.getOrCreate(runStamp);
84+
TestEventsHandler eventHandler = context.getEventHandler();
85+
86+
String testSuiteName = event.suiteId();
87+
Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
88+
Collection<String> categories = Collections.emptyList();
89+
boolean parallelized = true;
90+
91+
eventHandler.onTestSuiteStart(
92+
testSuiteName, TEST_FRAMEWORK, TEST_FRAMEWORK_VERSION, testClass, categories, parallelized);
93+
}
94+
95+
private static void onSuiteFinish(SuiteCompleted event) {
96+
int runStamp = event.ordinal().runStamp();
97+
RunContext context = RunContext.getOrCreate(runStamp);
98+
TestEventsHandler eventHandler = context.getEventHandler();
99+
100+
String testSuiteName = event.suiteId();
101+
Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
102+
eventHandler.onTestSuiteFinish(testSuiteName, testClass);
103+
}
104+
105+
private static void onSuiteAbort(SuiteAborted event) {
106+
int runStamp = event.ordinal().runStamp();
107+
RunContext context = RunContext.getOrCreate(runStamp);
108+
TestEventsHandler eventHandler = context.getEventHandler();
109+
110+
String testSuiteName = event.suiteId();
111+
Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
112+
Throwable throwable = event.throwable().getOrElse(null);
113+
eventHandler.onTestSuiteFailure(testSuiteName, testClass, throwable);
114+
eventHandler.onTestSuiteFinish(testSuiteName, testClass);
115+
}
116+
117+
private static void onTestStart(TestStarting event) {
118+
int runStamp = event.ordinal().runStamp();
119+
RunContext context = RunContext.getOrCreate(runStamp);
120+
TestEventsHandler eventHandler = context.getEventHandler();
121+
122+
String testSuiteName = event.suiteId();
123+
String testName = event.testName();
124+
Object testQualifier = null;
125+
String testParameters = null;
126+
Collection<String> categories;
127+
if (context.unskippable(new SkippableTest(testSuiteName, testName, null, null))) {
128+
categories = Collections.singletonList(InstrumentationBridge.ITR_UNSKIPPABLE_TAG);
129+
} else {
130+
categories = Collections.emptyList();
131+
}
132+
Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
133+
String testMethodName = null;
134+
Method testMethod = null;
135+
136+
eventHandler.onTestStart(
137+
testSuiteName,
138+
testName,
139+
testQualifier,
140+
TEST_FRAMEWORK,
141+
TEST_FRAMEWORK_VERSION,
142+
testParameters,
143+
categories,
144+
testClass,
145+
testMethodName,
146+
testMethod);
147+
}
148+
149+
private static void onTestSuccess(TestSucceeded event) {
150+
int runStamp = event.ordinal().runStamp();
151+
RunContext context = RunContext.getOrCreate(runStamp);
152+
TestEventsHandler eventHandler = context.getEventHandler();
153+
154+
String testSuiteName = event.suiteId();
155+
Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
156+
String testName = event.testName();
157+
Object testQualifier = null;
158+
String testParameters = null;
159+
eventHandler.onTestFinish(testSuiteName, testClass, testName, testQualifier, testParameters);
160+
}
161+
162+
private static void onTestFailure(TestFailed event) {
163+
int runStamp = event.ordinal().runStamp();
164+
RunContext context = RunContext.getOrCreate(runStamp);
165+
TestEventsHandler eventHandler = context.getEventHandler();
166+
167+
String testSuiteName = event.suiteId();
168+
Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
169+
String testName = event.testName();
170+
Object testQualifier = null;
171+
String testParameters = null;
172+
Throwable throwable = event.throwable().getOrElse(null);
173+
eventHandler.onTestFailure(
174+
testSuiteName, testClass, testName, testQualifier, testParameters, throwable);
175+
eventHandler.onTestFinish(testSuiteName, testClass, testName, testQualifier, testParameters);
176+
}
177+
178+
private static void onTestIgnore(TestIgnored event) {
179+
int runStamp = event.ordinal().runStamp();
180+
RunContext context = RunContext.getOrCreate(runStamp);
181+
TestEventsHandler eventHandler = context.getEventHandler();
182+
183+
String testSuiteName = event.suiteId();
184+
String testName = event.testName();
185+
Object testQualifier = null;
186+
String testParameters = null;
187+
Collection<String> categories = Collections.emptyList();
188+
Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
189+
String testMethodName = null;
190+
Method testMethod = null;
191+
192+
String reason;
193+
SkippableTest skippableTest = new SkippableTest(testSuiteName, testName, null, null);
194+
if (context.skipped(skippableTest)) {
195+
reason = InstrumentationBridge.ITR_SKIP_REASON;
196+
} else {
197+
reason = null;
198+
}
199+
200+
eventHandler.onTestIgnore(
201+
testSuiteName,
202+
testName,
203+
testQualifier,
204+
TEST_FRAMEWORK,
205+
TEST_FRAMEWORK_VERSION,
206+
testParameters,
207+
categories,
208+
testClass,
209+
testMethodName,
210+
testMethod,
211+
reason);
212+
}
213+
214+
private static void onTestCancel(TestCanceled event) {
215+
int runStamp = event.ordinal().runStamp();
216+
RunContext context = RunContext.getOrCreate(runStamp);
217+
TestEventsHandler eventHandler = context.getEventHandler();
218+
219+
String testSuiteName = event.suiteId();
220+
String testName = event.testName();
221+
Object testQualifier = null;
222+
String testParameters = null;
223+
Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
224+
Throwable throwable = event.throwable().getOrElse(null);
225+
String reason = throwable != null ? throwable.getMessage() : null;
226+
eventHandler.onTestSkip(
227+
testSuiteName, testClass, testName, testQualifier, testParameters, reason);
228+
eventHandler.onTestFinish(testSuiteName, testClass, testName, testQualifier, testParameters);
229+
}
230+
231+
private static void onTestPending(TestPending event) {
232+
int runStamp = event.ordinal().runStamp();
233+
RunContext context = RunContext.getOrCreate(runStamp);
234+
TestEventsHandler eventHandler = context.getEventHandler();
235+
236+
String testSuiteName = event.suiteId();
237+
String testName = event.testName();
238+
Object testQualifier = null;
239+
String testParameters = null;
240+
Class<?> testClass = ScalatestUtils.getClass(event.suiteClassName());
241+
String reason = "pending";
242+
243+
eventHandler.onTestSkip(
244+
testSuiteName, testClass, testName, testQualifier, testParameters, reason);
245+
eventHandler.onTestFinish(testSuiteName, testClass, testName, testQualifier, testParameters);
246+
}
247+
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /