reusing existing DB connection

CHANGELOG.md

@@ -9,11 +9,6 @@ Unreleased section should follow [Release Toolkit](https://github.com/newrelic/r
 
 ## Unreleased
 
-## v2.16.1 - 2024-12-16
-
-### ⛓️ Dependencies
-- Updated golang patch version to v1.23.4
-
 ## v2.16.0 - 2024-11-11
 
 ### 🚀 Enhancements

src/query-performance-monitoring/datamodels/performance_data_models.go

@@ -1,6 +1,7 @@
 package datamodels
 
 type SlowRunningQueryMetrics struct {
+	Newrelic            *string  `db:"newrelic"              metric_name:"newrelic"                   source_type:"attribute"  ingestData:"false"`
 	QueryID             *int64   `db:"query_id"              metric_name:"query_id"                   source_type:"gauge"`
 	QueryText           *string  `db:"query_text"            metric_name:"query_text"                 source_type:"attribute"`
 	DatabaseName        *string  `db:"database_name"         metric_name:"database_name"              source_type:"attribute"`
@@ -24,6 +25,7 @@ type WaitEventMetrics struct {
 	DatabaseName        *string  `db:"database_name"         metric_name:"database_name"              source_type:"attribute"`
 }
 type BlockingSessionMetrics struct {
+	Newrelic           *string `db:"newrelic"              metric_name:"newrelic"            source_type:"attribute"  ingestData:"false"`
 	BlockedPid         *int64  `db:"blocked_pid"          metric_name:"blocked_pid"          source_type:"gauge"`
 	BlockedQuery       *string `db:"blocked_query"        metric_name:"blocked_query"        source_type:"attribute"`
 	BlockedQueryID     *string `db:"blocked_query_id"     metric_name:"blocked_query_id"     source_type:"attribute"`
@@ -42,6 +44,7 @@ type IndividualQueryMetrics struct {
 	AvgCPUTimeInMS *float64 `json:"avg_cpu_time_ms" db:"avg_cpu_time_ms" metric_name:"avg_cpu_time_ms" source_type:"gauge"`
 	PlanID         *string  `json:"planid" db:"planid" metric_name:"plan_id" source_type:"attribute"`
 	RealQueryText  *string  `ingestData:"false"`
+	Newrelic       *string  `db:"newrelic"              metric_name:"newrelic"            source_type:"attribute"  ingestData:"false"`
 }
 
 type QueryExecutionPlanMetrics struct {

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

@@ -9,7 +9,7 @@ import (
 
 	"github.com/newrelic/infra-integrations-sdk/v3/log"
 	"github.com/newrelic/nri-postgresql/src/args"
-	performancedbconnection "github.com/newrelic/nri-postgresql/src/query-performance-monitoring/connections"
+	performancedbconnection "github.com/newrelic/nri-postgresql/src/connection"
 	"github.com/newrelic/nri-postgresql/src/query-performance-monitoring/datamodels"
 	"github.com/newrelic/nri-postgresql/src/query-performance-monitoring/queries"
 )

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

@@ -7,8 +7,8 @@
 	"github.com/newrelic/infra-integrations-sdk/v3/integration"
 	"github.com/newrelic/infra-integrations-sdk/v3/log"
 	"github.com/newrelic/nri-postgresql/src/args"
+	performancedbconnection "github.com/newrelic/nri-postgresql/src/connection"
 	commonutils "github.com/newrelic/nri-postgresql/src/query-performance-monitoring/common-utils"
-	performancedbconnection "github.com/newrelic/nri-postgresql/src/query-performance-monitoring/connections"
 	"github.com/newrelic/nri-postgresql/src/query-performance-monitoring/datamodels"
 )
 
@@ -25,7 +25,10 @@
 	var executionPlanMetricsList []interface{}
 	var groupIndividualQueriesByDatabase = GroupQueriesByDatabase(results)
 	for dbName, individualQueriesList := range groupIndividualQueriesByDatabase {
-		dbConn, err := performancedbconnection.OpenDB(args, dbName)
+		connectionInfo := performancedbconnection.DefaultConnectionInfo(&args)
+		dbConn, err := connectionInfo.NewConnection(dbName)
+
+		//dbConn, err := performancedbconnection.OpenDB(args, dbName)
 		if err != nil {
 			log.Error("Error opening database connection: %v", err)
 			continue

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

@@ -7,8 +7,8 @@ import (
 	"github.com/newrelic/infra-integrations-sdk/v3/integration"
 	"github.com/newrelic/infra-integrations-sdk/v3/log"
 	"github.com/newrelic/nri-postgresql/src/args"
+	performancedbconnection "github.com/newrelic/nri-postgresql/src/connection"
 	commonutils "github.com/newrelic/nri-postgresql/src/query-performance-monitoring/common-utils"
-	performancedbconnection "github.com/newrelic/nri-postgresql/src/query-performance-monitoring/connections"
 	"github.com/newrelic/nri-postgresql/src/query-performance-monitoring/datamodels"
 	"github.com/newrelic/nri-postgresql/src/query-performance-monitoring/queries"
 	"github.com/newrelic/nri-postgresql/src/query-performance-monitoring/validations"
@@ -78,6 +78,7 @@ func GetIndividualQueryMetrics(conn *performancedbconnection.PGSQLConnection, sl
 	}
 	if closeErr := rows.Close(); closeErr != nil {
 		log.Error("Error closing rows: %v", closeErr)
+		return nil, nil
 	}
 	return individualQueryMetricsListInterface, individualQueryMetricsForExecPlanList
 }

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

@@ -6,8 +6,8 @@ import (
 	"github.com/newrelic/infra-integrations-sdk/v3/integration"
 	"github.com/newrelic/infra-integrations-sdk/v3/log"
 	"github.com/newrelic/nri-postgresql/src/args"
+	performancedbconnection "github.com/newrelic/nri-postgresql/src/connection"
 	commonutils "github.com/newrelic/nri-postgresql/src/query-performance-monitoring/common-utils"
-	performancedbconnection "github.com/newrelic/nri-postgresql/src/query-performance-monitoring/connections"
 	"github.com/newrelic/nri-postgresql/src/query-performance-monitoring/datamodels"
 	"github.com/newrelic/nri-postgresql/src/query-performance-monitoring/queries"
 	"github.com/newrelic/nri-postgresql/src/query-performance-monitoring/validations"

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

@@ -6,8 +6,8 @@ import (
 	"github.com/newrelic/infra-integrations-sdk/v3/integration"
 	"github.com/newrelic/infra-integrations-sdk/v3/log"
 	"github.com/newrelic/nri-postgresql/src/args"
+	performancedbconnection "github.com/newrelic/nri-postgresql/src/connection"
 	commonutils "github.com/newrelic/nri-postgresql/src/query-performance-monitoring/common-utils"
-	performancedbconnection "github.com/newrelic/nri-postgresql/src/query-performance-monitoring/connections"
 	"github.com/newrelic/nri-postgresql/src/query-performance-monitoring/datamodels"
 	"github.com/newrelic/nri-postgresql/src/query-performance-monitoring/queries"
 	"github.com/newrelic/nri-postgresql/src/query-performance-monitoring/validations"

src/query-performance-monitoring/queries/queries.go

@@ -2,7 +2,7 @@
 package queries
 
 const (
-	SlowQueries = `SELECT
+	SlowQueries = `SELECT 'newrelic' as newrelic,
         pss.queryid AS query_id,
         LEFT(pss.query, 4095) AS query_text,
         pd.datname AS database_name,
@@ -25,7 +25,14 @@ const (
     JOIN
         pg_database pd ON pss.dbid = pd.oid
     WHERE 
-        pss.query NOT LIKE 'EXPLAIN (FORMAT JSON) %%' 
+        pss.query NOT ILIKE 'EXPLAIN (FORMAT JSON) %%' 
+		AND pss.query NOT ILIKE 'SELECT $1 as newrelic%%'
+		AND pss.query NOT ILIKE 'WITH wait_history AS%%'
+		AND pss.query NOT ILIKE 'select -- BLOATQUERY%%'
+		AND pss.query NOT ILIKE 'select -- INDEXQUERY%%'
+        AND pss.query NOT ILIKE 'SELECT -- TABLEQUERY%%'
+        AND pss.query NOT ILIKE 'SELECT table_schema%%'
+        AND pss.query ILIKE '%%Departments%%'
     ORDER BY
         avg_elapsed_time_ms DESC -- Order by the average elapsed time in descending order
     LIMIT
@@ -68,7 +75,7 @@ const (
     ORDER BY total_wait_time_ms DESC
     LIMIT %d;`
 
-	BlockingQueries = `SELECT
+	BlockingQueries = `SELECT 'newrelic' as newrelic,
           blocked_activity.pid AS blocked_pid,
           LEFT(blocked_statements.query,4095) AS blocked_query,
           blocked_statements.queryid AS blocked_query_id,
@@ -99,15 +106,15 @@ const (
       LIMIT %d;
 `
 
-	IndividualQuerySearch = `SELECT
+	IndividualQuerySearch = `SELECT 'newrelic' as newrelic,
 			LEFT(query,4095) as query,
 			queryid,
 			datname,
 			planid,
 			ROUND(((cpu_user_time + cpu_sys_time) / NULLIF(calls, 0))::numeric, 3) AS avg_cpu_time_ms
 			FROM
 				pg_stat_monitor
-			Where query NOT LIKE 'EXPLAIN (FORMAT JSON) %%' AND queryid IN (%s) 
+			Where queryid IN (%s) 
 			GROUP BY
 				query, queryid, datname, planid, cpu_user_time, cpu_sys_time, calls `
 )

src/query-performance-monitoring/query_performance_main.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/newrelic/infra-integrations-sdk/v3/log"
-	performancedbconnection "github.com/newrelic/nri-postgresql/src/query-performance-monitoring/connections"
+	performancedbconnection "github.com/newrelic/nri-postgresql/src/connection"
 
 	"github.com/newrelic/infra-integrations-sdk/v3/integration"
 	"github.com/newrelic/nri-postgresql/src/args"

src/query-performance-monitoring/validations/performance_metrics_validations.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/newrelic/infra-integrations-sdk/v3/log"
-	performancedbconnection "github.com/newrelic/nri-postgresql/src/query-performance-monitoring/connections"
+	performancedbconnection "github.com/newrelic/nri-postgresql/src/connection"
 )
 
 func isExtensionEnabled(conn *performancedbconnection.PGSQLConnection, extensionName string) (bool, error) {