Improve test run

.github/workflows/ci.yml

@@ -32,7 +32,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version-file: "go.mod"
-
+      
       - name: Start dependencies
         run: make deps-start
 

Makefile

@@ -11,7 +11,7 @@ testint: fmtcheck
 testint-nocache: fmtcheck
 	go test ./... -race -cover -tags=integration -timeout 300s -count=1
 
-ci: fmtcheck
+ci: 
 	go test `go list ./... | grep -v -e 'examples' -e 'encoding/protobuf/test'` -race -cover -coverprofile=coverage.txt -covermode=atomic -tags=integration 
 
 fmt:

cache/lru/lru_test.go

@@ -9,19 +9,18 @@ import (
 )
 
 func TestNew(t *testing.T) {
-	tests := []struct {
-		name    string
+	tests := map[string]struct {
 		err     string
 		size    int
 		wantErr bool
 	}{
-		{name: "negative size", size: -1, wantErr: true, err: "must provide a positive size"},
-		{name: "zero size", size: 0, wantErr: true, err: "must provide a positive size"},
-		{name: "positive size", size: 1024, wantErr: false},
+		"negative size": {size: -1, wantErr: true, err: "must provide a positive size"},
+		"zero size":     {size: 0, wantErr: true, err: "must provide a positive size"},
+		"positive size": {size: 1024, wantErr: false},
 	}
 
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
+	for name, tt := range tests {
+		t.Run(name, func(t *testing.T) {
 			c, err := New(tt.size, "test")
 			if tt.wantErr {
 				assert.Nil(t, c)

client/amqp/amqp_test.go

@@ -23,7 +23,6 @@ func TestNew(t *testing.T) {
 		"fail, missing url": {args: args{}, expectedErr: "url is required"},
 	}
 	for name, tt := range tests {
-		tt := tt
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

client/amqp/integration_test.go

@@ -4,17 +4,14 @@ package amqp
 
 import (
 	"context"
-	"log"
 	"testing"
 
+	"github.com/beatlabs/patron/internal/test"
 	"github.com/beatlabs/patron/observability/trace"
 	amqp "github.com/rabbitmq/amqp091-go"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	metricsdk "go.opentelemetry.io/otel/sdk/metric"
-	"go.opentelemetry.io/otel/sdk/metric/metricdata"
 	"go.opentelemetry.io/otel/sdk/trace/tracetest"
 )
 
@@ -30,17 +27,8 @@ func TestRun(t *testing.T) {
 	exp := tracetest.NewInMemoryExporter()
 	tracePublisher := trace.Setup("test", nil, exp)
 
-	// Setup metrics
-	read := metricsdk.NewManualReader()
-	provider := metricsdk.NewMeterProvider(metricsdk.WithReader(read))
-	defer func() {
-		err := provider.Shutdown(context.Background())
-		if err != nil {
-			log.Fatal(err)
-		}
-	}()
-
-	otel.SetMeterProvider(provider)
+	shutdownProvider, collectMetrics := test.SetupMetrics(ctx, t)
+	defer shutdownProvider()
 
 	require.NoError(t, createQueue(endpoint, queue))
 
@@ -70,10 +58,7 @@ func TestRun(t *testing.T) {
 	assert.Equal(t, expected.Attributes, snaps[0].Attributes())
 
 	// Metrics
-	collectedMetrics := &metricdata.ResourceMetrics{}
-	require.NoError(t, read.Collect(context.Background(), collectedMetrics))
-	assert.Len(t, collectedMetrics.ScopeMetrics, 1)
-	assert.Len(t, collectedMetrics.ScopeMetrics[0].Metrics, 1)
+	_ = collectMetrics(1)
 
 	conn, err := amqp.Dial(endpoint)
 	require.NoError(t, err)

client/es/elasticsearch_test.go

@@ -2,36 +2,28 @@ package es
 
 import (
 	"context"
-	"log"
 	"net"
 	"net/http"
 	"net/http/httptest"
 	"strings"
 	"testing"
 
+	"github.com/beatlabs/patron/internal/test"
 	"github.com/beatlabs/patron/observability/trace"
 	"github.com/elastic/go-elasticsearch/v8"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/otel"
-	metricsdk "go.opentelemetry.io/otel/sdk/metric"
 	"go.opentelemetry.io/otel/sdk/trace/tracetest"
 )
 
 func TestNew(t *testing.T) {
 	exp := tracetest.NewInMemoryExporter()
 	tracePublisher := trace.Setup("test", nil, exp)
 
-	// Setup metrics
-	read := metricsdk.NewManualReader()
-	provider := metricsdk.NewMeterProvider(metricsdk.WithReader(read))
-	defer func() {
-		err := provider.Shutdown(context.Background())
-		if err != nil {
-			log.Fatal(err)
-		}
-	}()
-	otel.SetMeterProvider(provider)
+	ctx := context.Background()
+
+	shutdownProvider, _ := test.SetupMetrics(ctx, t)
+	defer shutdownProvider()
 
 	responseMsg := `[{"acknowledged": true, "shards_acknowledged": true, "index": "test"}]`
 	ctx, indexName := context.Background(), "test_index"

client/grpc/grpc_test.go

@@ -9,13 +9,11 @@ import (
 	"testing"
 
 	"github.com/beatlabs/patron/examples"
+	"github.com/beatlabs/patron/internal/test"
 	"github.com/beatlabs/patron/observability/trace"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	metricsdk "go.opentelemetry.io/otel/sdk/metric"
-	"go.opentelemetry.io/otel/sdk/metric/metricdata"
 	"go.opentelemetry.io/otel/sdk/trace/tracetest"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
@@ -94,7 +92,6 @@ func TestDialContext(t *testing.T) {
 		},
 	}
 	for name, tt := range tests {
-		tt := tt
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			gotConn, err := DialContext(context.Background(), target, tt.args.opts...)
@@ -122,13 +119,8 @@ func TestSayHello(t *testing.T) {
 	tracePublisher := trace.Setup("test", nil, exp)
 
 	// Metrics monitoring set up
-	read := metricsdk.NewManualReader()
-	provider := metricsdk.NewMeterProvider(metricsdk.WithReader(read))
-	defer func() {
-		require.NoError(t, provider.Shutdown(context.Background()))
-	}()
-
-	otel.SetMeterProvider(provider)
+	shutdownProvider, assertCollectMetrics := test.SetupMetrics(ctx, t)
+	defer shutdownProvider()
 
 	client := examples.NewGreeterClient(conn)
 
@@ -155,23 +147,23 @@ func TestSayHello(t *testing.T) {
 		},
 	}
 
-	for n, tc := range tt {
+	for n, tt := range tt {
 		t.Run(n, func(t *testing.T) {
 			t.Cleanup(func() { exp.Reset() })
 
-			res, err := client.SayHello(ctx, tc.req)
-			if tc.wantErr {
+			res, err := client.SayHello(ctx, tt.req)
+			if tt.wantErr {
 				require.Nil(t, res)
 				require.Error(t, err)
 
 				rpcStatus, ok := status.FromError(err)
 				require.True(t, ok)
-				require.Equal(t, tc.wantCode, rpcStatus.Code())
-				require.Equal(t, tc.wantMsg, rpcStatus.Message())
+				require.Equal(t, tt.wantCode, rpcStatus.Code())
+				require.Equal(t, tt.wantMsg, rpcStatus.Message())
 			} else {
 				require.NoError(t, err)
 				require.NotNil(t, res)
-				require.Equal(t, tc.wantMsg, res.GetMessage())
+				require.Equal(t, tt.wantMsg, res.GetMessage())
 			}
 
 			require.NoError(t, tracePublisher.ForceFlush(context.Background()))
@@ -183,13 +175,10 @@ func TestSayHello(t *testing.T) {
 			assert.Equal(t, attribute.String("rpc.service", "examples.Greeter"), snaps[0].Attributes()[0])
 			assert.Equal(t, attribute.String("rpc.method", "SayHello"), snaps[0].Attributes()[1])
 			assert.Equal(t, attribute.String("rpc.system", "grpc"), snaps[0].Attributes()[2])
-			assert.Equal(t, attribute.Int64("rpc.grpc.status_code", int64(tc.wantCode)), snaps[0].Attributes()[3])
+			assert.Equal(t, attribute.Int64("rpc.grpc.status_code", int64(tt.wantCode)), snaps[0].Attributes()[3])
 
 			// Metrics
-			collectedMetrics := &metricdata.ResourceMetrics{}
-			require.NoError(t, read.Collect(context.Background(), collectedMetrics))
-			assert.Len(t, collectedMetrics.ScopeMetrics, 1)
-			assert.Positive(t, len(collectedMetrics.ScopeMetrics[0].Metrics))
+			_ = assertCollectMetrics(4)
 		})
 	}
 }

client/http/encoding/json/json_test.go

@@ -48,7 +48,6 @@ func TestFromResponse(t *testing.T) {
 		"failure, empty content type":         {args: args{contentType: stringPointer(""), payload: buf}, expectedErr: "invalid content type provided: "},
 	}
 	for name, tt := range tests {
-		tt := tt
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

client/kafka/integration_test.go

@@ -8,13 +8,11 @@ import (
 	"testing"
 
 	"github.com/IBM/sarama"
+	"github.com/beatlabs/patron/internal/test"
 	"github.com/beatlabs/patron/observability/trace"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	metricsdk "go.opentelemetry.io/otel/sdk/metric"
-	"go.opentelemetry.io/otel/sdk/metric/metricdata"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	"go.opentelemetry.io/otel/sdk/trace/tracetest"
 )
@@ -60,14 +58,10 @@ func TestNewSyncProducer_Success(t *testing.T) {
 func TestAsyncProducer_SendMessage_Close(t *testing.T) {
 	t.Cleanup(func() { traceExporter.Reset() })
 
-	// Metrics monitoring set up
-	read := metricsdk.NewManualReader()
-	provider := metricsdk.NewMeterProvider(metricsdk.WithReader(read))
-	defer func() {
-		require.NoError(t, provider.Shutdown(context.Background()))
-	}()
+	ctx := context.Background()
 
-	otel.SetMeterProvider(provider)
+	shutdownProvider, assertCollectMetrics := test.SetupMetrics(ctx, t)
+	defer shutdownProvider()
 
 	saramaCfg, err := DefaultProducerSaramaConfig("test-consumer", false)
 	require.NoError(t, err)
@@ -104,9 +98,7 @@ func TestAsyncProducer_SendMessage_Close(t *testing.T) {
 	assert.Equal(t, expected.Attributes, snaps[0].Attributes())
 
 	// Metrics
-	collectedMetrics := &metricdata.ResourceMetrics{}
-	require.NoError(t, read.Collect(context.Background(), collectedMetrics))
-	assert.Len(t, collectedMetrics.ScopeMetrics, 1)
+	_ = assertCollectMetrics(1)
 }
 
 func TestSyncProducer_SendMessage_Close(t *testing.T) {

client/kafka/kafka_test.go

@@ -27,7 +27,6 @@ func TestBuilder_Create(t *testing.T) {
 		"missing config":  {args: args{brokers: []string{"123"}, cfg: nil}, expectedErr: "no Sarama configuration specified"},
 	}
 	for name, tt := range tests {
-		tt := tt
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			got, err := New(tt.args.brokers, tt.args.cfg).Create()
@@ -52,7 +51,6 @@ func TestBuilder_CreateAsync(t *testing.T) {
 		"missing config":  {args: args{brokers: []string{"123"}, cfg: nil}, expectedErr: "no Sarama configuration specified"},
 	}
 	for name, tt := range tests {
-		tt := tt
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			got, chErr, err := New(tt.args.brokers, tt.args.cfg).CreateAsync()

client/mongo/integration_test.go

@@ -6,13 +6,11 @@ import (
 	"context"
 	"testing"
 
+	"github.com/beatlabs/patron/internal/test"
 	"github.com/beatlabs/patron/observability/trace"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.mongodb.org/mongo-driver/bson"
-	"go.opentelemetry.io/otel"
-	metricsdk "go.opentelemetry.io/otel/sdk/metric"
-	"go.opentelemetry.io/otel/sdk/metric/metricdata"
 	"go.opentelemetry.io/otel/sdk/trace/tracetest"
 )
 
@@ -21,17 +19,11 @@ func TestConnectAndExecute(t *testing.T) {
 	exp := tracetest.NewInMemoryExporter()
 	tracePublisher := trace.Setup("test", nil, exp)
 
-	// Metrics monitoring set up
-	read := metricsdk.NewManualReader()
-	provider := metricsdk.NewMeterProvider(metricsdk.WithReader(read))
-	defer func() {
-		require.NoError(t, provider.Shutdown(context.Background()))
-	}()
-
-	otel.SetMeterProvider(provider)
-
 	ctx := context.Background()
 
+	shutdownProvider, collectAssertMetrics := test.SetupMetrics(ctx, t)
+	defer shutdownProvider()
+
 	client, err := Connect(ctx)
 	require.NoError(t, err)
 	assert.NotNil(t, client)
@@ -43,10 +35,7 @@ func TestConnectAndExecute(t *testing.T) {
 		require.NoError(t, tracePublisher.ForceFlush(ctx))
 		assert.Len(t, exp.GetSpans(), 1)
 		// Metrics
-		collectedMetrics := &metricdata.ResourceMetrics{}
-		require.NoError(t, read.Collect(context.Background(), collectedMetrics))
-		assert.Len(t, collectedMetrics.ScopeMetrics, 1)
-		assert.Len(t, collectedMetrics.ScopeMetrics[0].Metrics, 1)
+		_ = collectAssertMetrics(1)
 	})
 
 	t.Run("failure", func(t *testing.T) {
@@ -57,9 +46,6 @@ func TestConnectAndExecute(t *testing.T) {
 		require.NoError(t, tracePublisher.ForceFlush(ctx))
 		assert.Len(t, exp.GetSpans(), 1)
 		// Metrics
-		collectedMetrics := &metricdata.ResourceMetrics{}
-		require.NoError(t, read.Collect(context.Background(), collectedMetrics))
-		assert.Len(t, collectedMetrics.ScopeMetrics, 1)
-		assert.Len(t, collectedMetrics.ScopeMetrics[0].Metrics, 1)
+		_ = collectAssertMetrics(1)
 	})
 }