fix newrelic method tracers

app/models/user.rb

@@ -3,7 +3,6 @@ class User < ApplicationRecord
   include NonNullUuid
 
   include ::NewRelic::Agent::MethodTracer
-  add_method_tracer :send_devise_notification, "Custom/#{name}/send_devise_notification"
 
   devise(
     :database_authenticatable,
@@ -131,4 +130,6 @@ def strip_whitespace
   def send_confirmation_instructions
     # no-op
   end
+
+  add_method_tracer :send_devise_notification, "Custom/#{name}/send_devise_notification"
 end

app/presenters/confirmation_email_presenter.rb

@@ -1,8 +1,5 @@
 class ConfirmationEmailPresenter
   include ::NewRelic::Agent::MethodTracer
-  add_method_tracer :initialize, "Custom/#{name}/initialize"
-  add_method_tracer :first_sentence, "Custom/#{name}/first_sentence"
-  add_method_tracer :confirmation_period, "Custom/#{name}/confirmation_period"
 
   def initialize(user, view)
     @user = user
@@ -38,4 +35,8 @@ def confirmation_period
   private
 
   attr_reader :user, :view
+
+  add_method_tracer :initialize, "Custom/#{name}/initialize"
+  add_method_tracer :first_sentence, "Custom/#{name}/first_sentence"
+  add_method_tracer :confirmation_period, "Custom/#{name}/confirmation_period"
 end

app/services/binary_search_sorted_hash_file.rb

@@ -1,6 +1,5 @@
 class BinarySearchSortedHashFile
   include ::NewRelic::Agent::MethodTracer
-  add_method_tracer :call, "Custom/#{name}/call"
 
   RECORD_SIZE = 41
 
@@ -30,4 +29,6 @@ def call(password)
       end
     end
   end
+
+  add_method_tracer :call, "Custom/#{name}/call"
 end

app/services/encryption/contextless_kms_client.rb

@@ -2,8 +2,6 @@ module Encryption
   class ContextlessKmsClient
     include Encodable
     include ::NewRelic::Agent::MethodTracer
-    add_method_tracer :decrypt, "Custom/#{name}/decrypt"
-    add_method_tracer :encrypt, "Custom/#{name}/encrypt"
 
     KEY_TYPE = {
       KMS: 'KMSx',
@@ -97,5 +95,8 @@ def aws_client
     def encryptor
       @encryptor ||= Encryptors::AesEncryptor.new
     end
+
+    add_method_tracer :decrypt, "Custom/#{name}/decrypt"
+    add_method_tracer :encrypt, "Custom/#{name}/encrypt"
   end
 end

app/services/encryption/encryptors/attribute_encryptor.rb

@@ -3,8 +3,6 @@ module Encryptors
     class AttributeEncryptor
       include Encodable
       include ::NewRelic::Agent::MethodTracer
-      add_method_tracer :encrypt, "Custom/#{name}/encrypt"
-      add_method_tracer :decrypt, "Custom/#{name}/decrypt"
 
       def initialize
         @aes_cipher = AesCipher.new
@@ -56,6 +54,9 @@ def all_keys
       def old_keys
         JSON.parse(AppConfig.env.attribute_encryption_key_queue)
       end
+
+      add_method_tracer :encrypt, "Custom/#{name}/encrypt"
+      add_method_tracer :decrypt, "Custom/#{name}/decrypt"
     end
   end
 end

app/services/encryption/encryptors/pii_encryptor.rb

@@ -2,8 +2,6 @@ module Encryption
   module Encryptors
     class PiiEncryptor
       include ::NewRelic::Agent::MethodTracer
-      add_method_tracer :encrypt, "Custom/#{name}/encrypt"
-      add_method_tracer :decrypt, "Custom/#{name}/decrypt"
 
       Ciphertext = Struct.new(:encrypted_data, :salt, :cost) do
         include Encodable
@@ -78,6 +76,9 @@ def scrypt_password_digest(salt:, cost:)
         scrypt_password_digest = SCrypt::Password.new(scrypted).digest
         [scrypt_password_digest].pack('H*')
       end
+
+      add_method_tracer :encrypt, "Custom/#{name}/encrypt"
+      add_method_tracer :decrypt, "Custom/#{name}/decrypt"
     end
   end
 end

app/services/encryption/encryptors/session_encryptor.rb

@@ -3,8 +3,6 @@ module Encryptors
     class SessionEncryptor
       include Encodable
       include ::NewRelic::Agent::MethodTracer
-      add_method_tracer :encrypt, "Custom/#{name}/encrypt"
-      add_method_tracer :decrypt, "Custom/#{name}/decrypt"
 
       def encrypt(plaintext)
         aes_ciphertext = AesEncryptor.new.encrypt(plaintext, aes_encryption_key)
@@ -28,6 +26,9 @@ def aes_encryptor
       def aes_encryption_key
         AppConfig.env.session_encryption_key[0...32]
       end
+
+      add_method_tracer :encrypt, "Custom/#{name}/encrypt"
+      add_method_tracer :decrypt, "Custom/#{name}/decrypt"
     end
   end
 end

app/services/encryption/kms_client.rb

@@ -4,8 +4,6 @@ module Encryption
   class KmsClient
     include Encodable
     include ::NewRelic::Agent::MethodTracer
-    add_method_tracer :decrypt, "Custom/#{name}/decrypt"
-    add_method_tracer :encrypt, "Custom/#{name}/encrypt"
 
     KEY_TYPE = {
       KMS: 'KMSc',
@@ -124,5 +122,8 @@ def encryptor
     def multi_aws_client
       @multi_aws_client ||= MultiRegionKmsClient.new
     end
+
+    add_method_tracer :decrypt, "Custom/#{name}/decrypt"
+    add_method_tracer :encrypt, "Custom/#{name}/encrypt"
   end
 end

app/services/encryption/password_verifier.rb

@@ -1,8 +1,6 @@
 module Encryption
   class PasswordVerifier
     include ::NewRelic::Agent::MethodTracer
-    add_method_tracer :digest, "Custom/#{name}/digest"
-    add_method_tracer :verify, "Custom/#{name}/verify"
 
     PasswordDigest = Struct.new(
       :encrypted_password,
@@ -108,5 +106,8 @@ def kms_encryption_context(user_uuid:)
     def verify_uak_digest(password, digest)
       UakPasswordVerifier.verify(password: password, digest: digest)
     end
+
+    add_method_tracer :digest, "Custom/#{name}/digest"
+    add_method_tracer :verify, "Custom/#{name}/verify"
   end
 end

app/services/encryption/user_access_key.rb

@@ -11,7 +11,6 @@
 module Encryption
   class UserAccessKey
     include ::NewRelic::Agent::MethodTracer
-    add_method_tracer :initialize, "Custom/#{name}/build"
 
     attr_reader :cost, :salt, :z1, :z2, :random_r, :masked_ciphertext, :cek
 
@@ -101,5 +100,7 @@ def xor(left, right)
         left_byte ^ right_byte
       end.pack('C*')
     end
+
+    add_method_tracer :initialize, "Custom/#{name}/build"
   end
 end

app/services/send_sign_up_email_confirmation.rb

@@ -1,6 +1,5 @@
 class SendSignUpEmailConfirmation
   include ::NewRelic::Agent::MethodTracer
-  add_method_tracer(:call, "Custom/#{name}/call")
 
   attr_reader :user
 
@@ -83,4 +82,6 @@ def send_pw_reset_request_unconfirmed_user_email(request_id, instructions)
   def handle_multiple_email_address_error
     raise 'sign up user has multiple email address records'
   end
+
+  add_method_tracer :call, "Custom/#{name}/call"
 end