Revert "Exclude the metrics fetching session's data from pg_stat_activity (prometheus-community#1185)"

This reverts commit 198454c.

Signed-off-by: Max Englander <[email protected]>

Author: maxenglander

cmd/postgres_exporter/queries.go

@@ -142,7 +142,6 @@ var queryOverrides = map[string][]OverrideQuery{
 					count(*) AS count,
 					MAX(EXTRACT(EPOCH FROM now() - xact_start))::float AS max_tx_duration
 				FROM pg_stat_activity
-				WHERE pid <> pg_backend_pid()
 				GROUP BY datname,state,usename,application_name,backend_type,wait_event_type,wait_event) AS tmp2
 				ON tmp.state = tmp2.state AND pg_database.datname = tmp2.datname
 			`,
@@ -157,9 +156,7 @@ var queryOverrides = map[string][]OverrideQuery{
 				application_name,
 				COALESCE(count(*),0) AS count,
 				COALESCE(MAX(EXTRACT(EPOCH FROM now() - xact_start))::float,0) AS max_tx_duration
-			FROM pg_stat_activity
-			WHERE procpid <> pg_backend_pid()
-			GROUP BY datname,usename,application_name
+			FROM pg_stat_activity GROUP BY datname,usename,application_name
 			`,
 		},
 	},

collector/pg_long_running_transactions.go

@@ -56,8 +56,7 @@ var (
 FROM pg_catalog.pg_stat_activity
 WHERE state IS DISTINCT FROM 'idle'
 AND query NOT LIKE 'autovacuum:%'
-AND pg_stat_activity.xact_start IS NOT NULL
-AND pid <> pg_backend_pid();
+AND pg_stat_activity.xact_start IS NOT NULL;
 	`
 )
 

collector/pg_process_idle.go

@@ -56,7 +56,6 @@ func (PGProcessIdleCollector) Update(ctx context.Context, instance *Instance, ch
 				COUNT(*) AS process_idle_seconds_count
 				FROM pg_stat_activity
 				WHERE state ~ '^idle'
-				AND pid <> pg_backend_pid();
 				GROUP BY state, application_name
 			),
 			buckets AS (
@@ -73,7 +72,6 @@ func (PGProcessIdleCollector) Update(ctx context.Context, instance *Instance, ch
 				FROM
 				pg_stat_activity,
 				UNNEST(ARRAY[1, 2, 5, 15, 30, 60, 90, 120, 300]) AS le
-				WHERE pid <> pg_backend_pid()
 				GROUP BY state, application_name, le
 				ORDER BY state, application_name, le
 			)