Merge latest upstream

.github/workflows/build.yml

@@ -2,39 +2,38 @@ name: build
 on: [push, pull_request]
 jobs:
   build:
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         include:
-        - ruby: 3.0
-          gemfile: Gemfile
-          postgres: 13
-        - ruby: 2.7
-          gemfile: gemfiles/activerecord60.gemfile
-          postgres: 12
-        - ruby: 2.6
-          gemfile: gemfiles/activerecord52.gemfile
-          postgres: 11
-        - ruby: 2.5
-          gemfile: gemfiles/activerecord51.gemfile
-          postgres: 10
-        - ruby: 2.4
-          gemfile: gemfiles/activerecord50.gemfile
-          postgres: 9.6
+          - ruby: 3.3
+            gemfile: Gemfile
+            postgres: 16
+          - ruby: 3.2
+            gemfile: Gemfile
+            postgres: 15
+          - ruby: 3.1
+            gemfile: gemfiles/activerecord70.gemfile
+            postgres: 14
+          - ruby: "3.0"
+            gemfile: gemfiles/activerecord61.gemfile
+            postgres: 12
+          - ruby: 2.7
+            gemfile: gemfiles/activerecord60.gemfile
+            postgres: 10
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - uses: ankane/setup-postgres@v1
-      with:
-        postgres-version: ${{ matrix.postgres }}
-        config: |
-          shared_preload_libraries = 'pg_stat_statements'
-    - run: createdb pghero_test
-    - run: bundle exec rake test
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - uses: ankane/setup-postgres@v1
+        with:
+          postgres-version: ${{ matrix.postgres }}
+          database: pghero_test
+          config: |
+            shared_preload_libraries = 'pg_stat_statements'
+      - run: bundle exec rake test

CHANGELOG.md

@@ -1,3 +1,70 @@
+## 3.4.0 (2023-11-28)
+
+- Added support for explaining normalized queries with Postgres 16
+- Added Docker image for `linux/arm64`
+
+## 3.3.4 (2023-09-05)
+
+- Fixed support for aliases in config file
+
+## 3.3.3 (2023-04-18)
+
+- Fixed error with system stats for Azure Database
+
+## 3.3.2 (2023-04-12)
+
+- Fixed error with suggested indexes and empty statements
+
+## 3.3.1 (2023-03-15)
+
+- Fixed error with Uglifier
+
+## 3.3.0 (2023-03-11)
+
+- Improved handling of lock timeouts
+- Improved syntax highlighting
+
+## 3.2.0 (2023-02-21)
+
+- Added support for pg_query 4
+- Added `pghero:clean_space_stats` rake task
+- Added support for specifying retention period with `clean_query_stats` and `clean_space_stats`
+- Removed reset button when historical query stats are enabled
+
+## 3.1.0 (2023-01-04)
+
+- Fixed explain error message leaking data - [more info](https://github.com/ankane/pghero/issues/439)
+- Explain analyze is now opt-in - [more info](https://github.com/ankane/pghero/issues/438)
+- Added support for disabling explain and explain analyze
+- Added support for visualize without explain analyze
+- Added `explain_v2` method
+
+## 3.0.1 (2022-10-09)
+
+- Fixed message when database user does not have permission to reset query stats
+
+## 3.0.0 (2022-09-13)
+
+- Changed `capture_query_stats` to only reset stats for current database in Postgres 12+
+- Changed `reset_query_stats` to only reset stats for current database (use `reset_instance_query_stats` to reset stats for entire instance)
+- Added `visualize_url` option to config
+- Removed `access_key_id`, `secret_access_key`, `region`, and `db_instance_identifier` methods (use `aws_` prefixed methods instead)
+- Dropped support for Linux packages for EOL versions
+- Dropped support for Ruby < 2.7 and Rails < 6
+- Dropped support for pg_query < 2
+- Dropped support for aws-sdk < 2
+
+## 2.8.3 (2022-05-01)
+
+- Added support for `google-apis-monitoring_v3`
+- Added experimental support for Propshaft
+- Fixed error with walsender queries on live queries page
+
+## 2.8.2 (2021-12-15)
+
+- Fixed sorting by name on space page when historical space stats are not enabled
+- Fixed deprecation warnings with Active Record 7
+
 ## 2.8.1 (2021-03-25)
 
 - Added support for pg_query 2

Gemfile

@@ -5,9 +5,8 @@ gemspec
 gem "minitest", ">= 5"
 gem "rake"
 
-gem "activerecord", "~> 6.1.0"
-gem "activerecord-import"
+gem "activerecord", "~> 7.1.0"
 gem "combustion"
 gem "pg"
 gem "pg_query"
-gem "httparty"
+gem "httparty"

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2021 Andrew Kane, 2008-2014 Heroku (initial queries)
+Copyright (c) 2014-2023 Andrew Kane, 2008-2014 Heroku (initial queries)
 
 MIT License
 

README.md

@@ -8,7 +8,7 @@ A performance dashboard for Postgres
 
 :tangerine: Battle-tested at [Instacart](https://www.instacart.com/opensource)
 
-[![Build Status](https://github.com/ankane/pghero/workflows/build/badge.svg?branch=master)](https://github.com/ankane/pghero/actions) [![Docker Pulls](https://img.shields.io/docker/pulls/ankane/pghero)](https://hub.docker.com/repository/docker/ankane/pghero)
+[![Build Status](https://github.com/ankane/pghero/actions/workflows/build.yml/badge.svg)](https://github.com/ankane/pghero/actions)
 
 ## Documentation
 

Rakefile

@@ -5,4 +5,5 @@ task default: :test
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.pattern = "test/**/*_test.rb"
+  t.warning = false # for google-protobuf (pg_query dependency)
 end