diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3906312 --- /dev/null +++ b/.gitignore @@ -0,0 +1,36 @@ +# MacOS General +.DS_Store +.AppleDouble +.LSOverride +# MacOS Icon must end with two \r +Icon +# MacOS Thumbnails +._* +# MacOS Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent +# MacOS Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk +# Linux +*~ +# Linux temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* +# Linux KDE directory preferences +.directory +# Linux trash folder which might appear on any partition or disk +.Trash-* +# Linux .nfs files are created when an open file is removed but is still being accessed +.nfs* +# Debug +debug_run.sh +# Bin +bin/* \ No newline at end of file diff --git a/.test_coverage.txt b/.test_coverage.txt new file mode 100644 index 0000000..1a839bb --- /dev/null +++ b/.test_coverage.txt @@ -0,0 +1,330 @@ +mode: atomic +github.com/cherts/pgscv/cmd/pgscv.go:18.13,28.18 5 0 +github.com/cherts/pgscv/cmd/pgscv.go:28.18,31.3 2 0 +github.com/cherts/pgscv/cmd/pgscv.go:33.2,34.16 2 0 +github.com/cherts/pgscv/cmd/pgscv.go:34.16,37.3 2 0 +github.com/cherts/pgscv/cmd/pgscv.go:39.2,39.42 1 0 +github.com/cherts/pgscv/cmd/pgscv.go:39.42,42.3 2 0 +github.com/cherts/pgscv/cmd/pgscv.go:44.2,47.12 3 0 +github.com/cherts/pgscv/cmd/pgscv.go:47.12,50.3 2 0 +github.com/cherts/pgscv/cmd/pgscv.go:52.2,52.12 1 0 +github.com/cherts/pgscv/cmd/pgscv.go:52.12,55.3 2 0 +github.com/cherts/pgscv/cmd/pgscv.go:57.2,57.55 1 0 +github.com/cherts/pgscv/cmd/pgscv.go:60.28,64.2 3 0 +github.com/cherts/pgscv/internal/log/log.go:16.29,17.15 1 0 +github.com/cherts/pgscv/internal/log/log.go:18.15,19.45 1 0 +github.com/cherts/pgscv/internal/log/log.go:20.14,21.44 1 0 +github.com/cherts/pgscv/internal/log/log.go:22.14,23.44 1 0 +github.com/cherts/pgscv/internal/log/log.go:24.15,25.45 1 0 +github.com/cherts/pgscv/internal/log/log.go:26.10,27.44 1 0 +github.com/cherts/pgscv/internal/log/log.go:31.27,34.2 2 0 +github.com/cherts/pgscv/internal/log/log.go:37.33,39.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:42.24,44.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:47.46,49.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:52.32,54.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:57.23,59.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:62.45,64.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:67.31,69.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:72.23,74.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:77.45,79.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:82.31,84.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:87.24,89.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:92.46,94.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:97.32,99.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:102.33,104.23 2 0 +github.com/cherts/pgscv/internal/log/log.go:104.23,106.3 1 0 +github.com/cherts/pgscv/internal/log/log.go:107.2,107.14 1 0 +github.com/cherts/pgscv/internal/log/log.go:111.55,113.23 2 0 +github.com/cherts/pgscv/internal/log/log.go:113.23,115.3 1 0 +github.com/cherts/pgscv/internal/log/log.go:116.2,116.24 1 0 +github.com/cherts/pgscv/internal/log/log.go:120.41,122.23 2 0 +github.com/cherts/pgscv/internal/log/log.go:122.23,124.3 1 0 +github.com/cherts/pgscv/internal/log/log.go:125.2,125.27 1 0 +github.com/cherts/pgscv/internal/filter/filter.go:21.43,23.46 1 31 +github.com/cherts/pgscv/internal/filter/filter.go:23.46,25.3 1 1 +github.com/cherts/pgscv/internal/filter/filter.go:27.2,27.46 1 30 +github.com/cherts/pgscv/internal/filter/filter.go:27.46,29.73 1 4 +github.com/cherts/pgscv/internal/filter/filter.go:29.73,31.4 1 1 +github.com/cherts/pgscv/internal/filter/filter.go:33.3,33.75 1 3 +github.com/cherts/pgscv/internal/filter/filter.go:33.75,35.4 1 1 +github.com/cherts/pgscv/internal/filter/filter.go:37.3,37.74 1 2 +github.com/cherts/pgscv/internal/filter/filter.go:37.74,39.4 1 1 +github.com/cherts/pgscv/internal/filter/filter.go:41.3,41.74 1 1 +github.com/cherts/pgscv/internal/filter/filter.go:41.74,43.4 1 1 +github.com/cherts/pgscv/internal/filter/filter.go:47.2,47.59 1 26 +github.com/cherts/pgscv/internal/filter/filter.go:47.59,49.3 1 12 +github.com/cherts/pgscv/internal/filter/filter.go:51.2,51.60 1 14 +github.com/cherts/pgscv/internal/filter/filter.go:51.60,53.3 1 4 +github.com/cherts/pgscv/internal/filter/filter.go:55.2,55.13 1 10 +github.com/cherts/pgscv/internal/filter/filter.go:62.20,64.2 1 1 +github.com/cherts/pgscv/internal/filter/filter.go:67.50,69.2 1 3 +github.com/cherts/pgscv/internal/filter/filter.go:72.34,75.29 2 4 +github.com/cherts/pgscv/internal/filter/filter.go:75.29,76.27 1 6 +github.com/cherts/pgscv/internal/filter/filter.go:76.27,78.18 2 4 +github.com/cherts/pgscv/internal/filter/filter.go:78.18,80.5 1 1 +github.com/cherts/pgscv/internal/filter/filter.go:81.4,81.25 1 3 +github.com/cherts/pgscv/internal/filter/filter.go:84.3,84.27 1 5 +github.com/cherts/pgscv/internal/filter/filter.go:84.27,86.18 2 3 +github.com/cherts/pgscv/internal/filter/filter.go:86.18,88.5 1 1 +github.com/cherts/pgscv/internal/filter/filter.go:89.4,89.25 1 2 +github.com/cherts/pgscv/internal/filter/filter.go:93.3,93.18 1 4 +github.com/cherts/pgscv/internal/filter/filter.go:96.2,97.12 2 2 +github.com/cherts/pgscv/internal/log/log.go:16.29,17.15 1 0 +github.com/cherts/pgscv/internal/log/log.go:18.15,19.45 1 0 +github.com/cherts/pgscv/internal/log/log.go:20.14,21.44 1 0 +github.com/cherts/pgscv/internal/log/log.go:22.14,23.44 1 0 +github.com/cherts/pgscv/internal/log/log.go:24.15,25.45 1 0 +github.com/cherts/pgscv/internal/log/log.go:26.10,27.44 1 0 +github.com/cherts/pgscv/internal/log/log.go:31.27,34.2 2 0 +github.com/cherts/pgscv/internal/log/log.go:37.33,39.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:42.24,44.2 1 6 +github.com/cherts/pgscv/internal/log/log.go:47.46,49.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:52.32,54.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:57.23,59.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:62.45,64.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:67.31,69.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:72.23,74.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:77.45,79.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:82.31,84.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:87.24,89.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:92.46,94.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:97.32,99.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:102.33,104.23 2 0 +github.com/cherts/pgscv/internal/log/log.go:104.23,106.3 1 0 +github.com/cherts/pgscv/internal/log/log.go:107.2,107.14 1 0 +github.com/cherts/pgscv/internal/log/log.go:111.55,113.23 2 0 +github.com/cherts/pgscv/internal/log/log.go:113.23,115.3 1 0 +github.com/cherts/pgscv/internal/log/log.go:116.2,116.24 1 0 +github.com/cherts/pgscv/internal/log/log.go:120.41,122.23 2 0 +github.com/cherts/pgscv/internal/log/log.go:122.23,124.3 1 0 +github.com/cherts/pgscv/internal/log/log.go:125.2,125.27 1 0 +github.com/cherts/pgscv/internal/http/http_client.go:27.42,30.22 2 6 +github.com/cherts/pgscv/internal/http/http_client.go:30.22,32.3 1 6 +github.com/cherts/pgscv/internal/http/http_client.go:34.2,44.3 1 6 +github.com/cherts/pgscv/internal/http/http_client.go:48.39,52.2 3 2 +github.com/cherts/pgscv/internal/http/http_client.go:55.59,57.2 1 8 +github.com/cherts/pgscv/internal/http/http_client.go:60.65,62.2 1 3 +github.com/cherts/pgscv/internal/http/http_server.go:25.54,28.94 2 7 +github.com/cherts/pgscv/internal/http/http_server.go:28.94,30.3 1 2 +github.com/cherts/pgscv/internal/http/http_server.go:32.2,32.92 1 5 +github.com/cherts/pgscv/internal/http/http_server.go:32.92,34.3 1 2 +github.com/cherts/pgscv/internal/http/http_server.go:36.2,36.46 1 3 +github.com/cherts/pgscv/internal/http/http_server.go:36.46,38.3 1 1 +github.com/cherts/pgscv/internal/http/http_server.go:40.2,40.45 1 3 +github.com/cherts/pgscv/internal/http/http_server.go:40.45,42.3 1 1 +github.com/cherts/pgscv/internal/http/http_server.go:44.2,44.35 1 3 +github.com/cherts/pgscv/internal/http/http_server.go:60.42,65.20 3 2 +github.com/cherts/pgscv/internal/http/http_server.go:65.20,67.3 1 0 +github.com/cherts/pgscv/internal/http/http_server.go:67.8,69.3 1 2 +github.com/cherts/pgscv/internal/http/http_server.go:71.2,80.3 1 2 +github.com/cherts/pgscv/internal/http/http_server.go:84.32,85.24 1 2 +github.com/cherts/pgscv/internal/http/http_server.go:85.24,88.3 2 1 +github.com/cherts/pgscv/internal/http/http_server.go:90.2,91.34 2 1 +github.com/cherts/pgscv/internal/http/http_server.go:95.32,105.71 2 8 +github.com/cherts/pgscv/internal/http/http_server.go:105.71,107.17 2 4 +github.com/cherts/pgscv/internal/http/http_server.go:107.17,109.4 1 0 +github.com/cherts/pgscv/internal/http/http_server.go:114.64,115.71 1 5 +github.com/cherts/pgscv/internal/http/http_server.go:115.71,117.9 2 5 +github.com/cherts/pgscv/internal/http/http_server.go:117.9,118.60 1 5 +github.com/cherts/pgscv/internal/http/http_server.go:118.60,121.5 2 1 +github.com/cherts/pgscv/internal/http/http_server.go:124.3,125.52 2 4 +github.com/cherts/pgscv/internal/http/http_server.go:130.90,132.16 2 4 +github.com/cherts/pgscv/internal/http/http_server.go:132.16,134.3 1 1 +github.com/cherts/pgscv/internal/http/http_server.go:136.2,144.17 7 3 +github.com/cherts/pgscv/internal/http/http_server.go:148.57,152.16 3 2 +github.com/cherts/pgscv/internal/http/http_server.go:152.16,154.3 1 0 +github.com/cherts/pgscv/internal/http/http_server.go:156.2,156.15 1 2 +github.com/cherts/pgscv/internal/http/http_server.go:156.15,159.3 2 2 +github.com/cherts/pgscv/internal/http/http_server.go:161.2,161.30 1 2 +github.com/cherts/pgscv/internal/http/http_server.go:161.30,164.21 3 1 +github.com/cherts/pgscv/internal/http/http_server.go:164.21,166.4 1 0 +github.com/cherts/pgscv/internal/http/http_server.go:167.3,167.63 1 1 +github.com/cherts/pgscv/internal/http/http_server.go:170.2,172.12 2 1 +github.com/cherts/pgscv/internal/http/testing.go:11.75,12.93 1 4 +github.com/cherts/pgscv/internal/http/testing.go:12.93,13.28 1 4 +github.com/cherts/pgscv/internal/http/testing.go:13.28,14.22 1 3 +github.com/cherts/pgscv/internal/http/testing.go:14.22,17.5 2 0 +github.com/cherts/pgscv/internal/http/testing.go:17.10,19.5 1 3 +github.com/cherts/pgscv/internal/http/testing.go:20.9,22.4 1 1 +github.com/cherts/pgscv/internal/http/testing.go:26.64,28.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:16.29,17.15 1 0 +github.com/cherts/pgscv/internal/log/log.go:18.15,19.45 1 0 +github.com/cherts/pgscv/internal/log/log.go:20.14,21.44 1 0 +github.com/cherts/pgscv/internal/log/log.go:22.14,23.44 1 0 +github.com/cherts/pgscv/internal/log/log.go:24.15,25.45 1 0 +github.com/cherts/pgscv/internal/log/log.go:26.10,27.44 1 0 +github.com/cherts/pgscv/internal/log/log.go:31.27,34.2 2 0 +github.com/cherts/pgscv/internal/log/log.go:37.33,39.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:42.24,44.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:47.46,49.2 1 1 +github.com/cherts/pgscv/internal/log/log.go:52.32,54.2 1 2 +github.com/cherts/pgscv/internal/log/log.go:57.23,59.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:62.45,64.2 1 2 +github.com/cherts/pgscv/internal/log/log.go:67.31,69.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:72.23,74.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:77.45,79.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:82.31,84.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:87.24,89.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:92.46,94.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:97.32,99.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:102.33,104.23 2 0 +github.com/cherts/pgscv/internal/log/log.go:104.23,106.3 1 0 +github.com/cherts/pgscv/internal/log/log.go:107.2,107.14 1 0 +github.com/cherts/pgscv/internal/log/log.go:111.55,113.23 2 0 +github.com/cherts/pgscv/internal/log/log.go:113.23,115.3 1 0 +github.com/cherts/pgscv/internal/log/log.go:116.2,116.24 1 0 +github.com/cherts/pgscv/internal/log/log.go:120.41,122.23 2 0 +github.com/cherts/pgscv/internal/log/log.go:122.23,124.3 1 0 +github.com/cherts/pgscv/internal/log/log.go:125.2,125.27 1 0 +github.com/cherts/pgscv/internal/log/log.go:16.29,17.15 1 0 +github.com/cherts/pgscv/internal/log/log.go:18.15,19.45 1 0 +github.com/cherts/pgscv/internal/log/log.go:20.14,21.44 1 0 +github.com/cherts/pgscv/internal/log/log.go:22.14,23.44 1 0 +github.com/cherts/pgscv/internal/log/log.go:24.15,25.45 1 0 +github.com/cherts/pgscv/internal/log/log.go:26.10,27.44 1 0 +github.com/cherts/pgscv/internal/log/log.go:31.27,34.2 2 0 +github.com/cherts/pgscv/internal/log/log.go:37.33,39.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:42.24,44.2 1 31 +github.com/cherts/pgscv/internal/log/log.go:47.46,49.2 1 1 +github.com/cherts/pgscv/internal/log/log.go:52.32,54.2 1 17 +github.com/cherts/pgscv/internal/log/log.go:57.23,59.2 1 4 +github.com/cherts/pgscv/internal/log/log.go:62.45,64.2 1 2 +github.com/cherts/pgscv/internal/log/log.go:67.31,69.2 1 27 +github.com/cherts/pgscv/internal/log/log.go:72.23,74.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:77.45,79.2 1 14 +github.com/cherts/pgscv/internal/log/log.go:82.31,84.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:87.24,89.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:92.46,94.2 1 7 +github.com/cherts/pgscv/internal/log/log.go:97.32,99.2 1 0 +github.com/cherts/pgscv/internal/log/log.go:102.33,104.23 2 0 +github.com/cherts/pgscv/internal/log/log.go:104.23,106.3 1 0 +github.com/cherts/pgscv/internal/log/log.go:107.2,107.14 1 0 +github.com/cherts/pgscv/internal/log/log.go:111.55,113.23 2 0 +github.com/cherts/pgscv/internal/log/log.go:113.23,115.3 1 0 +github.com/cherts/pgscv/internal/log/log.go:116.2,116.24 1 0 +github.com/cherts/pgscv/internal/log/log.go:120.41,122.23 2 0 +github.com/cherts/pgscv/internal/log/log.go:122.23,124.3 1 0 +github.com/cherts/pgscv/internal/log/log.go:125.2,125.27 1 0 +github.com/cherts/pgscv/internal/pgscv/config.go:41.56,42.26 1 8 +github.com/cherts/pgscv/internal/pgscv/config.go:42.26,44.3 1 0 +github.com/cherts/pgscv/internal/pgscv/config.go:46.2,47.16 2 8 +github.com/cherts/pgscv/internal/pgscv/config.go:47.16,49.3 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:50.2,52.16 3 7 +github.com/cherts/pgscv/internal/pgscv/config.go:52.16,54.3 1 0 +github.com/cherts/pgscv/internal/pgscv/config.go:56.2,59.16 3 7 +github.com/cherts/pgscv/internal/pgscv/config.go:59.16,61.3 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:63.2,63.20 1 6 +github.com/cherts/pgscv/internal/pgscv/config.go:67.48,70.16 3 8 +github.com/cherts/pgscv/internal/pgscv/config.go:70.16,72.3 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:73.2,73.41 1 7 +github.com/cherts/pgscv/internal/pgscv/config.go:73.41,76.17 3 0 +github.com/cherts/pgscv/internal/pgscv/config.go:76.17,78.4 1 0 +github.com/cherts/pgscv/internal/pgscv/config.go:79.3,80.19 2 0 +github.com/cherts/pgscv/internal/pgscv/config.go:81.8,81.40 1 7 +github.com/cherts/pgscv/internal/pgscv/config.go:81.40,84.3 2 7 +github.com/cherts/pgscv/internal/pgscv/config.go:84.8,84.50 1 0 +github.com/cherts/pgscv/internal/pgscv/config.go:84.50,87.3 2 0 +github.com/cherts/pgscv/internal/pgscv/config.go:87.8,87.36 1 0 +github.com/cherts/pgscv/internal/pgscv/config.go:87.36,90.3 2 0 +github.com/cherts/pgscv/internal/pgscv/config.go:90.8,92.3 1 0 +github.com/cherts/pgscv/internal/pgscv/config.go:96.35,97.27 1 8 +github.com/cherts/pgscv/internal/pgscv/config.go:97.27,99.3 1 0 +github.com/cherts/pgscv/internal/pgscv/config.go:101.2,101.19 1 8 +github.com/cherts/pgscv/internal/pgscv/config.go:101.19,103.3 1 0 +github.com/cherts/pgscv/internal/pgscv/config.go:103.8,105.3 1 8 +github.com/cherts/pgscv/internal/pgscv/config.go:108.2,108.23 1 8 +github.com/cherts/pgscv/internal/pgscv/config.go:108.23,110.3 1 8 +github.com/cherts/pgscv/internal/pgscv/config.go:112.2,112.51 1 8 +github.com/cherts/pgscv/internal/pgscv/config.go:112.51,114.3 1 8 +github.com/cherts/pgscv/internal/pgscv/config.go:116.2,116.49 1 8 +github.com/cherts/pgscv/internal/pgscv/config.go:116.49,118.3 1 8 +github.com/cherts/pgscv/internal/pgscv/config.go:120.2,120.52 1 8 +github.com/cherts/pgscv/internal/pgscv/config.go:120.52,122.3 1 8 +github.com/cherts/pgscv/internal/pgscv/config.go:124.2,124.50 1 8 +github.com/cherts/pgscv/internal/pgscv/config.go:124.50,126.3 1 8 +github.com/cherts/pgscv/internal/pgscv/config.go:130.2,130.36 1 8 +github.com/cherts/pgscv/internal/pgscv/config.go:130.36,131.40 1 4 +github.com/cherts/pgscv/internal/pgscv/config.go:131.40,132.46 1 4 +github.com/cherts/pgscv/internal/pgscv/config.go:132.46,133.16 1 5 +github.com/cherts/pgscv/internal/pgscv/config.go:133.16,135.6 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:136.5,136.28 1 4 +github.com/cherts/pgscv/internal/pgscv/config.go:136.28,138.6 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:140.5,141.19 2 3 +github.com/cherts/pgscv/internal/pgscv/config.go:141.19,143.6 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:149.2,150.16 2 5 +github.com/cherts/pgscv/internal/pgscv/config.go:150.16,152.3 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:153.2,157.16 3 4 +github.com/cherts/pgscv/internal/pgscv/config.go:157.16,159.3 1 0 +github.com/cherts/pgscv/internal/pgscv/config.go:162.2,163.16 2 4 +github.com/cherts/pgscv/internal/pgscv/config.go:163.16,165.3 1 2 +github.com/cherts/pgscv/internal/pgscv/config.go:166.2,169.12 3 2 +github.com/cherts/pgscv/internal/pgscv/config.go:173.67,174.18 1 20 +github.com/cherts/pgscv/internal/pgscv/config.go:174.18,176.3 1 6 +github.com/cherts/pgscv/internal/pgscv/config.go:178.2,178.35 1 14 +github.com/cherts/pgscv/internal/pgscv/config.go:178.35,180.31 2 15 +github.com/cherts/pgscv/internal/pgscv/config.go:180.31,182.4 1 4 +github.com/cherts/pgscv/internal/pgscv/config.go:184.3,185.17 2 11 +github.com/cherts/pgscv/internal/pgscv/config.go:185.17,187.4 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:190.3,190.51 1 10 +github.com/cherts/pgscv/internal/pgscv/config.go:190.51,193.32 2 11 +github.com/cherts/pgscv/internal/pgscv/config.go:193.32,195.5 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:198.4,199.18 2 10 +github.com/cherts/pgscv/internal/pgscv/config.go:199.18,201.5 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:204.4,204.53 1 9 +github.com/cherts/pgscv/internal/pgscv/config.go:204.53,206.5 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:209.4,211.37 2 8 +github.com/cherts/pgscv/internal/pgscv/config.go:211.37,212.48 1 9 +github.com/cherts/pgscv/internal/pgscv/config.go:212.48,214.6 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:216.5,216.48 1 8 +github.com/cherts/pgscv/internal/pgscv/config.go:216.48,218.6 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:220.5,221.18 2 7 +github.com/cherts/pgscv/internal/pgscv/config.go:222.29,223.44 1 6 +github.com/cherts/pgscv/internal/pgscv/config.go:223.44,225.7 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:226.6,226.29 1 5 +github.com/cherts/pgscv/internal/pgscv/config.go:226.29,228.7 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:229.13,230.59 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:236.2,236.12 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:240.42,248.35 3 4 +github.com/cherts/pgscv/internal/pgscv/config.go:248.35,253.43 1 206 +github.com/cherts/pgscv/internal/pgscv/config.go:253.43,254.12 1 192 +github.com/cherts/pgscv/internal/pgscv/config.go:257.3,262.87 3 14 +github.com/cherts/pgscv/internal/pgscv/config.go:262.87,264.18 2 3 +github.com/cherts/pgscv/internal/pgscv/config.go:264.18,266.5 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:268.4,268.41 1 2 +github.com/cherts/pgscv/internal/pgscv/config.go:272.3,272.46 1 13 +github.com/cherts/pgscv/internal/pgscv/config.go:272.46,274.18 2 3 +github.com/cherts/pgscv/internal/pgscv/config.go:274.18,276.5 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:278.4,278.41 1 2 +github.com/cherts/pgscv/internal/pgscv/config.go:281.3,281.14 1 12 +github.com/cherts/pgscv/internal/pgscv/config.go:282.31,283.32 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:284.30,285.17 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:286.74,287.30 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:288.12,289.31 1 0 +github.com/cherts/pgscv/internal/pgscv/config.go:291.26,292.28 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:293.35,294.86 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:295.30,296.38 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:297.30,298.38 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:299.29,300.37 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:301.30,302.38 1 1 +github.com/cherts/pgscv/internal/pgscv/config.go:306.2,306.20 1 2 +github.com/cherts/pgscv/internal/pgscv/config.go:310.59,311.13 1 8 +github.com/cherts/pgscv/internal/pgscv/config.go:311.13,313.3 1 5 +github.com/cherts/pgscv/internal/pgscv/config.go:315.2,315.26 1 8 +github.com/cherts/pgscv/internal/pgscv/pgscv.go:13.55,27.44 4 1 +github.com/cherts/pgscv/internal/pgscv/pgscv.go:27.44,29.3 1 0 +github.com/cherts/pgscv/internal/pgscv/pgscv.go:32.2,36.16 3 1 +github.com/cherts/pgscv/internal/pgscv/pgscv.go:36.16,38.3 1 0 +github.com/cherts/pgscv/internal/pgscv/pgscv.go:40.2,48.12 6 1 +github.com/cherts/pgscv/internal/pgscv/pgscv.go:48.12,49.57 1 1 +github.com/cherts/pgscv/internal/pgscv/pgscv.go:49.57,51.4 1 0 +github.com/cherts/pgscv/internal/pgscv/pgscv.go:52.3,52.12 1 1 +github.com/cherts/pgscv/internal/pgscv/pgscv.go:56.2,56.6 1 1 +github.com/cherts/pgscv/internal/pgscv/pgscv.go:56.6,57.10 1 1 +github.com/cherts/pgscv/internal/pgscv/pgscv.go:58.21,62.14 4 1 +github.com/cherts/pgscv/internal/pgscv/pgscv.go:63.21,66.12 3 0 +github.com/cherts/pgscv/internal/pgscv/pgscv.go:72.68,82.12 4 2 +github.com/cherts/pgscv/internal/pgscv/pgscv.go:82.12,84.3 1 2 +github.com/cherts/pgscv/internal/pgscv/pgscv.go:87.2,87.6 1 2 +github.com/cherts/pgscv/internal/pgscv/pgscv.go:87.6,88.10 1 2 +github.com/cherts/pgscv/internal/pgscv/pgscv.go:89.21,91.14 2 2 +github.com/cherts/pgscv/internal/pgscv/pgscv.go:92.23,93.14 1 0 diff --git a/Makefile b/Makefile index 829db5c..d3be099 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ help: ## Display this help screen clean: ## Clean rm -f ./bin/${APPNAME} ./bin/${APPNAME}.tar.gz ./bin/${APPNAME}.version ./bin/${APPNAME}.sha256 - rmdir ./bin + rm -rf ./bin go-update: # Update go mod go mod tidy -compat=1.22 diff --git a/README.md b/README.md index cce3b9b..6a8f2ec 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ This project is a continuation of the development of the original pgSCV by [Leso Download the archive from [releases](https://github.com/cherts/pgscv/releases). Unpack the archive. Create minimum config file. Start pgSCV systemd service under `postgres` user. ```bash -curl -s -L https://github.com/cherts/pgscv/releases/download/v0.8.0/pgscv_0.8.0_linux_amd64.tar.gz -o - | tar xzf - -C /tmp && \ +curl -s -L https://github.com/cherts/pgscv/releases/download/v0.8.1/pgscv_0.8.1_linux_amd64.tar.gz -o - | tar xzf - -C /tmp && \ mv /tmp/pgscv.yaml /etc && \ mv /tmp/pgscv.service /etc/systemd/system && \ mv /tmp/pgscv.default /etc/default/pgscv && \ diff --git a/README.ru.md b/README.ru.md index 123fbbf..12d24d5 100644 --- a/README.ru.md +++ b/README.ru.md @@ -29,7 +29,7 @@ Загрузите архив со страницы [releases](https://github.com/cherts/pgscv/releases). Распакуйте архив. Создайте минимальный файл конфигураации. Запустите pgSCV под пользователем postgres. ```bash -curl -s -L https://github.com/cherts/pgscv/releases/download/v0.8.0/pgscv_0.8.0_linux_amd64.tar.gz -o - | tar xzf - -C /tmp && \ +curl -s -L https://github.com/cherts/pgscv/releases/download/v0.8.1/pgscv_0.8.1_linux_amd64.tar.gz -o - | tar xzf - -C /tmp && \ mv /tmp/pgscv.yaml /etc && \ mv /tmp/pgscv.service /etc/systemd/system && \ mv /tmp/pgscv.default /etc/default/pgscv && \ diff --git a/deploy/helm-chart/Chart.yaml b/deploy/helm-chart/Chart.yaml index 1649e5e..5f3ceb0 100644 --- a/deploy/helm-chart/Chart.yaml +++ b/deploy/helm-chart/Chart.yaml @@ -18,4 +18,4 @@ version: 0.1.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.8.0" +appVersion: "0.8.1" diff --git a/go.mod b/go.mod index edecbd4..33b18d6 100644 --- a/go.mod +++ b/go.mod @@ -3,15 +3,15 @@ module github.com/cherts/pgscv go 1.22 require ( - github.com/jackc/pgproto3/v2 v2.3.2 - github.com/jackc/pgx/v4 v4.18.1 + github.com/jackc/pgproto3/v2 v2.3.3 + github.com/jackc/pgx/v4 v4.18.3 github.com/nxadm/tail v1.4.11 - github.com/prometheus/client_golang v1.18.0 + github.com/prometheus/client_golang v1.19.0 github.com/rs/zerolog v1.32.0 - github.com/stretchr/testify v1.8.4 - golang.org/x/crypto v0.19.0 // indirect - golang.org/x/net v0.21.0 - golang.org/x/sys v0.17.0 // indirect + github.com/stretchr/testify v1.9.0 + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/net v0.23.0 + golang.org/x/sys v0.18.0 // indirect gopkg.in/alecthomas/kingpin.v2 v2.2.6 gopkg.in/yaml.v2 v2.4.0 ) @@ -23,23 +23,20 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/golang/protobuf v1.5.3 // indirect github.com/jackc/chunkreader/v2 v2.0.1 // indirect - github.com/jackc/pgconn v1.14.1 // indirect + github.com/jackc/pgconn v1.14.3 // indirect github.com/jackc/pgio v1.0.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect - github.com/jackc/pgtype v1.14.2 // indirect + github.com/jackc/pgtype v1.14.3 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_model v0.5.0 // indirect - github.com/prometheus/common v0.46.0 // indirect - github.com/prometheus/procfs v0.12.0 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.52.2 // indirect + github.com/prometheus/procfs v0.13.0 // indirect golang.org/x/text v0.14.0 // indirect - golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect - google.golang.org/protobuf v1.32.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 176840e..2b40574 100644 --- a/go.sum +++ b/go.sum @@ -1,21 +1,11 @@ -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2cI+DC1Mbh0TJxzA3RcLoMsFw+aXw7E= -github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 h1:ez/4by2iGztzR4L0zgAOR8lTQK9VlyBVVd7G4omaOQs= github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= @@ -27,46 +17,18 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE= -github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= @@ -76,20 +38,16 @@ github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgO github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA= github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= -github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk= -github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= -github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= -github.com/jackc/pgconn v1.6.3 h1:4Ks3RKvSvKPolXZsnLQTDAsokDhgID14Cv4ehECmzlY= -github.com/jackc/pgconn v1.6.3/go.mod h1:w2pne1C2tZgP+TvjqLpOigGzNqjBgQW9dUw/4Chex78= github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= github.com/jackc/pgconn v1.14.0/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E= github.com/jackc/pgconn v1.14.1 h1:smbxIaZA08n6YuxEX1sDyjV/qkbtUtkH20qLkR9MUR4= github.com/jackc/pgconn v1.14.1/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E= +github.com/jackc/pgconn v1.14.3 h1:bVoTr12EGANZz66nZPkMInAV/KHD2TxH9npjXXgiB3w= +github.com/jackc/pgconn v1.14.3/go.mod h1:RZbme4uasqzybK2RK5c65VsHxoyaml09lx3tXOcO/VM= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= -github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA= github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c= github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5Wi/+Zz7xoE5ALHsRQlOctkOiHc= @@ -102,15 +60,12 @@ github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg= github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= -github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.0.2 h1:q1Hsy66zh4vuNsajBUF2PNqfAMMfxU5mk594lPE9vjY= -github.com/jackc/pgproto3/v2 v2.0.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgproto3/v2 v2.3.2 h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0= github.com/jackc/pgproto3/v2 v2.3.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= -github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg= +github.com/jackc/pgproto3/v2 v2.3.3 h1:1HLSx5H+tXR9pW3in3zaztoEwQYRC9SQaYUHjTSUOag= +github.com/jackc/pgproto3/v2 v2.3.3/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 h1:L0QtFUgDarD7Fpv9jeVMgy/+Ec0mtnmYuImjTz6dtDA= @@ -118,46 +73,31 @@ github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9/go.mod h1:5TJZ github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw= -github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0= -github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po= -github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ= -github.com/jackc/pgtype v1.4.2 h1:t+6LWm5eWPLX1H5Se702JSBcirq6uWa4jiG4wV1rAWY= -github.com/jackc/pgtype v1.4.2/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig= github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM= github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= github.com/jackc/pgtype v1.14.2 h1:QBdZQTKpPdBlw2AdKwHEyqUcm/lrl2cwWAHjCMyln/o= github.com/jackc/pgtype v1.14.2/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= +github.com/jackc/pgtype v1.14.3 h1:h6W9cPuHsRWQFTWUZMAKMgG5jSwQI0Zurzdvlx3Plus= +github.com/jackc/pgtype v1.14.3/go.mod h1:aKeozOde08iifGosdJpz9MBZonJOUJxqNpPBcMJTlVA= github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= -github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA= -github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o= -github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg= -github.com/jackc/pgx/v4 v4.8.0 h1:xO3bPvwr0MJSoDfb4yeeWZIxSZ2VFBm5axPnaNEnGUQ= -github.com/jackc/pgx/v4 v4.8.0/go.mod h1:AjqYcDmEyst6GF8jJi/RF73Gla9d7/HLZzJEZj2uwpM= github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= github.com/jackc/pgx/v4 v4.18.1 h1:YP7G1KABtKpB5IHrO9vYwSrCOhs7p3uqhvhhQBptya0= github.com/jackc/pgx/v4 v4.18.1/go.mod h1:FydWkUyadDmdNH/mHnGob881GawxeEm7TcMCzkb+qQE= +github.com/jackc/pgx/v4 v4.18.2/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw= +github.com/jackc/pgx/v4 v4.18.3 h1:dE2/TrEsGX3RBprb3qryqSV9Y60iZN1C6i8IrmW9/BA= +github.com/jackc/pgx/v4 v4.18.3/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw= github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= @@ -165,88 +105,57 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU= -github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= -github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= -github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY= github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.1 h1:+4eQaD7vAZ6DsfsxB15hbE0odUjGI5ARs9yskGu1v4s= -github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU= +github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.26.0 h1:iMAkS2TDoNWnKM+Kopnx/8tnEStIfpYA0ur0xQzzhMQ= -github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqScV0Y= github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1BTn+g2pa/hQ= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= -github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/common v0.52.2 h1:LW8Vk7BccEdONfrJBDffQGRtpSzi5CQaRZGtboOO2ck= +github.com/prometheus/common v0.52.2/go.mod h1:lrWtQx+iDfn2mbH5GUzlH9TSHyfZpHkSiG1W7y3sF2Q= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= +github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= -github.com/rs/zerolog v1.15.0 h1:uPRuwkWF4J6fGsJ2R0Gn2jB1EQiav9k3S6CSdygQJXY= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0= github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= -github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY= -github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= @@ -255,7 +164,6 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -263,6 +171,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= @@ -276,17 +186,12 @@ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9E go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 h1:DZhuSZLsGlFL4CmhA8BcRA0mnthyA/nZ00AqCUo7vHg= -golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= @@ -294,76 +199,67 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -376,44 +272,27 @@ golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= -golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1 h1:7QnIQpGRHE5RnLKnESfDoxm2dTapTZua5a0kS0A+VXQ= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/collector/linux_memory_test.go b/internal/collector/linux_memory_test.go index ace8324..ea15ed1 100644 --- a/internal/collector/linux_memory_test.go +++ b/internal/collector/linux_memory_test.go @@ -41,7 +41,8 @@ func TestMeminfoCollector_Update(t *testing.T) { "node_memory_WritebackTmp", "node_memory_NFS_Unstable", "node_memory_DirectMap2M", "node_memory_Hugetlb", "node_memory_CmaTotal", "node_memory_Mlocked", "node_memory_ShmemPmdMapped", "node_memory_SUnreclaim", "node_memory_KernelStack", "node_memory_VmallocChunk", "node_memory_Percpu", "node_memory_HardwareCorrupted", - "node_memory_CmaFree", "node_memory_CmaTotal", "node_memory_Zswap", "node_memory_Zswapped", "node_memory_SecPageTables", + "node_memory_CmaFree", "node_memory_CmaTotal", "node_memory_Zswap", "node_memory_Zswapped", + "node_memory_SecPageTables", "node_memory_Unaccepted", // vmstat "node_vmstat_nr_free_pages", "node_vmstat_nr_zone_inactive_anon", "node_vmstat_nr_zone_active_anon", "node_vmstat_nr_zone_inactive_file", "node_vmstat_nr_zone_active_file", "node_vmstat_nr_zone_unevictable", @@ -100,7 +101,7 @@ func TestMeminfoCollector_Update(t *testing.T) { "node_vmstat_pgpromote_candidate", "node_vmstat_pgscan_khugepaged", "node_vmstat_zswpin", "node_vmstat_thp_scan_exceed_swap_pte", "node_vmstat_allocstall_device", "node_vmstat_pgpromote_success", "node_vmstat_pgalloc_device", "node_vmstat_nr_sec_page_table_pages", "node_vmstat_cow_ksm", - "node_vmstat_ksm_swpin_copy", "node_vmstat_zswpout", + "node_vmstat_ksm_swpin_copy", "node_vmstat_zswpout", "node_vmstat_nr_unaccepted", }, collector: NewMeminfoCollector, } diff --git a/internal/collector/postgres_replication.go b/internal/collector/postgres_replication.go index 074a8f2..606efa5 100644 --- a/internal/collector/postgres_replication.go +++ b/internal/collector/postgres_replication.go @@ -10,7 +10,7 @@ import ( const ( // Query for Postgres version 9.6 and older. - postgresReplicationQuery96 = "SELECT pid, coalesce(host(client_addr), '127.0.0.1') AS client_addr, usename AS user, application_name, state, " + + postgresReplicationQuery96 = "SELECT pid, coalesce(host(client_addr), '127.0.0.1') AS client_addr, coalesce(client_port, '0') AS client_port, usename AS user, application_name, state, " + "pg_current_xlog_location() - sent_location AS pending_lag_bytes, " + "sent_location - write_location AS write_lag_bytes, " + "write_location - flush_location AS flush_lag_bytes, " + @@ -20,7 +20,7 @@ const ( "FROM pg_stat_replication" // Query for Postgres versions from 10 and newer. - postgresReplicationQueryLatest = "SELECT pid, coalesce(host(client_addr), '127.0.0.1') AS client_addr, usename AS user, application_name, state, " + + postgresReplicationQueryLatest = "SELECT pid, coalesce(host(client_addr), '127.0.0.1') AS client_addr, coalesce(client_port, '0') AS client_port, usename AS user, application_name, state, " + "pg_current_wal_lsn() - sent_lsn AS pending_lag_bytes, " + "sent_lsn - write_lsn AS write_lag_bytes, " + "write_lsn - flush_lsn AS flush_lag_bytes, " + @@ -44,7 +44,7 @@ type postgresReplicationCollector struct { // NewPostgresReplicationCollector returns a new Collector exposing postgres replication stats. // For details see https://www.postgresql.org/docs/current/monitoring-stats.html#PG-STAT-REPLICATION-VIEW func NewPostgresReplicationCollector(constLabels labels, settings model.CollectorSettings) (Collector, error) { - var labelNames = []string{"client_addr", "user", "application_name", "state", "lag"} + var labelNames = []string{"client_addr", "client_port", "user", "application_name", "state", "lag"} return &postgresReplicationCollector{ labelNames: labelNames, @@ -63,13 +63,13 @@ func NewPostgresReplicationCollector(constLabels labels, settings model.Collecto lagtotalbytes: newBuiltinTypedDesc( descOpts{"postgres", "replication", "lag_all_bytes", "Number of bytes standby is behind than primary including all phases.", 0}, prometheus.GaugeValue, - []string{"client_addr", "user", "application_name", "state"}, constLabels, + []string{"client_addr", "client_port", "user", "application_name", "state"}, constLabels, settings.Filters, ), lagtotalseconds: newBuiltinTypedDesc( descOpts{"postgres", "replication", "lag_all_seconds", "Number of seconds standby is behind than primary including all phases.", 0}, prometheus.GaugeValue, - []string{"client_addr", "user", "application_name", "state"}, constLabels, + []string{"client_addr", "client_port", "user", "application_name", "state"}, constLabels, settings.Filters, ), }, nil @@ -94,31 +94,31 @@ func (c *postgresReplicationCollector) Update(config Config, ch chan<- prometheu for _, stat := range stats { if value, ok := stat.values["pending_lag_bytes"]; ok { - ch <- c.lagbytes.newConstMetric(value, stat.clientaddr, stat.user, stat.applicationName, stat.state, "pending") + ch <- c.lagbytes.newConstMetric(value, stat.clientaddr, stat.clientport, stat.user, stat.applicationName, stat.state, "pending") } if value, ok := stat.values["write_lag_bytes"]; ok { - ch <- c.lagbytes.newConstMetric(value, stat.clientaddr, stat.user, stat.applicationName, stat.state, "write") + ch <- c.lagbytes.newConstMetric(value, stat.clientaddr, stat.clientport, stat.user, stat.applicationName, stat.state, "write") } if value, ok := stat.values["flush_lag_bytes"]; ok { - ch <- c.lagbytes.newConstMetric(value, stat.clientaddr, stat.user, stat.applicationName, stat.state, "flush") + ch <- c.lagbytes.newConstMetric(value, stat.clientaddr, stat.clientport, stat.user, stat.applicationName, stat.state, "flush") } if value, ok := stat.values["replay_lag_bytes"]; ok { - ch <- c.lagbytes.newConstMetric(value, stat.clientaddr, stat.user, stat.applicationName, stat.state, "replay") + ch <- c.lagbytes.newConstMetric(value, stat.clientaddr, stat.clientport, stat.user, stat.applicationName, stat.state, "replay") } if value, ok := stat.values["write_lag_seconds"]; ok { - ch <- c.lagseconds.newConstMetric(value, stat.clientaddr, stat.user, stat.applicationName, stat.state, "write") + ch <- c.lagseconds.newConstMetric(value, stat.clientaddr, stat.clientport, stat.user, stat.applicationName, stat.state, "write") } if value, ok := stat.values["flush_lag_seconds"]; ok { - ch <- c.lagseconds.newConstMetric(value, stat.clientaddr, stat.user, stat.applicationName, stat.state, "flush") + ch <- c.lagseconds.newConstMetric(value, stat.clientaddr, stat.clientport, stat.user, stat.applicationName, stat.state, "flush") } if value, ok := stat.values["replay_lag_seconds"]; ok { - ch <- c.lagseconds.newConstMetric(value, stat.clientaddr, stat.user, stat.applicationName, stat.state, "replay") + ch <- c.lagseconds.newConstMetric(value, stat.clientaddr, stat.clientport, stat.user, stat.applicationName, stat.state, "replay") } if value, ok := stat.values["total_lag_bytes"]; ok { - ch <- c.lagtotalbytes.newConstMetric(value, stat.clientaddr, stat.user, stat.applicationName, stat.state) + ch <- c.lagtotalbytes.newConstMetric(value, stat.clientaddr, stat.clientport, stat.user, stat.applicationName, stat.state) } if value, ok := stat.values["total_lag_seconds"]; ok { - ch <- c.lagtotalseconds.newConstMetric(value, stat.clientaddr, stat.user, stat.applicationName, stat.state) + ch <- c.lagtotalseconds.newConstMetric(value, stat.clientaddr, stat.clientport, stat.user, stat.applicationName, stat.state) } } @@ -129,6 +129,7 @@ func (c *postgresReplicationCollector) Update(config Config, ch chan<- prometheu type postgresReplicationStat struct { pid string clientaddr string + clientport string user string applicationName string state string @@ -151,6 +152,8 @@ func parsePostgresReplicationStats(r *model.PGResult, labelNames []string) map[s stat.pid = row[i].String case "client_addr": stat.clientaddr = row[i].String + case "client_port": + stat.clientport = row[i].String case "user": stat.user = row[i].String case "application_name": diff --git a/internal/collector/postgres_replication_test.go b/internal/collector/postgres_replication_test.go index ed53042..4a2f203 100644 --- a/internal/collector/postgres_replication_test.go +++ b/internal/collector/postgres_replication_test.go @@ -36,21 +36,21 @@ func Test_parsePostgresReplicationStats(t *testing.T) { Nrows: 1, Ncols: 14, Colnames: []pgproto3.FieldDescription{ - {Name: []byte("pid")}, {Name: []byte("client_addr")}, {Name: []byte("user")}, {Name: []byte("application_name")}, {Name: []byte("state")}, + {Name: []byte("pid")}, {Name: []byte("client_addr")},{Name: []byte("client_port")}, {Name: []byte("user")}, {Name: []byte("application_name")}, {Name: []byte("state")}, {Name: []byte("pending_lag_bytes")}, {Name: []byte("write_lag_bytes")}, {Name: []byte("flush_lag_bytes")}, {Name: []byte("replay_lag_bytes")}, {Name: []byte("total_lag_bytes")}, {Name: []byte("write_lag_seconds")}, {Name: []byte("flush_lag_seconds")}, {Name: []byte("replay_lag_seconds")}, {Name: []byte("total_lag_seconds")}, }, Rows: [][]sql.NullString{ { - {String: "123456", Valid: true}, {String: "127.0.0.1", Valid: true}, {String: "testuser", Valid: true}, {String: "testapp", Valid: true}, + {String: "123456", Valid: true}, {String: "127.0.0.1", Valid: true}, {String: "51658", Valid: true}, {String: "testuser", Valid: true}, {String: "testapp", Valid: true}, {String: "teststate", Valid: true}, {String: "100", Valid: true}, {String: "200", Valid: true}, {String: "300", Valid: true}, {String: "400", Valid: true}, {String: "500", Valid: true}, {String: "600", Valid: true}, {String: "700", Valid: true}, {String: "800", Valid: true}, {String: "2100", Valid: true}, }, { // pg_receivewals and pg_basebackups don't have replay lag. - {String: "101010", Valid: true}, {String: "127.0.0.1", Valid: true}, {String: "testuser", Valid: true}, {String: "pg_receivewal", Valid: true}, + {String: "101010", Valid: true}, {String: "127.0.0.1", Valid: true}, {String: "52441", Valid: true}, {String: "testuser", Valid: true}, {String: "pg_receivewal", Valid: true}, {String: "teststate", Valid: true}, {String: "4257", Valid: true}, {String: "8452", Valid: true}, {String: "5785", Valid: true}, {String: "", Valid: false}, {String: "", Valid: false}, {String: "2458", Valid: true}, {String: "7871", Valid: true}, {String: "6896", Valid: true}, {String: "17225", Valid: true}, @@ -59,14 +59,14 @@ func Test_parsePostgresReplicationStats(t *testing.T) { }, want: map[string]postgresReplicationStat{ "123456": { - pid: "123456", clientaddr: "127.0.0.1", user: "testuser", applicationName: "testapp", state: "teststate", + pid: "123456", clientaddr: "127.0.0.1", clientport: "51658", user: "testuser", applicationName: "testapp", state: "teststate", values: map[string]float64{ "pending_lag_bytes": 100, "write_lag_bytes": 200, "flush_lag_bytes": 300, "replay_lag_bytes": 400, "total_lag_bytes": 500, "write_lag_seconds": 600, "flush_lag_seconds": 700, "replay_lag_seconds": 800, "total_lag_seconds": 2100, }, }, "101010": { - pid: "101010", clientaddr: "127.0.0.1", user: "testuser", applicationName: "pg_receivewal", state: "teststate", + pid: "101010", clientaddr: "127.0.0.1", clientport: "52441", user: "testuser", applicationName: "pg_receivewal", state: "teststate", values: map[string]float64{ "pending_lag_bytes": 4257, "write_lag_bytes": 8452, "flush_lag_bytes": 5785, "write_lag_seconds": 2458, "flush_lag_seconds": 7871, "replay_lag_seconds": 6896, "total_lag_seconds": 17225, @@ -78,7 +78,7 @@ func Test_parsePostgresReplicationStats(t *testing.T) { for _, tc := range testCases { t.Run(tc.name, func(t *testing.T) { - got := parsePostgresReplicationStats(tc.res, []string{"client_addr", "user", "application_name", "state", "type"}) + got := parsePostgresReplicationStats(tc.res, []string{"client_addr", "client_port", "user", "application_name", "state", "type"}) assert.EqualValues(t, tc.want, got) }) }