[chore][codecov] Add darwin-test (#6072)

* [chore][codecov] Add coverage to darwin-test

* Add coverage upload step

* Update Makefile

Author: crobert-1

.github/workflows/darwin-test.yml

@@ -51,14 +51,20 @@ jobs:
           make install-tools
           mkdir -p unit-test-results-${{ matrix.OS }}/junit
           trap "go-junit-report  -set-exit-code < unit-test-results-${{ matrix.OS }}/go-unit-tests.out > unit-test-results-${{ matrix.OS }}/junit/results.xml" EXIT
-          make for-all CMD="make test-without-race" | tee unit-test-results-${{ matrix.OS }}/go-unit-tests.out
+          make gotest-cover-without-race | tee unit-test-results-${{ matrix.OS }}/go-unit-tests.out
 
       - name: Uploading artifacts
         uses: actions/upload-artifact@v4
         with:
           name: unit-test-results-${{ matrix.OS }}
           path: ./unit-test-results-${{ matrix.OS }}
 
+      - name: Upload coverage report
+        uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # 5.4.0
+        env:
+          fail_ci_if_error: true
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
       - name: bundle.d
         run: |
           make bundle.d

Makefile

@@ -139,6 +139,11 @@ gotest-with-cover:
 	@$(MAKE) for-all-target TARGET="test-with-codecov"
 	$(GOCMD) tool covdata textfmt -i=./coverage/unit -o ./coverage.txt
 
+.PHONY: gotest-cover-without-race
+gotest-cover-without-race:
+	@$(MAKE) for-all-target TARGET="test-cover-without-race"
+	$(GOCMD) tool covdata textfmt -i=./coverage -o ./coverage.txt
+
 .PHONY: gendependabot
 gendependabot:
 	.github/workflows/scripts/gendependabot.sh

Makefile.Common

@@ -23,8 +23,6 @@ endif
 # SRC_ROOT is the top of the source tree.
 SRC_ROOT := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
 
-# COVER_PKGS is the list of packages to include in the coverage
-COVER_PKGS := $(shell go list ./... | tr "\n" ",")
 
 # build tags required by any component should be defined as an independent variables and later added to GO_BUILD_TAGS below
 GO_BUILD_TAGS=""
@@ -43,6 +41,11 @@ IMPI=impi
 # BUILD_TYPE should be one of (dev, release).
 BUILD_TYPE?=release
 
+# COVER_PKGS is the list of packages to include in the test coverage
+COVER_PKGS := $(shell go list ./... | tr "\n" ",")
+COVER_DIR?=$(PWD)/coverage
+COVER_OPTS?=-cover -covermode=atomic -coverpkg $(COVER_PKGS) -args -test.gocoverdir="$(COVER_DIR)"
+
 ALL_PKG_DIRS := $(shell $(GOCMD) list -f '{{ .Dir }}' ./... | $(NORMALIZE_DIRS))
 
 ALL_SRC := $(shell find $(ALL_PKG_DIRS) -name '*.go' \
@@ -86,9 +89,10 @@ test-with-codecov:
 # Currently, running CGO_ENABLED=0 go test -race is broken in gopsutil/v4
 # This target should be removed in favor of "test" once the following issue is resolved:
 # https://github.com/shirou/gopsutil/issues/1774
-.PHONY: test-without-race
-test-without-race:
-	$(GOTEST) $(GOTEST_OPT_WITHOUT_RACE) $(ALL_PKG_DIRS)
+.PHONY: test-cover-without-race
+test-cover-without-race:
+	mkdir -p $(COVER_DIR)
+	$(GOTEST) $(GOTEST_OPT_WITHOUT_RACE) ./... $(COVER_OPTS)
 
 .PHONY: addlicense
 addlicense:

internal/signalfx-agent/Makefile

@@ -11,6 +11,8 @@ GOTEST_OPT_WITHOUT_RACE?= -v -timeout 180s --tags=$(GO_BUILD_TAGS)
 
 # COVER_PKGS is the list of packages to include in the coverage
 COVER_PKGS := $(shell $(GOCMD) list ./... | tr "\n" ",")
+COVER_DIR?=$(PWD)/coverage
+COVER_OPTS?=-cover -covermode=atomic -coverpkg $(COVER_PKGS) -args -test.gocoverdir="$(COVER_DIR)"
 
 .PHONY: clean
 clean:
@@ -60,9 +62,10 @@ test-race-detector:
 # Currently, running CGO_ENABLED=0 go test -race is broken in gopsutil/v4
 # This target should be removed in favor of "test" once the following issue is resolved:
 # https://github.com/shirou/gopsutil/issues/1774
-.PHONY: test-without-race
-test-without-race:
-	$(GOTEST) $(GOTEST_OPT_WITHOUT_RACE) ./...
+.PHONY: test-cover-without-race
+test-cover-without-race:
+	mkdir -p $(COVER_DIR)
+	$(GOTEST) $(GOTEST_OPT_WITHOUT_RACE) ./... $(COVER_OPTS)
 
 .PHONY: check
 check: lint vet test