Skip to content

[DEBUG] Revert parts of cov report upload logic #9652

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

Closed
nikita-tkachenko-datadog wants to merge 1 commit into from
Closed

[DEBUG] Revert parts of cov report upload logic #9652

Show file tree
Hide file tree
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
9 changes: 1 addition & 8 deletions ...-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityCoverageServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import datadog.trace.api.civisibility.coverage.CoverageStore;
import datadog.trace.api.civisibility.coverage.NoOpCoverageStore;
import datadog.trace.civisibility.config.ExecutionSettings;
import datadog.trace.civisibility.config.JvmInfo;
import datadog.trace.civisibility.coverage.SkippableAwareCoverageStoreFactory;
import datadog.trace.civisibility.coverage.file.FileCoverageStore;
import datadog.trace.civisibility.coverage.line.LineCoverageStore;
Expand All @@ -32,13 +31,7 @@ static class Parent {
Parent(CiVisibilityServices services, CiVisibilityRepoServices repoServices) {
moduleSignalRouter = new ModuleSignalRouter();

ExecutionSettings executionSettings =
repoServices.executionSettingsFactory.create(JvmInfo.CURRENT_JVM, null);
CoverageReportUploader coverageReportUploader =
executionSettings.isCodeCoverageReportUploadEnabled()
? new CoverageReportUploader(
services.ciIntake, repoServices.ciTags, services.metricCollector)
: null;
CoverageReportUploader coverageReportUploader = null;

coverageProcessorFactory =
new JacocoCoverageProcessor.Factory(
Expand Down
2 changes: 1 addition & 1 deletion ...nt/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public class CiVisibilityServices {
this.config = config;
this.metricCollector = metricCollector;
this.backendApi = new BackendApiFactory(config, sco).createBackendApi(Intake.API);
this.ciIntake = new BackendApiFactory(config, sco).createBackendApi(Intake.CI_INTAKE);
this.ciIntake = null;
this.jvmInfoFactory = new CachingJvmInfoFactory(config, new JvmInfoFactoryImpl());
this.gitClientFactory = buildGitClientFactory(config, metricCollector);

Expand Down
6 changes: 3 additions & 3 deletions .../main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleProjectConfigurator.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,12 @@ class GradleProjectConfigurator {

private void configureJacoco(Project project, BuildSessionSettings sessionSettings) {
def config = Config.get()
if (project.plugins.hasPlugin(JACOCO_PLUGIN_ID)) {
// Jacoco is already configured for this project
if (!config.isCiVisibilityJacocoPluginVersionProvided() && !sessionSettings.isCoverageReportUploadEnabled()) {
return
}

if (!config.isCiVisibilityJacocoPluginVersionProvided() && !sessionSettings.isCoverageReportUploadEnabled()) {
if (project.plugins.hasPlugin(JACOCO_PLUGIN_ID)) {
// Jacoco is already configured for this project
return
}

Expand Down
10 changes: 6 additions & 4 deletions ...en-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,14 @@ private static Xpp3Dom addAnnotationProcessorPath(
void configureJacoco(
MavenSession session, MavenProject project, BuildSessionSettings sessionSettings) {
excludeDatadogClassLoaderFromJacocoInstrumentation(project);
if (runsWithJacoco(session, project)) {
// Jacoco is already configured for this project
return;
}
if (Config.get().isCiVisibilityJacocoPluginVersionProvided()
|| sessionSettings.isCoverageReportUploadEnabled()) {

if (runsWithJacoco(session, project)) {
// Jacoco is already configured for this project
return;
}

configureJacocoPlugin(project, sessionSettings);
}
}
Expand Down
Loading