Skip to content

Revert "Merge branch 'sc1-railscache-metric-granularity' into 'master'"

David Dieulivol requested to merge revert-8f45dd4a into master

Purpose of revert

Most review-apps recently deployed fail with the following error:

Prometheus::Client::LabelSetValidator::InvalidLabelSetError (labels must have the same signature: (expected keys: [:action, :controller, :feature_category, :store], got: [:action, :controller, :feature_category])):
  /srv/gitlab/vendor/bundle/ruby/3.0.0/gems/prometheus-client-mmap-0.24.3-x86_64-linux/lib/prometheus/client/label_set_validator.rb:40:in `validate'
  /srv/gitlab/vendor/bundle/ruby/3.0.0/gems/prometheus-client-mmap-0.24.3-x86_64-linux/lib/prometheus/client/metric.rb:72:in `label_set_for'
  /srv/gitlab/vendor/bundle/ruby/3.0.0/gems/prometheus-client-mmap-0.24.3-x86_64-linux/lib/prometheus/client/counter.rb:16:in `increment'
  /srv/gitlab/lib/gitlab/metrics/transaction.rb:68:in `increment'
  /srv/gitlab/lib/gitlab/metrics/subscribers/rails_cache.rb:30:in `cache_read'
  /srv/gitlab/vendor/bundle/ruby/3.0.0/gems/activesupport-6.1.7.2/lib/active_support/subscriber.rb:150:in `finish'
  /srv/gitlab/vendor/bundle/ruby/3.0.0/gems/activesupport-6.1.7.2/lib/active_support/notifications/fanout.rb:157:in `finish'
  /srv/gitlab/vendor/bundle/ruby/3.0.0/gems/activesupport-6.1.7.2/lib/active_support/notifications/fanout.rb:63:in `block in finish'
  /srv/gitlab/vendor/bundle/ruby/3.0.0/gems/activesupport-6.1.7.2/lib/active_support/notifications/fanout.rb:63:in `each'
  /srv/gitlab/vendor/bundle/ruby/3.0.0/gems/activesupport-6.1.7.2/lib/active_support/notifications/fanout.rb:63:in `finish'
  /srv/gitlab/vendor/bundle/ruby/3.0.0/gems/activesupport-6.1.7.2/lib/active_support/notifications/instrumenter.rb:45:in `finish_with_state'
  /srv/gitlab/vendor/bundle/ruby/3.0.0/gems/activesupport-6.1.7.2/lib/active_support/notifications/instrumenter.rb:30:in `instrument'
  /srv/gitlab/vendor/bundle/ruby/3.0.0/gems/activesupport-6.1.7.2/lib/active_support/notifications.rb:203:in `instrument'
  /srv/gitlab/vendor/bundle/ruby/3.0.0/gems/activesupport-6.1.7.2/lib/active_support/cache.rb:726:in `instrument'
  /srv/gitlab/vendor/bundle/ruby/3.0.0/gems/activesupport-6.1.7.2/lib/active_support/cache.rb:366:in `read'
  /srv/gitlab/lib/gitlab/json_cache.rb:40:in `read'
  /srv/gitlab/lib/gitlab/json_cache.rb:51:in `fetch'
  /srv/gitlab/ee/app/models/license.rb:54:in `current'
  /srv/gitlab/ee/app/models/license.rb:75:in `feature_available?'
  /srv/gitlab/ee/app/services/ee/audit_event_service.rb:200:in `audit_events_enabled?'

We think the problem was introduced in !121477 (merged).

Checklist

Milestone info

  • I am reverting something in the current milestone. No changelog is needed, and I've added a ~"regression:*" label.
  • I am reverting something in a different milestone. A changelog is needed, and I've removed the ~"regression:*" label.

Related issues and merge requests

Edited by David Dieulivol

Merge request reports