PMM-14349 Update pmm-dump version (#4561)

* update pmm-dump version

* add pg 18

* revert pg updates

* PMM-7 PG 18 expected results fix. (#4589)

* PMM-7 PG 18 query IDs.

* PMM-7 PG18 fix.

* PMM-7 Typo.

* PMM-7 PG17.

* PMM-7 Refactor.

* PMM-7 Lint.

* PMM-7 Another refactor.

* PMM-7 Empty line.

---------

Co-authored-by: Jiří Čtvrtka <[email protected]>

Author: idoqo

agent/agents/postgres/pgstatstatements/pgstatstatements_test.go

@@ -89,8 +89,8 @@ func TestPGStatStatementsQAN(t *testing.T) {
 	require.NoError(t, err)
 	tests.LogTable(t, structs)
 
-	const selectAllCities = "SELECT /* AllCities:pgstatstatements controller='test' */ * FROM city"
-	const selectAllCitiesLong = "SELECT /* AllCitiesTruncated:pgstatstatements controller='test' */ * FROM city WHERE id IN " +
+	selectAllCities := "SELECT /* AllCities:pgstatstatements controller='test' */ * FROM city"
+	selectAllCitiesLong := "SELECT /* AllCitiesTruncated:pgstatstatements controller='test' */ * FROM city WHERE id IN " +
 		"($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, " +
 		"$21, $22, $23, $24, $25, $26, $27, $28, $29, $30, $31, $32, $33, $34, $35, $36, $37, $38, $39, $40, " +
 		"$41, $42, $43, $44, $45, $46, $47, $48, $49, $50, $51, $52, $53, $54, $55, $56, $57, $58, $59, $60, " +
@@ -116,7 +116,7 @@ func TestPGStatStatementsQAN(t *testing.T) {
 		mSharedBlksHitSum = 32
 	}
 	truncatedMSharedBlksHitSum := mSharedBlksHitSum
-
+	isTruncated := true
 	engineVersion := tests.PostgreSQLVersion(t, sqlDB)
 	var digests map[string]string // digest_text/fingerprint to digest/query_id
 	switch engineVersion {
@@ -160,6 +160,14 @@ func TestPGStatStatementsQAN(t *testing.T) {
 			selectAllCities:     "1563925687573067138",
 			selectAllCitiesLong: "-3196437048361615995",
 		}
+	case "18":
+		selectAllCitiesLong = "SELECT /* AllCitiesTruncated:pgstatstatements controller='test' */ * FROM city WHERE id IN ($1 /*, ... */)"
+		truncatedMSharedBlksHitSum = float32(8)
+		digests = map[string]string{
+			selectAllCities:     "2398197226709363629",
+			selectAllCitiesLong: "-1570108445478818403",
+		}
+		isTruncated = false
 	default:
 		t.Log("Unhandled version, assuming dummy digests.")
 		digests = map[string]string{
@@ -291,7 +299,7 @@ func TestPGStatStatementsQAN(t *testing.T) {
 				AgentId:             "agent_id",
 				PeriodStartUnixSecs: 1554116340,
 				PeriodLengthSecs:    60,
-				IsTruncated:         true,
+				IsTruncated:         isTruncated,
 				AgentType:           inventoryv1.AgentType_AGENT_TYPE_QAN_POSTGRESQL_PGSTATEMENTS_AGENT,
 				NumQueries:          1,
 				MQueryTimeCnt:       1,
@@ -337,7 +345,7 @@ func TestPGStatStatementsQAN(t *testing.T) {
 				AgentId:             "agent_id",
 				PeriodStartUnixSecs: 1554116340,
 				PeriodLengthSecs:    60,
-				IsTruncated:         true,
+				IsTruncated:         isTruncated,
 				AgentType:           inventoryv1.AgentType_AGENT_TYPE_QAN_POSTGRESQL_PGSTATEMENTS_AGENT,
 				NumQueries:          1,
 				MQueryTimeCnt:       1,

build/packages/rpm/server/SPECS/pmm-dump.spec

@@ -2,14 +2,14 @@
 
 %global repo            pmm-dump
 %global provider        github.com/percona/%{repo}
-%global commit          56cc93fe8bf811ee69ab39c0d1b22398e126a8a2
+%global commit          4c38e9442fb2f6b0146cd5a581f18db4ebb034f7
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 %define build_timestamp %(date -u +"%y%m%d%H%M")
 %define release         1
 %define rpm_release     %{release}.%{build_timestamp}.%{shortcommit}%{?dist}
 
 Name:		pmm-dump
-Version:	3.4.0
+Version:	0.7.1-ga
 Release:	%{rpm_release}
 Summary:	Percona PMM Dump allows to export and import monitoring metrics and query analytics.
 
@@ -37,6 +37,9 @@ install -p -m 0755 pmm-dump %{buildroot}%{_sbindir}/pmm-dump
 
 
 %changelog
+* Wed Sep 24 2025 Michael Okoko <[email protected]> - 3.4.1
+- PMM-14349 Update pmm-dump sources.
+
 * Thu Jul 28 2025 Michael Okoko <[email protected]> - 3.4.0
 - PMM-14215 Default to main branch for pmm-dump
 - PMM-14085 Fix an issue where pmm-dump would not export OS metrics when used via the PMM GUI