[chore][codecov] Fix coverage file naming #39356
Merged
+8
−4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
atoulme
approved these changes
Apr 14, 2025
crobert-1
commented
Apr 14, 2025
Makefile.Common
Outdated
| @@ -18,7 +21,7 @@ GOTEST_TIMEOUT?= 600s | |||
| GOTEST_OPT?= -race -timeout $(GOTEST_TIMEOUT) -parallel 4 --tags=$(GO_BUILD_TAGS) | |||
| GOTEST_INTEGRATION_OPT?= -race -timeout 360s -parallel 4 -skip Sudo | |||
| GOTEST_INTEGRATION_OPT_SUDO?= -race -timeout 360s -parallel 4 -exec sudo -run Sudo | |||
| GOTEST_OPT_WITH_COVERAGE = $(GOTEST_OPT) -coverprofile=coverage.txt -covermode=atomic | |||
| GOTEST_OPT_WITH_COVERAGE = $(GOTEST_OPT) -covermode=atomic -test.gocoverdir="$(COVER_DIR_ABS)" | |||
There was a problem hiding this comment.
There are two changes going on here:
- Do not set
-coverprofile: This sets the output filename of the code coverage results. We want a random name so they are not clobbered when moving them into the same location. - Add the
-test.gocoverdiroption: This means all code coverage files will be in the same directory, making it simpler to generate the final merged report.
Makefile
Outdated
| @@ -186,6 +186,7 @@ gotest-with-junit: | |||
| .PHONY: gotest-with-junit-and-cover | |||
| gotest-with-junit-and-cover: | |||
| @$(MAKE) $(FOR_GROUP_TARGET) TARGET="test-with-junit-and-cover" | |||
| @go tool covdata textfmt -i=$(COVER_DIR_ABS) -o coverage.txt | |||
There was a problem hiding this comment.
This change means all coverage files located in the coverage directory will be merged into a single file, which can then be uploaded by the workflow.
songy23
approved these changes
Apr 14, 2025
|
Successful codecov run from this PR here: https://app.codecov.io/github/open-telemetry/opentelemetry-collector-contrib/commit/3b688e20240d1b881bae21ba13423989613e2245/tree |
crobert-1
commented
Apr 14, 2025
crobert-1
commented
Apr 14, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Uploads to codecov have been broken since #37875 was merged. Efforts have been made to address the reasoning behind why it's not working (eg #38236), but it's still failing.
Example recent failure:
This failure is hit here.
This PR aims to correct the naming and location of code coverage files to enable the successful upload to codecov.