Skip to content

Minor fixes for code coverage report upload #9659

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

Merged
merged 3 commits into from
Oct 6, 2025
+13 −9
Merged

Minor fixes for code coverage report upload #9659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e39330
Minor fixes for code coverage report upload
nikita-tkachenko-datadog Oct 2, 2025
c263979
Fix a typo
nikita-tkachenko-datadog Oct 3, 2025
ab6442a
Add failed test replay enabled allowed metric
nikita-tkachenko-datadog Oct 3, 2025
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
2 changes: 1 addition & 1 deletion ...lity/src/main/java/datadog/trace/civisibility/coverage/report/CoverageReportUploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
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
11 changes: 7 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,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) {
Expand Down
3 changes: 2 additions & 1 deletion ...l-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityCountMetric.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ public enum CiVisibilityCountMetric {
IsHeadless.class,
HasCodeowner.class,
IsUnsupportedCI.class,
EarlyFlakeDetectionAbortReason.class),
EarlyFlakeDetectionAbortReason.class,
FailedTestReplayEnabled.SessionMetric.class),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not related to code cov report upload, discovered this accidentally while running the tests. The change is so minor that I though I could just include it into this PR

/** The number of test events finished */
TEST_EVENT_FINISHED(
"event_finished",
Expand Down