Feat : resolved review comments (#74)

* feat: resolved  review commets

* fix: lint issues

---------

Co-authored-by: Jyothi Surampudi <[email protected]>
Co-authored-by: jsurampudi <[email protected]>
Co-authored-by: Rahul Reddy <[email protected]>

Author: 3 people

src/query-performance-monitoring/performance-metrics/blocking_sessions.go

@@ -51,7 +51,7 @@ func getBlockingMetrics(conn *performancedbconnection.PGSQLConnection, cp *commo
 	rows, err := conn.Queryx(query)
 	if err != nil {
 		log.Error("Failed to execute query: %v", err)
-		return nil, err
+		return nil, commonutils.ErrUnExpectedError
 	}
 	defer rows.Close()
 	for rows.Next() {

src/query-performance-monitoring/performance-metrics/blocking_sessions_test.go

@@ -1,10 +1,14 @@
 package performancemetrics
 
 import (
+	"database/sql/driver"
 	"fmt"
 	"regexp"
 	"testing"
 
+	commonutils "github.com/newrelic/nri-postgresql/src/query-performance-monitoring/common-utils"
+	"github.com/newrelic/nri-postgresql/src/query-performance-monitoring/datamodels"
+
 	"github.com/newrelic/nri-postgresql/src/args"
 	"github.com/newrelic/nri-postgresql/src/connection"
 	common_parameters "github.com/newrelic/nri-postgresql/src/query-performance-monitoring/common-parameters"
@@ -21,29 +25,50 @@ func TestGetBlockingMetrics(t *testing.T) {
 	cp := common_parameters.SetCommonParameters(args, version, databaseName)
 	expectedQuery := queries.BlockingQueriesForV12AndV13
 	query := fmt.Sprintf(expectedQuery, databaseName, args.QueryMonitoringCountThreshold)
-	mock.ExpectQuery(regexp.QuoteMeta(query)).WillReturnRows(sqlmock.NewRows([]string{
+	rowData := []driver.Value{
+		"newrelic_value", int64(123), "SELECT 1", "1233444", "2023-01-01 00:00:00", "testdb",
+		int64(456), "SELECT 2", "4566", "2023-01-01 00:00:00",
+	}
+	expectedRows := [][]driver.Value{
+		rowData, rowData,
+	}
+	mockRows := sqlmock.NewRows([]string{
 		"newrelic", "blocked_pid", "blocked_query", "blocked_query_id", "blocked_query_start", "database_name",
 		"blocking_pid", "blocking_query", "blocking_query_id", "blocking_query_start",
-	}).AddRow(
-		"newrelic_value", 123, "SELECT 1", 1233444, "2023-01-01 00:00:00", "testdb",
-		456, "SELECT 2", 4566, "2023-01-01 00:00:00",
-	).AddRow(
-		"newrelic_value", 123, "SELECT 1", 1233444, "2023-01-01 00:00:00", "testdb",
-		456, "SELECT 2", 4566, "2023-01-01 00:00:00",
-	))
+	}).AddRow(rowData...).AddRow(rowData...)
+	mock.ExpectQuery(regexp.QuoteMeta(query)).WillReturnRows(mockRows)
 	blockingQueriesMetricsList, err := getBlockingMetrics(conn, cp)
+	compareMockRowsWithMetrics(t, expectedRows, blockingQueriesMetricsList)
 	assert.NoError(t, err)
 	assert.Len(t, blockingQueriesMetricsList, 2)
 	assert.NoError(t, mock.ExpectationsWereMet())
 }
 
+func compareMockRowsWithMetrics(t *testing.T, expectedRows [][]driver.Value, blockingQueriesMetricsList []interface{}) {
+	assert.Equal(t, 2, len(blockingQueriesMetricsList))
+	for index := range blockingQueriesMetricsList {
+		anonymizeQuery := commonutils.AnonymizeQueryText(expectedRows[index][2].(string))
+		blockingSession := blockingQueriesMetricsList[index].(datamodels.BlockingSessionMetrics)
+		assert.Equal(t, expectedRows[index][0], *blockingSession.Newrelic)
+		assert.Equal(t, expectedRows[index][1], *blockingSession.BlockedPid)
+		assert.Equal(t, anonymizeQuery, *blockingSession.BlockedQuery)
+		assert.Equal(t, expectedRows[index][3], *blockingSession.BlockedQueryID)
+		assert.Equal(t, expectedRows[index][4], *blockingSession.BlockedQueryStart)
+		assert.Equal(t, expectedRows[index][5], *blockingSession.BlockedDatabase)
+		assert.Equal(t, expectedRows[index][6], *blockingSession.BlockingPid)
+		assert.Equal(t, anonymizeQuery, *blockingSession.BlockingQuery)
+		assert.Equal(t, expectedRows[index][8], *blockingSession.BlockingQueryID)
+		assert.Equal(t, expectedRows[index][9], *blockingSession.BlockingQueryStart)
+	}
+}
+
 func TestGetBlockingMetricsErr(t *testing.T) {
 	conn, mock := connection.CreateMockSQL(t)
 	args := args.ArgumentList{QueryMonitoringCountThreshold: 10}
 	databaseName := "testdb"
 	version := uint64(13)
 	cp := common_parameters.SetCommonParameters(args, version, databaseName)
 	_, err := getBlockingMetrics(conn, cp)
-	assert.NotNil(t, err)
+	assert.EqualError(t, err, commonutils.ErrUnExpectedError.Error())
 	assert.NoError(t, mock.ExpectationsWereMet())
 }