Refactor: Use context in Fetch method

elastic · Dec 10, 2024 · 7973937 · 7973937
1 parent aba1559
commit 7973937
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/metricbeat/module/pgbouncer/lists/lists_integration_test.go b/metricbeat/module/pgbouncer/lists/lists_integration_test.go
@@ -23,6 +23,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing"
 	"github.com/elastic/beats/v7/metricbeat/module/postgresql"
@@ -35,19 +36,17 @@ func TestMetricSet_Fetch(t *testing.T) {
 
 	f := mbtest.NewReportingMetricSetV2Error(t, getConfig(service.Host()))
 	events, errs := mbtest.ReportingFetchV2Error(f)
-	if len(errs) > 0 {
-		t.Fatalf("Expected 0 error, had %d. %v\n", len(errs), errs)
-	}
-	assert.NotEmpty(t, events)
+	require.Empty(t, errs, "Expected no errors during fetch")
+	require.NotEmpty(t, events, "Expected to receive at least one event")
 	event := events[0].MetricSetFields
 	assert.Contains(t, event, "databases")
 	assert.Contains(t, event, "users")
 	assert.Contains(t, event, "peers")
 	assert.Contains(t, event, "pools")
 	assert.Contains(t, event, "peer_pools")
-	assert.Contains(t, event, "used_clients")
-	assert.Contains(t, event, "free_servers")
-	assert.Contains(t, event, "used_servers")
+	assert.Contains(t, event, "clients.used")
+	assert.Contains(t, event, "servers.free")
+	assert.Contains(t, event, "servers.used")
 }
 func getConfig(host string) map[string]interface{} {
 	return map[string]interface{}{

diff --git a/metricbeat/module/pgbouncer/mem/mem_integration_test.go b/metricbeat/module/pgbouncer/mem/mem_integration_test.go
@@ -23,6 +23,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing"
 	"github.com/elastic/beats/v7/metricbeat/module/postgresql"
@@ -35,10 +36,8 @@ func TestMetricSet_Fetch(t *testing.T) {
 
 	f := mbtest.NewReportingMetricSetV2Error(t, getConfig(service.Host()))
 	events, errs := mbtest.ReportingFetchV2Error(f)
-	if len(errs) > 0 {
-		t.Fatalf("Expected 0 error, had %d. %v\n", len(errs), errs)
-	}
-	assert.NotEmpty(t, events)
+	require.Empty(t, errs, "Expected no errors during fetch")
+	require.NotEmpty(t, events, "Expected to receive at least one event")
 	event := events[0].MetricSetFields
 	assert.Contains(t, event["user_cache"], "size")
 	assert.Contains(t, event["user_cache"], "used")

diff --git a/metricbeat/module/pgbouncer/pools/pools_integration_test.go b/metricbeat/module/pgbouncer/pools/pools_integration_test.go
@@ -23,6 +23,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing"
 	"github.com/elastic/beats/v7/metricbeat/module/postgresql"
@@ -35,10 +36,8 @@ func TestMetricSet_Fetch(t *testing.T) {
 
 	f := mbtest.NewReportingMetricSetV2Error(t, getConfig(service.Host()))
 	events, errs := mbtest.ReportingFetchV2Error(f)
-	if len(errs) > 0 {
-		t.Fatalf("Expected 0 error, had %d. %v\n", len(errs), errs)
-	}
-	assert.NotEmpty(t, events)
+	require.Empty(t, errs, "Expected no errors during fetch")
+	require.NotEmpty(t, events, "Expected to receive at least one event")
 	event := events[0].MetricSetFields
 	assert.Contains(t, event, "user")
 	assert.Contains(t, event, "cl_active")

diff --git a/metricbeat/module/pgbouncer/stats/stats_integration_test.go b/metricbeat/module/pgbouncer/stats/stats_integration_test.go
@@ -23,6 +23,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing"
 	"github.com/elastic/beats/v7/metricbeat/module/postgresql"
@@ -35,10 +36,8 @@ func TestMetricSet_Fetch(t *testing.T) {
 
 	f := mbtest.NewReportingMetricSetV2Error(t, getConfig(service.Host()))
 	events, errs := mbtest.ReportingFetchV2Error(f)
-	if len(errs) > 0 {
-		t.Fatalf("Expected 0 error, had %d. %v\n", len(errs), errs)
-	}
-	assert.NotEmpty(t, events)
+	require.Empty(t, errs, "Expected no errors during fetch")
+	require.NotEmpty(t, events, "Expected to receive at least one event")
 	event := events[0].MetricSetFields
 	assert.Contains(t, event, "total_xact_count")
 	assert.Contains(t, event, "total_server_assignment_count")