[DBMON-5975] Upgrade libpq to 18.3 (DataDog#23702)

* Update Linux / OSX to use libpq 18.3

* Update windows build image for PG 18

* Fix command

* Fix quoting

* temp comment out openssl

* fix quoting issues

* Add missing prerequisite dependency

* Fix RunOnVSConsole to bubble up non-zero exit codes

* temp command to verify fix

* Undo temp changes

* Revert helpers.ps1 changes

* Update dependency resolution

* use explicit OpenSSL paths for Meson dependency

* Update dependency resolution

---------

Co-authored-by: dd-agent-integrations-bot[bot] <dd-agent-integrations-bot[bot]@users.noreply.github.com>

Author: eric-weaver

.builders/images/linux-aarch64/Dockerfile

@@ -107,8 +107,8 @@ RUN \
 # libpq and pg_config as needed by psycopg
 RUN yum install -y flex && \
  DOWNLOAD_URL="https://ftp.postgresql.org/pub/source/v{{version}}/postgresql-{{version}}.tar.bz2" \
- VERSION="16.9" \
- SHA256="07c00fb824df0a0c295f249f44691b86e3266753b380c96f633c3311e10bd005" \
+ VERSION="18.3" \
+ SHA256="d95663fbbf3a80f81a9d98d895266bdcb74ba274bcc04ef6d76630a72dee016f" \
  RELATIVE_PATH="postgresql-{{version}}" \
  bash install-from-source.sh --without-readline --with-openssl --without-icu --with-gssapi
 # Add paths to pg_config and to the library

.builders/images/linux-x86_64/Dockerfile

@@ -108,11 +108,11 @@ RUN \
  --without-debugger \
  --disable-static
 
-# libpq and pg_config as needed by psycopg2
+# libpq and pg_config as needed by psycopg
 RUN yum install -y flex && \
  DOWNLOAD_URL="https://ftp.postgresql.org/pub/source/v{{version}}/postgresql-{{version}}.tar.bz2" \
- VERSION="16.9" \
- SHA256="07c00fb824df0a0c295f249f44691b86e3266753b380c96f633c3311e10bd005" \
+ VERSION="18.3" \
+ SHA256="d95663fbbf3a80f81a9d98d895266bdcb74ba274bcc04ef6d76630a72dee016f" \
  RELATIVE_PATH="postgresql-{{version}}" \
  bash install-from-source.sh --without-readline --with-openssl --without-icu --with-gssapi
 # Add paths to pg_config and to the library

.builders/images/macos/builder_setup.sh

@@ -95,8 +95,8 @@ rm "${DD_PREFIX_PATH}/bin/curl"
 
 # libpq and pg_config as needed by psycopg
 DOWNLOAD_URL="https://ftp.postgresql.org/pub/source/v{{version}}/postgresql-{{version}}.tar.bz2" \
-VERSION="16.9" \
-SHA256="07c00fb824df0a0c295f249f44691b86e3266753b380c96f633c3311e10bd005" \
+VERSION="18.3" \
+SHA256="d95663fbbf3a80f81a9d98d895266bdcb74ba274bcc04ef6d76630a72dee016f" \
 RELATIVE_PATH="postgresql-{{version}}" \
   install-from-source --without-readline --with-openssl --without-icu
 # Add paths to pg_config and to the library

.builders/images/windows-x86_64/Dockerfile

@@ -139,19 +139,31 @@ RUN Get-RemoteFile `
     'C:\perl\perl\bin\perl.exe Configure && `
     nmake && `
     nmake install_sw'
+# flex and bison are required for building PostgreSQL from source
+ENV WINFLEXBISON_VERSION="2.5.25"
+RUN Get-RemoteFile `
+      -Uri https://github.com/lexxmark/winflexbison/releases/download/v$Env:WINFLEXBISON_VERSION/win_flex_bison-$Env:WINFLEXBISON_VERSION.zip `
+      -Path win_flex_bison-$Env:WINFLEXBISON_VERSION.zip `
+      -Hash '8d324b62be33604b2c45ad1dd34ab93d722534448f55a16ca7292de32b6ac135'; `
+    7z x win_flex_bison-$Env:WINFLEXBISON_VERSION.zip -oC:\winflexbison && `
+    Remove-Item win_flex_bison-$Env:WINFLEXBISON_VERSION.zip && `
+    Add-ToPath -Append 'C:\winflexbison'
+# Meson + Ninja for building PostgreSQL 18+ on Windows
+RUN python -m pip install --no-warn-script-location meson ninja && `
+    Add-ToPath -Append 'C:\Program Files\Python313\Scripts'
 # libpq and pg_config as needed by psycopg
-ENV PG_VERSION="16.9"
-COPY pg_config.pl C:\pg_config.pl
+ENV PG_VERSION="18.3"
 RUN Get-RemoteFile `
       -Uri https://ftp.postgresql.org/pub/source/v$Env:PG_VERSION/postgresql-$Env:PG_VERSION.tar.bz2 `
       -Path postgresql-$Env:PG_VERSION.tar.bz2 `
-      -Hash '07c00fb824df0a0c295f249f44691b86e3266753b380c96f633c3311e10bd005'; `
+      -Hash 'd95663fbbf3a80f81a9d98d895266bdcb74ba274bcc04ef6d76630a72dee016f'; `
     7z x postgresql-$Env:PG_VERSION.tar.bz2 -r -y && `
-    7z x postgresql-$Env:PG_VERSION.tar -oC:\postgresql_src && `
-    cd C:\postgresql_src\postgresql-$Env:PG_VERSION\src\tools\msvc && `
-    Copy-Item C:\pg_config.pl -Destination .\config.pl && `
-    RunOnVSConsole -Command 'C:\perl\perl\bin\perl.exe build.pl' && `
-    RunOnVSConsole -Command 'C:\perl\perl\bin\perl.exe install.pl C:\postgresql' && `
+    7z x postgresql-$Env:PG_VERSION.tar -oC:\postgresql_src
+RUN New-Item -ItemType Junction -Path C:\OpenSSL -Target 'C:\Program Files\OpenSSL'; `
+    $mesonCmd = 'meson setup C:\pgbuild C:\postgresql_src\postgresql-' + $Env:PG_VERSION + ' --prefix=C:\postgresql -Dssl=openssl -Dextra_include_dirs=C:\OpenSSL\include -Dextra_lib_dirs=C:\OpenSSL\lib -Dgssapi=disabled -Dreadline=disabled -Dicu=disabled -Dnls=disabled -Dlz4=disabled -Dzstd=disabled -Dlibxml=disabled -Dlibxslt=disabled -Dllvm=disabled'; `
+    RunOnVSConsole -Command $mesonCmd && `
+    RunOnVSConsole -Command 'ninja -C C:\pgbuild' && `
+    RunOnVSConsole -Command 'ninja -C C:\pgbuild install' && `
     Add-ToPath -Append "C:\postgresql\bin"
 
 ENV CURL_VERSION="8.19.0"

.builders/images/windows-x86_64/pg_config.pl

@@ -11,11 +11,11 @@
 # Hash inputs are defined in .builders/inputs_hash.py (SHARED_INPUTS,
 # RESOLUTION_INPUTS).
 [resolution]
-hash = "3a0350917a9a4534e7b427439cc6cc9eee31fe8c4b114c7938cb3d0fb5d38c67"
+hash = "760d13e44a0eba8f966d77b7400f22cb19842e3a18ba72f7feea4a59f6f5b997"
 
 [images]
-linux-aarch64 = "5239191575da3521adfbb9992114201c71c65ff3056de4ae2e475390d218d194"
-linux-x86_64 = "83d13d3171972f56b1336d325eecae73bf5e2329a24142f25e68ae50c542ce6a"
-macos-aarch64 = "c0d0865f31792ef8115f81b8722414ecd5b2c717882074d3c27b67093b6f67a4"
-macos-x86_64 = "f079703480309dd348f20d07bcabc9278bd78619cde7a4146cebbac5292bfc60"
-windows-x86_64 = "d7cc3720c0ac20a28c20d0fd606d6d0a84023e97682c39994ac99c1cdef9e817"
+linux-aarch64 = "f183db47c9b55ef83e324c5eeb8edaba75feaa5766f695da6f4f5964668579d4"
+linux-x86_64 = "6be1f5dc7b15d968e86b029bb14e6506dc47ef98c9e2fcd4f8fd38b8606751ac"
+macos-aarch64 = "9f7be2b1033bb3c36ce7ce6e3e50af9b50fb3ca24eedfa91f17355f913bc5006"
+macos-x86_64 = "3ae85bb4ba101b21bb6e50c81f5829c7c73fc563252557e86dcbfba048add8e2"
+windows-x86_64 = "45eff85143d43b51ca80bff7431ff3ca2b96ae1b242dbed7cad379767032bf9f"

.deps/builder_inputs.toml

@@ -1,5 +1,5 @@
 {
-  "linux-aarch64": "sha256:293e22087f45e4f460a527f2583c9592ae702a55b318cc6066f255e60470a40e",
-  "linux-x86_64": "sha256:57380fd04afcf90a50087ad3d3e32c2075a801bab93478be4a83c0a2cabeb867",
-  "windows-x86_64": "sha256:5f99e8d346605ce93a0656908bbd4da6258ce9b67798c18a9a327a5f08403be7"
+  "linux-aarch64": "sha256:75e43dcd27c73cb11b93530d0f4a6e832ed36c8940777f361e03fe4fd0311ce1",
+  "linux-x86_64": "sha256:6a16bc2e11096b8c17bfdc1deaef4b5f0828ea57811bbffc31a84a354b663cf8",
+  "windows-x86_64": "sha256:db6ee72b8ef6e6ba9ce212d02b320e5a6a9e0ae20e578693f94a15f7aff417e0"
 }