[chore][codecov] Update cover make targets for consistency (#6142)

* [chore][codecov] Update make targets for consistency

* Remove extra newline

Author: crobert-1

Makefile.Common

@@ -23,7 +23,6 @@ endif
 # SRC_ROOT is the top of the source tree.
 SRC_ROOT := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
 
-
 # build tags required by any component should be defined as an independent variables and later added to GO_BUILD_TAGS below
 GO_BUILD_TAGS=""
 GOTEST_OPT?= -race -v -timeout 180s --tags=$(GO_BUILD_TAGS)
@@ -46,8 +45,12 @@ EXCLUDE_MODS=-not -path "./examples/*"
 FIND_MOD_ARGS=-type f -name "go.mod"
 COVER_PKGS := $(shell find . $(EXCLUDE_MODS) $(FIND_MOD_ARGS) -execdir $(GOCMD) list ./... \; | tr "\n" "," )
 
-COVER_DIR?=$(PWD)/coverage
-COVER_OPTS?=-cover -covermode=atomic -coverpkg $(COVER_PKGS) -args -test.gocoverdir="$(COVER_DIR)"
+COVER_DIR?=coverage
+COVER_DIR_ABS?=$(SRC_ROOT)/$(COVER_DIR)
+TEST_COVER_DIR?=$(SRC_ROOT)/tests/$(COVER_DIR)
+COVER_OPTS?=-cover -covermode=atomic -coverpkg $(COVER_PKGS)
+COVER_TESTING_OPTS?=$(COVER_OPTS) -args -test.gocoverdir="$(COVER_DIR_ABS)"
+COVER_TESTING_INTEGRATION_OPTS?=$(COVER_OPTS) -args -test.gocoverdir="$(TEST_COVER_DIR)"
 
 ALL_PKG_DIRS := $(shell $(GOCMD) list -f '{{ .Dir }}' ./... | $(NORMALIZE_DIRS))
 
@@ -94,8 +97,8 @@ test-with-codecov:
 # https://github.com/shirou/gopsutil/issues/1774
 .PHONY: test-cover-without-race
 test-cover-without-race:
-	mkdir -p $(COVER_DIR)
-	$(GOTEST) $(GOTEST_OPT_WITHOUT_RACE) ./... $(COVER_OPTS)
+	mkdir -p $(COVER_DIR_ABS)
+	$(GOTEST) $(GOTEST_OPT_WITHOUT_RACE) ./... $(COVER_TESTING_OPTS)
 
 .PHONY: addlicense
 addlicense:

internal/signalfx-agent/Makefile

@@ -11,8 +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)"
+COVER_DIR_ABS?=$(PWD)/coverage
+COVER_TESTING_OPTS?=-cover -covermode=atomic -coverpkg $(COVER_PKGS) -args -test.gocoverdir="$(COVER_DIR_ABS)"
 
 .PHONY: clean
 clean:
@@ -64,8 +64,8 @@ test-race-detector:
 # https://github.com/shirou/gopsutil/issues/1774
 .PHONY: test-cover-without-race
 test-cover-without-race:
-	mkdir -p $(COVER_DIR)
-	$(GOTEST) $(GOTEST_OPT_WITHOUT_RACE) ./... $(COVER_OPTS)
+	mkdir -p $(COVER_DIR_ABS)
+	$(GOTEST) $(GOTEST_OPT_WITHOUT_RACE) ./... $(COVER_TESTING_OPTS)
 
 .PHONY: check
 check: lint vet test
@@ -85,5 +85,5 @@ misspell: misspell-noop
 
 .PHONY: test-with-codecov
 test-with-codecov:
-	mkdir -p $(COVER_DIR)
-	$(GOTEST) $(GOTEST_OPT) ./... $(COVER_OPTS)
+	mkdir -p $(COVER_DIR_ABS)
+	$(GOTEST) $(GOTEST_OPT) ./... $(COVER_TESTING_OPTS)