integration test coverage (#1382)

Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>

Author: adecaro

.github/workflows/tests.yml

@@ -70,12 +70,16 @@ jobs:
         run: make testing-docker-images
 
       - name: Unit Tests with Coverage
-        run: make unit-tests
+        run: |
+          make unit-tests
+          ./ci/scripts/filter-coverage.sh profile.cov profile.cov
 
       - name: Send coverage to Coveralls
         uses: shogo82148/actions-goveralls@v1
         with:
           path-to-profile: profile.cov
+          flag-name: utest-${{ matrix.tests }}
+          parallel: true
 
       - name: Run ${{ matrix.tests }}
         run: make ${{ matrix.tests }}
@@ -165,4 +169,24 @@ jobs:
           make fxconfig configtxgen fabricx-docker-images
 
       - name: Run ${{ matrix.tests }}
-        run: make integration-tests-${{ matrix.tests }}
+        run: |
+          mkdir -p covdata
+          GOCOVERDIR=$(realpath covdata) make integration-tests-${{ matrix.tests }}
+          go tool covdata textfmt -i=covdata -o coverage.profile
+          ./ci/scripts/filter-coverage.sh coverage.profile coverage.profile
+
+      - name: Send coverage to Coveralls
+        uses: shogo82148/actions-goveralls@v1
+        with:
+          path-to-profile: coverage.profile
+          flag-name: itest-${{ matrix.tests }}
+          parallel: true
+
+  publish-coverage:
+    needs: [ utest, itest ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Finish coverage report
+        uses: shogo82148/actions-goveralls@v1
+        with:
+          parallel-finished: true

Makefile

@@ -11,7 +11,7 @@ FAB_BINS ?= $(FABRIC_BINARY_BASE)/bin
 
 # integration test options
 GINKGO_TEST_OPTS ?=
-GINKGO_TEST_OPTS += --keep-going
+GINKGO_TEST_OPTS += --keep-going -cover
 
 TOP = .
 
@@ -39,11 +39,13 @@ install-tools:
 download-fabric:
 	./ci/scripts/download_fabric.sh $(FABRIC_BINARY_BASE) $(FABRIC_VERSION) $(FABRIC_CA_VERSION)
 
+GO_TEST_PARAMS ?= -coverpkg=./... -coverprofile=profile.cov
+GO_PACKAGES = $(shell go list ./... | grep -v '/integration/' | grep -v 'regression' | grep -v 'mock' |  grep -v 'protos-go' |  grep -v 'testutils'; go list ./integration/nwo/...)
+
 .PHONY: unit-tests
 # run standard unit tests
 unit-tests:
-	@go test -coverprofile=profile.cov $(shell go list ./... | grep -v '/integration/' | grep -v 'regression' | grep -v 'mock' |  grep -v 'protos-go' |  grep -v 'testutils')
-	cd integration/nwo/; go test -cover ./...
+	@go test $(GO_TEST_PARAMS) $(GO_PACKAGES)
 	cd token/services/storage/db/kvs/hashicorp/; go test -cover ./...
 
 .PHONY: unit-tests-race

ci/scripts/filter-coverage.sh

@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -euo pipefail
+
+if [ "$#" -ne 2 ]; then
+  echo "Usage: $0 <input-coverage-file> <output-file>"
+  exit 1
+fi
+
+INPUT="$1"
+OUTPUT="$2"
+
+if [ ! -f "$INPUT" ]; then
+  echo "Error: Input file '$INPUT' does not exist."
+  exit 1
+fi
+
+tmp="$(mktemp)"
+
+# Ensure temp file is cleaned up on failure
+trap 'rm -f "$tmp"' EXIT
+
+# We filter some of the files for test coverage reporting.
+awk '
+  # Preserve mode line
+  /^mode:/ { print; next }
+
+  # Exclude main.go
+  /main\.go/ { next }
+
+  # Exclude generated protobuf files (*.pb.go)
+  /\.pb\.go/ { next }
+
+  # Exclude mock and fake packages
+  /\/mocks?\// { next }      # Matches both /mock/ and /mocks/
+  /\/fakes?\// { next }      # Matches both /fake/ and /fakes/
+  /[^\/]*mock[^\/]*\.go:/ { next }  # Matches any file with mock in filename
+  /[^\/]*fake[^\/]*\.go:/ { next }  # Matches any file with fake in filename
+
+  # Exclude integration
+  /\/integration\// { next }
+
+  # Exclude tools and docs
+  /\/tools\// { next }
+  /\/docs\// { next }
+
+  # Keep everything else
+  { print }
+' "$INPUT" > "$tmp"
+
+# Atomically replace output
+mv "$tmp" "$OUTPUT"
+
+# Disable trap since mv succeeded
+trap - EXIT
+
+echo "Filtered coverage written to $OUTPUT"

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/gin-gonic/gin v1.11.0
 	github.com/google/pprof v0.0.0-20260202012954-cb029daf43ef
 	github.com/hashicorp/go-uuid v1.0.3
-	github.com/hyperledger-labs/fabric-smart-client v0.8.3-0.20260217192656-b86312cc3cea
+	github.com/hyperledger-labs/fabric-smart-client v0.8.3-0.20260219175226-8f512e10d1a0
 	github.com/hyperledger/fabric-chaincode-go/v2 v2.3.0
 	github.com/hyperledger/fabric-lib-go v1.1.3-0.20240523144151-25edd1eaf5f5
 	github.com/hyperledger/fabric-protos-go-apiv2 v0.3.7

go.sum

@@ -1025,8 +1025,8 @@ github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc=
 github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
 github.com/hyperledger-labs/SmartBFT v0.0.0-20250503203013-eb005eef8866 h1:Mu/6NJsfl9g3wM15Ue7hqPq4LtgYDoABh8MO4u8aW4g=
 github.com/hyperledger-labs/SmartBFT v0.0.0-20250503203013-eb005eef8866/go.mod h1:9aNHNXsCVy/leGz2gpTC1eOL5QecxbSAGjqsLh4T1LM=
-github.com/hyperledger-labs/fabric-smart-client v0.8.3-0.20260217192656-b86312cc3cea h1:JEOjVR410ND4Ol26pUzMs9KkLicg2A89DBEZa7UrvcI=
-github.com/hyperledger-labs/fabric-smart-client v0.8.3-0.20260217192656-b86312cc3cea/go.mod h1:DHm6Q7lmQC6TIEy++a/hmDNRi6q05bAfRt0v2wfzFGQ=
+github.com/hyperledger-labs/fabric-smart-client v0.8.3-0.20260219175226-8f512e10d1a0 h1:iXfHzs9I08/ok4XuAbcxEcz5qa7nQF6+oImB5VOMo/0=
+github.com/hyperledger-labs/fabric-smart-client v0.8.3-0.20260219175226-8f512e10d1a0/go.mod h1:DHm6Q7lmQC6TIEy++a/hmDNRi6q05bAfRt0v2wfzFGQ=
 github.com/hyperledger/aries-bbs-go v0.0.0-20240528084656-761671ea73bc h1:3Ykk6MtyfnlzMOQry9zkxsoLWpCWZwDPqehO/BJwArM=
 github.com/hyperledger/aries-bbs-go v0.0.0-20240528084656-761671ea73bc/go.mod h1:Kofn6A6WWea1ZM8Rys5aBW9dszwJ7Ywa0kyyYL0TPYw=
 github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 h1:B1Nt8hKb//KvgGRprk0h1t4lCnwhE9/ryb1WqfZbV+M=

token/services/storage/db/kvs/hashicorp/go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/docker/docker v28.3.3+incompatible
 	github.com/docker/go-connections v0.6.0
 	github.com/hashicorp/vault/api v1.16.0
-	github.com/hyperledger-labs/fabric-smart-client v0.8.3-0.20260217192656-b86312cc3cea
+	github.com/hyperledger-labs/fabric-smart-client v0.8.3-0.20260219175226-8f512e10d1a0
 	github.com/hyperledger-labs/fabric-token-sdk v0.4.1-0.20250528165839-032fb9265504
 	github.com/stretchr/testify v1.11.1
 	github.com/test-go/testify v1.1.4

token/services/storage/db/kvs/hashicorp/go.sum

@@ -140,8 +140,8 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/vault/api v1.16.0 h1:nbEYGJiAPGzT9U4oWgaaB0g+Rj8E59QuHKyA5LhwQN4=
 github.com/hashicorp/vault/api v1.16.0/go.mod h1:KhuUhzOD8lDSk29AtzNjgAu2kxRA9jL9NAbkFlqvkBA=
-github.com/hyperledger-labs/fabric-smart-client v0.8.3-0.20260217192656-b86312cc3cea h1:JEOjVR410ND4Ol26pUzMs9KkLicg2A89DBEZa7UrvcI=
-github.com/hyperledger-labs/fabric-smart-client v0.8.3-0.20260217192656-b86312cc3cea/go.mod h1:DHm6Q7lmQC6TIEy++a/hmDNRi6q05bAfRt0v2wfzFGQ=
+github.com/hyperledger-labs/fabric-smart-client v0.8.3-0.20260219175226-8f512e10d1a0 h1:iXfHzs9I08/ok4XuAbcxEcz5qa7nQF6+oImB5VOMo/0=
+github.com/hyperledger-labs/fabric-smart-client v0.8.3-0.20260219175226-8f512e10d1a0/go.mod h1:DHm6Q7lmQC6TIEy++a/hmDNRi6q05bAfRt0v2wfzFGQ=
 github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 h1:B1Nt8hKb//KvgGRprk0h1t4lCnwhE9/ryb1WqfZbV+M=
 github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2/go.mod h1:X+DIyUsaTmalOpmpQfIvFZjKHQedrURQ5t4YqquX7lE=
 github.com/hyperledger/fabric-lib-go v1.1.3-0.20240523144151-25edd1eaf5f5 h1:RPWTL5wxAb+xDOrsCU3QYZP65305F8v3PaOyzdbPVMU=