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.

Sign up for GitHub

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

Fix Gradle instrumentation: do not fail if Jacoco excluded CL list is immutable #7044

Merged
merged 1 commit into from
May 17, 2024
Merged

Fix Gradle instrumentation: do not fail if Jacoco excluded CL list is immutable #7044

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions ...dle/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPluginExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,15 @@ private static Map<String, String> getProjectProperties(Test task) {
private void applyJacocoSettings(Path jvmExecutable, JacocoTaskExtension jacocoTaskExtension) {
CiVisibilityService ciVisibilityService = getCiVisibilityService().get();

List<String> taskExcludeClassLoader = jacocoTaskExtension.getExcludeClassLoaders();
if (taskExcludeClassLoader != null) {
taskExcludeClassLoader.addAll(ciVisibilityService.getExcludeClassLoaders());
List<String> taskExcludeClassLoaders = jacocoTaskExtension.getExcludeClassLoaders();
if (taskExcludeClassLoaders != null) {
// taskExcludeClassLoaders list may be immutable, so we need to construct a new one
List<String> ciVisExcludedClassLoaders = ciVisibilityService.getExcludeClassLoaders();
List<String> updatedTaskExcludeClassLoaders =
new ArrayList<>(taskExcludeClassLoaders.size() + ciVisExcludedClassLoaders.size());
updatedTaskExcludeClassLoaders.addAll(taskExcludeClassLoaders);
updatedTaskExcludeClassLoaders.addAll(ciVisExcludedClassLoaders);
jacocoTaskExtension.setExcludeClassLoaders(updatedTaskExcludeClassLoaders);
} else {
jacocoTaskExtension.setExcludeClassLoaders(
new ArrayList<>(ciVisibilityService.getExcludeClassLoaders()));
Expand Down
Loading