Merge pull request #582 from percona/release-2.3.1

PGSM 2.3.1 release

.github/workflows/check.yml

@@ -10,12 +10,12 @@ jobs:
 
     steps:
       - name: Checkout sources
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           path: src/pg_stat_monitor
 
       - name: Checkout cppcheck sources
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           repository: "danmar/cppcheck"
           ref: "2.13.4"
@@ -43,13 +43,13 @@ jobs:
 
     steps:
       - name: Clone postgres repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           repository: 'postgres/postgres'
           ref: 'REL_17_STABLE'
 
       - name: Checkout sources
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           path: 'contrib/pg_stat_monitor'
 
@@ -87,7 +87,7 @@ jobs:
 
     steps:
       - name: Checkout sources
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Check license headers
         uses: apache/skywalking-eyes/header@61275cc80d0798a405cb070f7d3a8aaf7cf2c2c1 # v0.8.0

.github/workflows/code-coverage-test.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Clone postgres repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           repository: 'postgres/postgres'
           ref: 'REL_15_STABLE'
@@ -83,7 +83,7 @@ jobs:
           pg_ctl -D /opt/pgsql/data -l logfile start
 
       - name: Clone pg_stat_monitor repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           path: 'src/pg_stat_monitor'
 

.github/workflows/pgxn-release.yml

@@ -22,7 +22,7 @@ jobs:
       shell: bash
 
     - name: Check out
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       with:
         ref: '${{ inputs.version }}'
 

.github/workflows/postgresql-13-build.yml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Clone postgres repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           repository: 'postgres/postgres'
           ref: 'REL_13_STABLE'
@@ -83,7 +83,7 @@ jobs:
           pg_ctl -D /opt/pgsql/data -l logfile start
 
       - name: Clone pg_stat_monitor repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           path: 'src/pg_stat_monitor'
 

.github/workflows/postgresql-13-pgdg-package.yml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Clone pg_stat_monitor repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           path: 'src/pg_stat_monitor'
 

.github/workflows/postgresql-13-pmm.yaml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Clone QA Integration repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           repository: 'Percona-Lab/qa-integration'
           ref: 'main'

.github/workflows/postgresql-13-ppg-package.yml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Clone pg_stat_monitor repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           path: 'src/pg_stat_monitor'
 

.github/workflows/postgresql-14-build.yml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Clone postgres repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           repository: 'postgres/postgres'
           ref: 'REL_14_STABLE'
@@ -83,7 +83,7 @@ jobs:
           pg_ctl -D /opt/pgsql/data -l logfile start
 
       - name: Clone pg_stat_monitor repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           path: 'src/pg_stat_monitor'
 

.github/workflows/postgresql-14-pgdg-package.yml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Clone pg_stat_monitor repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           path: 'src/pg_stat_monitor'
 

.github/workflows/postgresql-14-pmm.yaml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Clone QA Integration repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           repository: 'Percona-Lab/qa-integration'
           ref: 'main'

.github/workflows/postgresql-14-ppg-package.yml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Clone pg_stat_monitor repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           path: 'src/pg_stat_monitor'
 

.github/workflows/postgresql-15-build.yml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Clone postgres repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           repository: 'postgres/postgres'
           ref: 'REL_15_STABLE'
@@ -83,7 +83,7 @@ jobs:
           pg_ctl -D /opt/pgsql/data -l logfile start
 
       - name: Clone pg_stat_monitor repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           path: 'src/pg_stat_monitor'
 

.github/workflows/postgresql-15-pgdg-package.yml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Clone pg_stat_monitor repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           path: 'src/pg_stat_monitor'
 

.github/workflows/postgresql-15-pmm.yaml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Clone QA Integration repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           repository: 'Percona-Lab/qa-integration'
           ref: 'main'

.github/workflows/postgresql-15-ppg-package.yml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Clone pg_stat_monitor repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           path: 'src/pg_stat_monitor'
 

.github/workflows/postgresql-16-build.yml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Clone postgres repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           repository: 'postgres/postgres'
           ref: 'REL_16_STABLE'
@@ -83,7 +83,7 @@ jobs:
           pg_ctl -D /opt/pgsql/data -l logfile start
 
       - name: Clone pg_stat_monitor repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           path: 'src/pg_stat_monitor'
 

.github/workflows/postgresql-16-pgdg-package.yml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Clone pg_stat_monitor repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           path: 'src/pg_stat_monitor'
 

.github/workflows/postgresql-16-ppg-package.yml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Clone pg_stat_monitor repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           path: 'src/pg_stat_monitor'
 

.github/workflows/postgresql-17-build.yml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Clone postgres repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           repository: 'postgres/postgres'
           ref: 'REL_17_STABLE'
@@ -83,7 +83,7 @@ jobs:
           pg_ctl -D /opt/pgsql/data -l logfile start
 
       - name: Clone pg_stat_monitor repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           path: 'src/pg_stat_monitor'
 

.github/workflows/postgresql-17-pgdg-package.yml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Clone pg_stat_monitor repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           path: 'src/pg_stat_monitor'
 

.github/workflows/postgresql-18-build.yml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Clone postgres repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           repository: 'postgres/postgres'
           ref: 'REL_18_STABLE'
@@ -83,7 +83,7 @@ jobs:
           pg_ctl -D /opt/pgsql/data -l logfile start
 
       - name: Clone pg_stat_monitor repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           path: 'src/pg_stat_monitor'
 

.github/workflows/postgresql-18-pgdg-package.yml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Clone pg_stat_monitor repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           path: 'src/pg_stat_monitor'
 

.github/workflows/scorecard.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 
@@ -43,6 +43,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard (optional).
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
+        uses: github/codeql-action/upload-sarif@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
         with:
           sarif_file: results.sarif

pg_stat_monitor.c

@@ -82,7 +82,6 @@ void		_PG_init(void);
 
 /* Current nesting depth of planner/ExecutorRun/ProcessUtility calls */
 static int	nesting_level = 0;
-volatile bool __pgsm_do_not_capture_error = false;
 
 #if PG_VERSION_NUM < 170000
 /* Before planner nesting level was conunted separately */
@@ -98,10 +97,10 @@ static int	hist_bucket_count_total;
 
 static uint32 pgsm_client_ip = PGSM_INVALID_IP_MASK;
 
-/* The array to store outer layer query id*/
-int64	   *nested_queryids;
-char	  **nested_query_txts;
-List	   *lentries = NIL;
+/* The array to store outer layer query id */
+static int64 *nested_queryids;
+static char **nested_query_txts;
+static List *lentries = NIL;
 
 static char relations[REL_LST][REL_LEN];
 
@@ -211,12 +210,12 @@ static void pgsm_cleanup_callback(void *arg);
 static void pgsm_store_error(const char *query, ErrorData *edata);
 
 /*---- Local variables ----*/
-MemoryContextCallback mem_cxt_reset_callback =
+static MemoryContextCallback mem_cxt_reset_callback =
 {
 	.func = pgsm_cleanup_callback,
 	.arg = NULL
 };
-volatile bool callback_setup = false;
+static volatile bool callback_setup = false;
 
 static void pgsm_update_entry(pgsmEntry *entry,
 							  const char *query,