Revert parts of cov report upload logic

Author: nikita-tkachenko-datadog

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityCoverageServices.java

@@ -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;
@@ -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(

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityServices.java

@@ -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);
 

dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleProjectConfigurator.groovy

@@ -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
     }
 

dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java

@@ -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);
     }
   }