diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/CoverageReportUploader.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/CoverageReportUploader.java
index 65423dd46ae..0d0ffef37c9 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/CoverageReportUploader.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/CoverageReportUploader.java
@@ -65,7 +65,7 @@ public void upload(String format, InputStream reportStream) throws IOException {
             .requestCount(CiVisibilityCountMetric.COVERAGE_UPLOAD_REQUEST)
             .requestBytes(CiVisibilityDistributionMetric.COVERAGE_UPLOAD_REQUEST_BYTES)
             .requestErrors(CiVisibilityCountMetric.COVERAGE_UPLOAD_REQUEST_ERRORS)
-            .requestDuration(CiVisibilityDistributionMetric.KNOWN_TESTS_REQUEST_MS)
+            .requestDuration(CiVisibilityDistributionMetric.COVERAGE_UPLOAD_REQUEST_MS)
             .build();
 
     backendApi.post("cicovreprt", multipartBody, responseStream -> null, telemetryListener, false);
diff --git a/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleProjectConfigurator.groovy b/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleProjectConfigurator.groovy
index cc7b1bf205d..43d4fb64128 100644
--- a/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleProjectConfigurator.groovy
+++ b/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
     }
 
diff --git a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java
index 73937478165..dd63e02b0e0 100644
--- a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java
+++ b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java
@@ -245,14 +245,17 @@ private static Xpp3Dom addAnnotationProcessorPath(
   void configureJacoco(
       MavenSession session, MavenProject project, BuildSessionSettings sessionSettings) {
     excludeDatadogClassLoaderFromJacocoInstrumentation(project);
+    if (!Config.get().isCiVisibilityJacocoPluginVersionProvided()
+        && !sessionSettings.isCoverageReportUploadEnabled()) {
+      return;
+    }
+
     if (runsWithJacoco(session, project)) {
       // Jacoco is already configured for this project
       return;
     }
-    if (Config.get().isCiVisibilityJacocoPluginVersionProvided()
-        || sessionSettings.isCoverageReportUploadEnabled()) {
-      configureJacocoPlugin(project, sessionSettings);
-    }
+
+    configureJacocoPlugin(project, sessionSettings);
   }
 
   private boolean runsWithJacoco(MavenSession session, MavenProject project) {
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityCountMetric.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityCountMetric.java
index 58076bb5eb8..9347472a101 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityCountMetric.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityCountMetric.java
@@ -71,7 +71,8 @@ public enum CiVisibilityCountMetric {
       IsHeadless.class,
       HasCodeowner.class,
       IsUnsupportedCI.class,
-      EarlyFlakeDetectionAbortReason.class),
+      EarlyFlakeDetectionAbortReason.class,
+      FailedTestReplayEnabled.SessionMetric.class),
   /** The number of test events finished */
   TEST_EVENT_FINISHED(
       "event_finished",