From 6f1ed786fab411e355ef0934772216a07e61acd7 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Mon, 5 Feb 2024 09:53:32 +0100
Subject: [PATCH] chore(bundle): remove elastic-apm, we don't use it anymore

---
 Gemfile                     |  1 -
 Gemfile.lock                | 25 ++-----------------------
 config/elastic_apm.yml      |  8 --------
 config/env.example.optional |  6 ------
 4 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 config/elastic_apm.yml

diff --git a/Gemfile b/Gemfile
index 256c9f73c..5d7596bb4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,7 +31,6 @@ gem 'devise-two-factor'
 gem 'discard'
 gem 'dotenv-rails', require: 'dotenv/rails-now' # dotenv should always be loaded before rails
 gem 'dry-monads'
-gem 'elastic-apm'
 gem 'flipper'
 gem 'flipper-active_record'
 gem 'flipper-ui'
diff --git a/Gemfile.lock b/Gemfile.lock
index b060dc4a7..3e3439bba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -212,8 +212,7 @@ GEM
     diff-lcs (1.5.0)
     discard (1.3.0)
       activerecord (>= 4.2, < 8)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
     dotenv-rails (2.8.1)
       dotenv (= 2.8.1)
@@ -230,10 +229,6 @@ GEM
     dumb_delegator (1.0.0)
     ecma-re-validator (0.3.0)
       regexp_parser (~> 2.0)
-    elastic-apm (4.6.0)
-      concurrent-ruby (~> 1.0)
-      http (>= 3.0)
-      ruby2_keywords
     erubi (1.12.0)
     et-orbi (1.2.4)
       tzinfo
@@ -243,9 +238,6 @@ GEM
     factory_bot (6.1.0)
       activesupport (>= 5.0.0)
     ffi (1.16.3)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
-      rake
     flipper (1.0.0)
       brow (~> 0.4.1)
       concurrent-ruby (< 2)
@@ -320,15 +312,9 @@ GEM
     highline (2.0.3)
     html_tokenizer (0.0.7)
     htmlentities (4.3.4)
-    http (5.1.1)
-      addressable (~> 2.8)
-      http-cookie (~> 1.0)
-      http-form_data (~> 2.2)
-      llhttp-ffi (~> 0.4.0)
     http-accept (1.7.0)
-    http-cookie (1.0.3)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
-    http-form_data (2.3.0)
     http_accept_language (2.1.1)
     httpclient (2.8.3)
     i18n (1.14.1)
@@ -401,9 +387,6 @@ GEM
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    llhttp-ffi (0.4.0)
-      ffi-compiler (~> 1.0)
-      rake (~> 13.0)
     lograge (0.11.2)
       actionpack (>= 4)
       activesupport (>= 4)
@@ -759,9 +742,6 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     ulid-ruby (1.0.2)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.7)
     unicode-display_width (2.4.2)
     uri_template (0.7.0)
     validate_email (0.1.6)
@@ -860,7 +840,6 @@ DEPENDENCIES
   discard
   dotenv-rails
   dry-monads
-  elastic-apm
   factory_bot
   flipper
   flipper-active_record
diff --git a/config/elastic_apm.yml b/config/elastic_apm.yml
deleted file mode 100644
index 2c65bac6b..000000000
--- a/config/elastic_apm.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Set options ELASTIC_APM_SERVER_URL & ELASTIC_APM_SECRET_TOKEN by env vars instead
-# See https://www.elastic.co/guide/en/apm/agent/ruby/current/configuration.html
-#
-# server_url: ''
-# secret_token: ''
-
-# Enable it with ELASTIC_APM_ENABLED="true"
-enabled: false
diff --git a/config/env.example.optional b/config/env.example.optional
index c3c7bac7c..1193625c3 100644
--- a/config/env.example.optional
+++ b/config/env.example.optional
@@ -190,12 +190,6 @@ SIB_WEBHOOK_URL=""
 # ServicesPublics+ tracking url shown to user when dossier is terminated.
 SERVICES_PUBLICS_PLUS_URL=""
 
-# Elasticsearch APM
-# send application logs to elasticsearch APM component via elastic-apm gem
-# see https://www.elastic.co/guide/en/apm/agent/ruby/current/configuration.html for more configuration options and vars
-ELASTIC_APM_ENABLED=""	# disabled by default, set to "true" to enable
-ELASTIC_APM_SERVER_URL="http://192.168.0.1:8200" # elasticsearch APM endpoint URL
-
 # Classic SMTP
 CLASSIC_SMTP_ENABLED="disabled"
 SMTP_HOST=""