From ea667d49ad81b6f5d7d73d0c6a4f31fa18e12b7d Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Mon, 19 Aug 2024 11:01:54 +0200
Subject: [PATCH 1/2] chore: remove yabeda-rails

---
 Gemfile                                   |  2 --
 Gemfile.lock                              | 11 -----------
 config/env.example.optional               |  2 +-
 config/initializers/prometheus_metrics.rb |  3 ---
 config/puma.rb                            |  1 -
 5 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 config/initializers/prometheus_metrics.rb

diff --git a/Gemfile b/Gemfile
index 0fef04096..a19d67498 100644
--- a/Gemfile
+++ b/Gemfile
@@ -107,8 +107,6 @@ gem 'warden'
 gem 'webrick', require: false
 gem 'yabeda-graphql'
 gem 'yabeda-prometheus'
-gem 'yabeda-puma-plugin'
-gem 'yabeda-rails'
 gem 'yabeda-sidekiq'
 gem 'zipline'
 gem 'zxcvbn-ruby', require: 'zxcvbn'
diff --git a/Gemfile.lock b/Gemfile.lock
index d55b4e387..48dca8525 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -866,15 +866,6 @@ GEM
       prometheus-client (>= 3.0, < 5.0)
       rack
       yabeda (~> 0.10)
-    yabeda-puma-plugin (0.7.1)
-      json
-      puma
-      yabeda (~> 0.5)
-    yabeda-rails (0.9.0)
-      activesupport
-      anyway_config (>= 1.3, < 3)
-      railties
-      yabeda (~> 0.8)
     yabeda-sidekiq (0.12.0)
       anyway_config (>= 1.3, < 3)
       sidekiq
@@ -1037,8 +1028,6 @@ DEPENDENCIES
   webrick
   yabeda-graphql
   yabeda-prometheus
-  yabeda-puma-plugin
-  yabeda-rails
   yabeda-sidekiq
   zipline
   zxcvbn-ruby
diff --git a/config/env.example.optional b/config/env.example.optional
index 79710f04e..ffad0f1cd 100644
--- a/config/env.example.optional
+++ b/config/env.example.optional
@@ -244,7 +244,7 @@ REDIS_SIDEKIQ_PASSWORD='sentinel_and_redis_password'
 REDIS_SIDEKIQ_USERNAME='sentinel_and_redis_username'
 
 # configuration for prometheus metrics web server on /metrics
-# launched with sidekiq and puma
+# launched with sidekiq
 # adjust according to your prometheus probe, 127.0.0.1 or your local/admin net address
 # it's advised to avoid 0.0.0.0 or if you do, please configure ACL elsewhere (webserver, reverse proxy, ...)
 PROMETHEUS_EXPORTER_BIND="127.0.0.1"
diff --git a/config/initializers/prometheus_metrics.rb b/config/initializers/prometheus_metrics.rb
deleted file mode 100644
index aa9f7bec5..000000000
--- a/config/initializers/prometheus_metrics.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-if ENV['PROMETHEUS_EXPORTER_ENABLED'] == 'enabled' && !Sidekiq.server?
-  Prometheus::Client.config.data_store = Prometheus::Client::DataStores::DirectFileStore.new(dir: Rails.root.join('tmp', 'prometheus'))
-end
diff --git a/config/puma.rb b/config/puma.rb
index 470a8760d..67843488a 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -45,4 +45,3 @@ end
 plugin :tmp_restart
 
 activate_control_app
-plugin :yabeda

From e314365083bdd4056e39e0500b3a2213dec89b45 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Mon, 19 Aug 2024 11:47:32 +0200
Subject: [PATCH 2/2] chore: remove yabeda-graphql

---
 Gemfile                      | 1 -
 Gemfile.lock                 | 4 ----
 README.md                    | 2 +-
 app/graphql/api/v2/schema.rb | 1 -
 config.ru                    | 4 ----
 5 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index a19d67498..0af7d45fe 100644
--- a/Gemfile
+++ b/Gemfile
@@ -105,7 +105,6 @@ gem 'view_component'
 gem 'vite_rails'
 gem 'warden'
 gem 'webrick', require: false
-gem 'yabeda-graphql'
 gem 'yabeda-prometheus'
 gem 'yabeda-sidekiq'
 gem 'zipline'
diff --git a/Gemfile.lock b/Gemfile.lock
index 48dca8525..9c39c3575 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -859,9 +859,6 @@ GEM
       anyway_config (>= 1.0, < 3)
       concurrent-ruby
       dry-initializer
-    yabeda-graphql (0.2.3)
-      graphql (>= 1.9, < 3)
-      yabeda (~> 0.2)
     yabeda-prometheus (0.9.1)
       prometheus-client (>= 3.0, < 5.0)
       rack
@@ -1026,7 +1023,6 @@ DEPENDENCIES
   web-console
   webmock
   webrick
-  yabeda-graphql
   yabeda-prometheus
   yabeda-sidekiq
   zipline
diff --git a/README.md b/README.md
index 95b7bcf8b..0261e2109 100644
--- a/README.md
+++ b/README.md
@@ -195,4 +195,4 @@ La compatibilité est testée par Browserstack.<br>[<img src="app/assets/images/
 
 Nous utilisons Skylight pour suivre les performances de notre application.
 
-Par ailleurs, nous utilisons [Yabeda](https://github.com/yabeda-rb/yabeda) pour exporter des metriques au format prometheus. L'activation se fait via la variable d'environnement `PROMETHEUS_EXPORTER_ENABLED` voir config/env.example.optional .
+Par ailleurs, nous utilisons [Yabeda](https://github.com/yabeda-rb/yabeda) pour exporter des métriques au format prometheus pour Sidekiq. L'activation se fait via la variable d'environnement `PROMETHEUS_EXPORTER_ENABLED` voir config/env.example.optional .
diff --git a/app/graphql/api/v2/schema.rb b/app/graphql/api/v2/schema.rb
index 43741e10e..6ff534a27 100644
--- a/app/graphql/api/v2/schema.rb
+++ b/app/graphql/api/v2/schema.rb
@@ -147,7 +147,6 @@ class API::V2::Schema < GraphQL::Schema
   use Timeout, max_seconds: 30
   use GraphQL::Batch
   use GraphQL::Backtrace
-  use Yabeda::GraphQL
 
   if Rails.env.development?
     class LogQueryDepth < GraphQL::Analysis::AST::QueryDepth
diff --git a/config.ru b/config.ru
index ca1b05049..4a3c09a68 100644
--- a/config.ru
+++ b/config.ru
@@ -2,9 +2,5 @@
 
 require_relative "config/environment"
 
-if ENV['PROMETHEUS_EXPORTER_ENABLED'] == 'enabled'
-  Yabeda::Prometheus::Exporter.start_metrics_server!
-end
-
 run Rails.application
 Rails.application.load_server