Merge pull request #40 from abhinav1602/queryAnalysis-dataFixes

rename package as per standard

.github/workflows/on_push_pr.yaml

@@ -6,7 +6,7 @@ on:
       - main
       - master
       - renovate/**
-      - epic_queryAnalysis
+      - epic_queryanalysis
   pull_request:
 
 jobs:

src/mssql.go

@@ -15,7 +15,7 @@ import (
 	"github.com/newrelic/nri-mssql/src/instance"
 	"github.com/newrelic/nri-mssql/src/inventory"
 	"github.com/newrelic/nri-mssql/src/metrics"
-	"github.com/newrelic/nri-mssql/src/queryAnalysis"
+	"github.com/newrelic/nri-mssql/src/queryanalysis"
 )
 
 const (
@@ -97,7 +97,7 @@ func main() {
 	i.Clear()
 
 	if args.EnableQueryPerformance {
-		queryAnalysis.QueryPerformanceMain(i, args)
+		queryanalysis.QueryPerformanceMain(i, args)
 	}
 
 }

src/queryAnalysis/config/queryConfigs.go → src/queryanalysis/config/queryConfigs.go

@@ -1,6 +1,6 @@
 package config
 
-import "github.com/newrelic/nri-mssql/src/queryAnalysis/models"
+import "github.com/newrelic/nri-mssql/src/queryanalysis/models"
 
 var Queries = []models.QueryDetailsDto{
 	{

src/queryAnalysis/connection/sql_connection.go → src/queryanalysis/connection/sql_connection.go

@@ -53,7 +53,6 @@ func (sc SQLConnection) Queryx(query string) (*sqlx.Rows, error) {
 // CreateConnectionURL tags in args and creates the connection string.
 // All args should be validated before calling this.
 func CreateConnectionURL(args *args.ArgumentList) string {
-
 	connectionString := ""
 
 	connectionURL := &url.URL{
@@ -83,7 +82,6 @@ func CreateConnectionURL(args *args.ArgumentList) string {
 		} else {
 			log.Warn("Could not successfully parse ExtraConnectionURLArgs.", err.Error())
 		}
-
 	}
 
 	if args.EnableSSL {

src/queryAnalysis/connection/sql_connection_test.go → src/queryanalysis/connection/sql_connection_test.go

@@ -8,10 +8,12 @@ import (
 	"gopkg.in/DATA-DOG/go-sqlmock.v1"
 )
 
+var ErrMockCloseFailure = errors.New("mock close failure")
+
 func Test_SQLConnection_Close(t *testing.T) {
 	conn, mock := CreateMockSQL(t)
 
-	mock.ExpectClose().WillReturnError(errors.New("error"))
+	mock.ExpectClose().WillReturnError(ErrMockCloseFailure)
 	conn.Close()
 
 	if err := mock.ExpectationsWereMet(); err != nil {

src/queryAnalysis/instance/sql_instance.go → src/queryanalysis/instance/sql_instance.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 
 	"github.com/newrelic/infra-integrations-sdk/v3/integration"
-	"github.com/newrelic/nri-mssql/src/queryAnalysis/connection"
+	"github.com/newrelic/nri-mssql/src/queryanalysis/connection"
 )
 
 // instanceNameQuery gets the instance name

src/queryAnalysis/instance/sql_instance_test.go → src/queryanalysis/instance/sql_instance_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/newrelic/infra-integrations-sdk/v3/integration"
-	"github.com/newrelic/nri-mssql/src/queryAnalysis/connection"
+	"github.com/newrelic/nri-mssql/src/queryanalysis/connection"
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/DATA-DOG/go-sqlmock.v1"
 )

src/queryAnalysis/query_analysis.go → src/queryanalysis/query_analysis.go

@@ -1,18 +1,17 @@
-package queryAnalysis
+package queryanalysis
 
 import (
 	"github.com/newrelic/infra-integrations-sdk/v3/integration"
 	"github.com/newrelic/infra-integrations-sdk/v3/log"
 	"github.com/newrelic/nri-mssql/src/args"
-	"github.com/newrelic/nri-mssql/src/queryAnalysis/connection"
-	"github.com/newrelic/nri-mssql/src/queryAnalysis/retrymechanism"
-	"github.com/newrelic/nri-mssql/src/queryAnalysis/utils"
-	"github.com/newrelic/nri-mssql/src/queryAnalysis/validation"
+	"github.com/newrelic/nri-mssql/src/queryanalysis/connection"
+	"github.com/newrelic/nri-mssql/src/queryanalysis/retrymechanism"
+	"github.com/newrelic/nri-mssql/src/queryanalysis/utils"
+	"github.com/newrelic/nri-mssql/src/queryanalysis/validation"
 )
 
-// queryPerformanceMain runs all types of analyses
+// queryPerformanceMain runs all types of analyzes
 func QueryPerformanceMain(integration *integration.Integration, arguments args.ArgumentList) {
-
 	// Create a new connection
 	sqlConnection, err := connection.NewConnection(&arguments)
 	if err != nil {

src/queryAnalysis/utils/utils.go → src/queryanalysis/utils/utils.go

@@ -13,17 +13,17 @@ import (
 	"github.com/newrelic/infra-integrations-sdk/v3/log"
 
 	"github.com/newrelic/nri-mssql/src/args"
-	"github.com/newrelic/nri-mssql/src/queryAnalysis/config"
-	"github.com/newrelic/nri-mssql/src/queryAnalysis/connection"
-	"github.com/newrelic/nri-mssql/src/queryAnalysis/instance"
-	"github.com/newrelic/nri-mssql/src/queryAnalysis/models"
+	"github.com/newrelic/nri-mssql/src/queryanalysis/config"
+	"github.com/newrelic/nri-mssql/src/queryanalysis/connection"
+	"github.com/newrelic/nri-mssql/src/queryanalysis/instance"
+	"github.com/newrelic/nri-mssql/src/queryanalysis/models"
 )
 
 var ErrUnknownQueryType = errors.New("unknown query type")
 var ErrCreatingInstanceEntity = errors.New("error creating instance entity")
 
 func LoadQueries(arguments args.ArgumentList) ([]models.QueryDetailsDto, error) {
-	var queries []models.QueryDetailsDto = config.Queries
+	queries := config.Queries
 
 	for i := range queries {
 		switch queries[i].Type {
@@ -107,9 +107,8 @@ func BindQueryResults(arguments args.ArgumentList,
 func GenerateAndInjestExecutionPlan(arguments args.ArgumentList,
 	integration *integration.Integration,
 	sqlConnection *connection.SQLConnection,
-	queryId models.HexString) {
-
-	hexQueryID := string(queryId)
+	queryID models.HexString) {
+	hexQueryID := string(queryID)
 	executionPlanQuery := fmt.Sprintf(config.ExecutionPlanQueryTemplate, min(config.IndividualQueryCountMax, arguments.QueryCountThreshold),
 		arguments.QueryResponseTimeThreshold, hexQueryID, arguments.FetchInterval, config.TextTruncateLimit)
 
@@ -168,6 +167,19 @@ func IngestQueryMetricsInBatches(results []interface{},
 	return nil
 }
 
+func convertResultToMap(result interface{}) (map[string]interface{}, error) {
+	data, err := json.Marshal(result)
+	if err != nil {
+		return nil, fmt.Errorf("error marshaling result: %w", err)
+	}
+
+	var resultMap map[string]interface{}
+	if err := json.Unmarshal(data, &resultMap); err != nil {
+		return nil, fmt.Errorf("error unmarshaling to map: %w", err)
+	}
+	return resultMap, nil
+}
+
 // IngestQueryMetrics processes and ingests query metrics into the New Relic entity
 func IngestQueryMetrics(results []interface{}, queryDetailsDto models.QueryDetailsDto, integration *integration.Integration, sqlConnection *connection.SQLConnection) error {
 
@@ -178,14 +190,10 @@ func IngestQueryMetrics(results []interface{}, queryDetailsDto models.QueryDetai
 
 	for _, result := range results {
 		// Convert the result into a map[string]interface{} for dynamic key-value access
-		var resultMap map[string]interface{}
-		data, err := json.Marshal(result)
-		if err != nil {
-			log.Error("error marshaling to JSON: %w", err)
-		}
-		err = json.Unmarshal(data, &resultMap)
+		resultMap, err := convertResultToMap(result)
 		if err != nil {
-			log.Error("error unmarshaling to map: %w", err)
+			log.Error("failed to convert result: %v", err)
+			continue
 		}
 
 		// Create a new metric set with the query name

src/queryAnalysis/utils/utils_test.go → src/queryanalysis/utils/utils_test.go

@@ -6,13 +6,13 @@ import (
 	"time"
 
 	"github.com/newrelic/infra-integrations-sdk/v3/data/metric"
-	"github.com/newrelic/nri-mssql/src/queryAnalysis/config"
+	"github.com/newrelic/nri-mssql/src/queryanalysis/config"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/newrelic/infra-integrations-sdk/v3/integration"
 	"github.com/newrelic/nri-mssql/src/args"
-	"github.com/newrelic/nri-mssql/src/queryAnalysis/connection"
-	"github.com/newrelic/nri-mssql/src/queryAnalysis/models"
+	"github.com/newrelic/nri-mssql/src/queryanalysis/connection"
+	"github.com/newrelic/nri-mssql/src/queryanalysis/models"
 	"gopkg.in/DATA-DOG/go-sqlmock.v1"
 )
 

src/queryAnalysis/validation/database_details.go → src/queryanalysis/validation/database_details.go

@@ -2,8 +2,8 @@ package validation
 
 import (
 	"github.com/newrelic/infra-integrations-sdk/v3/log"
-	"github.com/newrelic/nri-mssql/src/queryAnalysis/connection"
-	"github.com/newrelic/nri-mssql/src/queryAnalysis/models"
+	"github.com/newrelic/nri-mssql/src/queryanalysis/connection"
+	"github.com/newrelic/nri-mssql/src/queryanalysis/models"
 )
 
 // GetDatabaseDetails gets the details of user databases

src/queryAnalysis/validation/database_details_test.go → src/queryanalysis/validation/database_details_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/jmoiron/sqlx"
-	"github.com/newrelic/nri-mssql/src/queryAnalysis/connection"
+	"github.com/newrelic/nri-mssql/src/queryanalysis/connection"
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/DATA-DOG/go-sqlmock.v1"
 )

src/queryAnalysis/validation/helper_test.go → src/queryanalysis/validation/helper_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/jmoiron/sqlx"
-	"github.com/newrelic/nri-mssql/src/queryAnalysis/connection"
+	"github.com/newrelic/nri-mssql/src/queryanalysis/connection"
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/DATA-DOG/go-sqlmock.v1"
 )

src/queryAnalysis/validation/permissions.go → src/queryanalysis/validation/permissions.go

@@ -1,7 +1,7 @@
 package validation
 
 import (
-	"github.com/newrelic/nri-mssql/src/queryAnalysis/connection"
+	"github.com/newrelic/nri-mssql/src/queryanalysis/connection"
 )
 
 func checkPermissions(sqlConnection *connection.SQLConnection) (bool, error) {

src/queryAnalysis/validation/sql_server_login.go → src/queryanalysis/validation/sql_server_login.go

@@ -1,7 +1,7 @@
 package validation
 
 import (
-	"github.com/newrelic/nri-mssql/src/queryAnalysis/connection"
+	"github.com/newrelic/nri-mssql/src/queryanalysis/connection"
 )
 
 func checkSQLServerLoginEnabled(sqlConnection *connection.SQLConnection) (bool, error) {

src/queryAnalysis/validation/validation_check.go → src/queryanalysis/validation/validation_check.go

@@ -2,8 +2,8 @@ package validation
 
 import (
 	"github.com/newrelic/infra-integrations-sdk/v3/log"
-	"github.com/newrelic/nri-mssql/src/queryAnalysis/connection"
-	"github.com/newrelic/nri-mssql/src/queryAnalysis/models"
+	"github.com/newrelic/nri-mssql/src/queryanalysis/connection"
+	"github.com/newrelic/nri-mssql/src/queryanalysis/models"
 )
 
 const versionCompatibility = 90