Re-enable codecov for test coverage (#4125)

Codecov was disabled here due to security concerns: https://github.com/open-telemetry/opentelemetry-collector/pull/3014/files

This new PR no longer downloads the codecov script from a remote location so is no longer susceptible to the same problem.

Author: bogdandrutu

.codecov.yml

@@ -17,7 +17,5 @@ coverage:
 
 ignore:
   - "service/internal/zpages/tmplgen/**/*"
-  - "*/**/metadata/generated_metrics.go"
-  - "internal/data/protogen/**/*"
-  - "testbed/**/*"
+  - "model/internal/data/protogen/**/*"
   - "*/**/third_party/**/*"

.github/workflows/build-and-test.yml

@@ -124,6 +124,46 @@ jobs:
           key: tools-${{ runner.os }}-${{ hashFiles('./internal/tools/go.mod', './cmd/mdatagen/go.mod', './cmd/mdatagen/*.go') }}
       - name: Run Unit Tests
         run: make gotest
+  test-coverage:
+    runs-on: ubuntu-latest
+    needs: [setup-environment]
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+      - name: Setup Go
+        uses: actions/[email protected]
+        with:
+          go-version: 1.17
+      - name: Setup Go Environment
+        run: |
+          echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
+          echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
+      - name: Cache Go
+        id: module-cache
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-go-modules
+        with:
+          path: |
+            /home/runner/go/pkg/mod
+            /home/runner/.cache/go-build
+          key: go-pkg-mod-${{ runner.os }}-${{ hashFiles('**/go.mod', '**/go.sum') }}
+      - name: Cache Tools
+        id: tool-cache
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-tool-binaries
+        with:
+          path: /home/runner/go/bin
+          key: tools-${{ runner.os }}-${{ hashFiles('./internal/tools/go.mod', './cmd/mdatagen/go.mod', './cmd/mdatagen/*.go') }}
+      - name: Run Unit Tests With Coverage
+        run: make gotest-with-cover
+      - name: Upload coverage report
+        uses: codecov/[email protected]
+        with:
+          file: ./coverage.txt
+          fail_ci_if_error: true
+          verbose: true
   cross-compile:
     runs-on: ubuntu-latest
     needs: [setup-environment]

.gitignore

@@ -18,9 +18,8 @@ dist/
 *.DS_Store
 
 # Coverage
+coverage.out
 coverage.txt
-coverage_all.txt
-coverage_old.txt
 coverage.html
 
 # Wix

Makefile

@@ -2,9 +2,7 @@ include ./Makefile.Common
 
 # This is the code that we want to run lint, etc.
 ALL_SRC := $(shell find . -name '*.go' \
-							-not -path './cmd/schemagen/*' \
 							-not -path './internal/tools/*' \
-							-not -path './examples/demo/app/*' \
 							-not -path './model/internal/data/protogen/*' \
 							-not -path './service/internal/zpages/tmplgen/*' \
 							-type f | sort)
@@ -31,8 +29,8 @@ CONTRIB_PATH=$(CURDIR)/../opentelemetry-collector-contrib
 COMP_REL_PATH=service/defaultcomponents/defaults.go
 MOD_NAME=go.opentelemetry.io/collector
 
-GO_ACC=go-acc
 ADDLICENSE=addlicense
+GOCOVMERGE=gocovmerge
 MISSPELL=misspell -error
 MISSPELL_CORRECTION=misspell -w
 
@@ -70,10 +68,8 @@ gobenchmark:
 
 .PHONY: gotest-with-cover
 gotest-with-cover:
-	@echo pre-compiling tests
-	@time $(GOTEST) -i ./...
-	$(GO_ACC) ./...
-	go tool cover -html=coverage.txt -o coverage.html
+	@$(MAKE) for-all CMD="make test-with-cover"
+	$(GOCOVMERGE) $$(find . -name coverage.out) > coverage.txt
 
 .PHONY: golint
 golint:
@@ -133,8 +129,9 @@ install-tools:
 	cd $(TOOLS_MOD_DIR) && go install github.com/ory/go-acc
 	cd $(TOOLS_MOD_DIR) && go install github.com/pavius/impi/cmd/impi
 	cd $(TOOLS_MOD_DIR) && go install github.com/tcnksm/ghr
-	cd $(TOOLS_MOD_DIR) && go install go.opentelemetry.io/build-tools/semconvgen
+	cd $(TOOLS_MOD_DIR) && go install github.com/wadey/gocovmerge
 	cd $(TOOLS_MOD_DIR) && go install go.opentelemetry.io/build-tools/checkdoc
+	cd $(TOOLS_MOD_DIR) && go install go.opentelemetry.io/build-tools/semconvgen
 	cd $(TOOLS_MOD_DIR) && go install golang.org/x/exp/cmd/apidiff
 	cd $(TOOLS_MOD_DIR) && go install golang.org/x/tools/cmd/goimports
 

Makefile.Common

@@ -5,16 +5,21 @@ ALL_PKGS := $(sort $(shell go list ./...))
 # wide resources, e.g. ports.
 GOTEST_OPT?= -v -p 1 -race -timeout 60s
 GOTEST=go test
+GO_ACC=go-acc
 LINT=golangci-lint
 IMPI=impi
 
 .PHONY: test
 test:
-	@echo $(ALL_PKGS) | xargs -n 10 $(GOTEST) $(GOTEST_OPT)
+	$(GOTEST) $(GOTEST_OPT) ./...
 
 .PHONY: test-unstable
 test-unstable:
-	@echo $(ALL_PKGS) | xargs -n 10 $(GOTEST) $(GOTEST_OPT) -tags enable_unstable
+	$(GOTEST) $(GOTEST_OPT) -tags enable_unstable ./...
+
+.PHONY: test-with-cover
+test-with-cover:
+	$(GO_ACC) --output=coverage.out ./...
 
 .PHONY: benchmark
 benchmark:

internal/tools/go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/ory/go-acc v0.2.6
 	github.com/pavius/impi v0.0.3
 	github.com/tcnksm/ghr v0.14.0
+	github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad
 	go.opentelemetry.io/build-tools/checkdoc v0.0.0-20210826185254-a20c5b1e2d7c
 	go.opentelemetry.io/build-tools/semconvgen v0.0.0-20210813222030-0139980e9794
 	golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5

internal/tools/go.sum

@@ -737,6 +737,8 @@ github.com/valyala/fasthttp v1.16.0/go.mod h1:YOKImeEosDdBPnxc0gy7INqi3m1zK6A+xl
 github.com/valyala/quicktemplate v1.6.3/go.mod h1:fwPzK2fHuYEODzJ9pkw0ipCPNHZ2tD5KW4lOuSdPKzY=
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/viki-org/dnscache v0.0.0-20130720023526-c70c1f23c5d8/go.mod h1:dniwbG03GafCjFohMDmz6Zc6oCuiqgH6tGNyXTkHzXE=
+github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad h1:W0LEBv82YCGEtcmPA3uNZBI33/qF//HAAs3MawDjRa0=
+github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad/go.mod h1:Hy8o65+MXnS6EwGElrSRjUzQDLXreJlzYLlWiHtt8hM=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=

internal/tools/tools.go

@@ -30,6 +30,7 @@ import (
 	_ "github.com/ory/go-acc"
 	_ "github.com/pavius/impi/cmd/impi"
 	_ "github.com/tcnksm/ghr"
+	_ "github.com/wadey/gocovmerge"
 	_ "go.opentelemetry.io/build-tools/checkdoc"
 	_ "go.opentelemetry.io/build-tools/semconvgen"
 	_ "golang.org/x/exp/cmd/apidiff"