Tech Debt: Remove Datadog Tracing (#20727)

* removed datadog tracing

* restoring tracking calls and remove do ends

* fixing linting errors

* Update modules/ivc_champva/app/controllers/ivc_champva/v1/uploads_controller.rb

Co-authored-by: Steve Long <[email protected]>

* Update modules/ivc_champva/app/controllers/ivc_champva/v1/uploads_controller.rb

Co-authored-by: Steve Long <[email protected]>

* Update modules/ivc_champva/app/services/ivc_champva/email.rb

Co-authored-by: Steve Long <[email protected]>

* Update modules/ivc_champva/app/services/ivc_champva/email.rb

Co-authored-by: Steve Long <[email protected]>

* Update modules/ivc_champva/app/services/ivc_champva/s3.rb

Co-authored-by: Steve Long <[email protected]>

* Update modules/ivc_champva/app/services/ivc_champva/s3.rb

Co-authored-by: Steve Long <[email protected]>

* Update modules/ivc_champva/app/services/ivc_champva/s3.rb

Co-authored-by: Steve Long <[email protected]>

* Update modules/ivc_champva/app/controllers/ivc_champva/v1/pega_controller.rb

Co-authored-by: Steve Long <[email protected]>

* Update modules/ivc_champva/app/controllers/ivc_champva/v1/pega_controller.rb

Co-authored-by: Steve Long <[email protected]>

* Update modules/ivc_champva/app/controllers/ivc_champva/v1/pega_controller.rb

Co-authored-by: Steve Long <[email protected]>

* Update modules/ivc_champva/app/controllers/ivc_champva/v1/pega_controller.rb

Co-authored-by: Steve Long <[email protected]>

* Linter autocorrections

* Removed unit test references to Datadog tracing

* linter warnings

---------

Co-authored-by: Rachel <[email protected]>
Co-authored-by: Steve Long <[email protected]>

Author: 3 people

modules/ivc_champva/app/controllers/ivc_champva/v1/pega_controller.rb

@@ -9,32 +9,30 @@ class PegaController < SignIn::ServiceAccountApplicationController
       VALID_KEYS = %w[form_uuid file_names status case_id].freeze
 
       def update_status
-        Datadog::Tracing.trace('Start PEGA Status Update') do
-          data = JSON.parse(params.to_json)
+        data = JSON.parse(params.to_json)
 
-          tags = ['service:veteran-ivc-champva-forms', 'function:form submission to Pega']
+        tags = ['service:veteran-ivc-champva-forms', 'function:form submission to Pega']
 
-          unless data.is_a?(Hash)
-            # Log the failure due to invalid JSON format
+        unless data.is_a?(Hash)
+          # Log the failure due to invalid JSON format
+          StatsD.increment('silent_failure_avoided_no_confirmation', tags: tags)
+          render json: JSON.generate({ status: 500, error: 'Invalid JSON format: Expected a JSON object' })
+          return
+        end
+
+        response =
+          if valid_keys?(data)
+            update_data(data['form_uuid'], data['file_names'], data['status'], data['case_id'])
+          else
             StatsD.increment('silent_failure_avoided_no_confirmation', tags: tags)
-            render json: JSON.generate({ status: 500, error: 'Invalid JSON format: Expected a JSON object' })
-            return
+            { json: { error_message: 'Invalid JSON keys' }, status: :bad_request }
           end
 
-          response =
-            if valid_keys?(data)
-              update_data(data['form_uuid'], data['file_names'], data['status'], data['case_id'])
-            else
-              StatsD.increment('silent_failure_avoided_no_confirmation', tags: tags)
-              { json: { error_message: 'Invalid JSON keys' }, status: :bad_request }
-            end
-
-          render json: response[:json], status: response[:status]
-        rescue JSON::ParserError => e
-          # Log the JSON parsing error
-          StatsD.increment('silent_failure_avoided_no_confirmation', tags: tags)
-          render json: { error_message: "JSON parsing error: #{e.message}" }, status: :internal_server_error
-        end
+        render json: response[:json], status: response[:status]
+      rescue JSON::ParserError => e
+        # Log the JSON parsing error
+        StatsD.increment('silent_failure_avoided_no_confirmation', tags: tags)
+        render json: { error_message: "JSON parsing error: #{e.message}" }, status: :internal_server_error
       end
 
       private

modules/ivc_champva/app/controllers/ivc_champva/v1/uploads_controller.rb

@@ -16,9 +16,8 @@ class UploadsController < ApplicationController
       }.freeze
 
       def submit
-        Datadog::Tracing.trace('Start IVC File Submission') do
+        begin
           form_id = get_form_id
-          Datadog::Tracing.active_trace&.set_tag('form_id', form_id)
           parsed_form_data = JSON.parse(params.to_json)
           statuses, error_message = handle_file_uploads(form_id, parsed_form_data)
 

modules/ivc_champva/app/services/ivc_champva/email.rb

@@ -24,26 +24,24 @@ def initialize(data)
     end
 
     def send_email
-      Datadog::Tracing.trace('Send PEGA Status Update Email') do
-        return false unless valid_environment?
+      return false unless valid_environment?
 
-        VANotify::EmailJob.perform_async(
-          data[:email],
-          (data[:template_id] ? EMAIL_TEMPLATE_MAP[data[:template_id]] : EMAIL_TEMPLATE_MAP[data[:form_number]]),
-          # Create a subset of `data` - Using .index_with rather than .slice so that keys
-          # default to `nil` if not present in `data`. This helps us w/ testing.
-          %i[first_name last_name file_count pega_status date_submitted form_uuid]
-            .index_with { |k| data[k] },
-          Settings.vanotify.services.ivc_champva.api_key,
-          # If no callback_klass is provided, should fail safely per va_notify implementation.
-          # See: https://github.com/department-of-veterans-affairs/vets-api/tree/master/modules/va_notify#how-teams-can-integrate-with-callbacks
-          { callback_klass: data[:callback_klass], callback_metadata: data[:callback_metadata] }
-        )
-        true
-      rescue => e
-        Rails.logger.error "Pega Status Update Email Error: #{e.message}"
-        Rails.logger.error e.backtrace.join("\n")
-      end
+      VANotify::EmailJob.perform_async(
+        data[:email],
+        (data[:template_id] ? EMAIL_TEMPLATE_MAP[data[:template_id]] : EMAIL_TEMPLATE_MAP[data[:form_number]]),
+        # Create a subset of `data` - Using .index_with rather than .slice so that keys
+        # default to `nil` if not present in `data`. This helps us w/ testing.
+        %i[first_name last_name file_count pega_status date_submitted form_uuid]
+          .index_with { |k| data[k] },
+        Settings.vanotify.services.ivc_champva.api_key,
+        # If no callback_klass is provided, should fail safely per va_notify implementation.
+        # See: https://github.com/department-of-veterans-affairs/vets-api/tree/master/modules/va_notify#how-teams-can-integrate-with-callbacks
+        { callback_klass: data[:callback_klass], callback_metadata: data[:callback_metadata] }
+      )
+      true
+    rescue => e
+      Rails.logger.error "Pega Status Update Email Error: #{e.message}"
+      Rails.logger.error e.backtrace.join("\n")
     end
 
     private

modules/ivc_champva/app/services/ivc_champva/s3.rb

@@ -12,38 +12,34 @@ def initialize(region:, bucket:)
     end
 
     def put_object(key, file, metadata = {})
-      Datadog::Tracing.trace('S3 Put File(s)') do
-        metadata&.transform_values! { |value| value || '' }
+      metadata&.transform_values! { |value| value || '' }
 
-        begin
-          response = client.put_object(
-            bucket:,
-            key:,
-            body: File.read(file),
-            metadata: metadata
-          )
-          result = { success: true }
-        rescue => e
-          result = { success: false, error_message: "S3 PutObject failure for #{file}: #{e.message}" }
-        end
+      begin
+        response = client.put_object(
+          bucket:,
+          key:,
+          body: File.read(file),
+          metadata: metadata
+        )
+        result = { success: true }
+      rescue => e
+        result = { success: false, error_message: "S3 PutObject failure for #{file}: #{e.message}" }
+      end
 
-        if Flipper.enabled?(:champva_log_all_s3_uploads, @current_user)
-          response ? handle_put_object_response(response, key, file) : handle_put_object_error(e)
-        else
-          result
-        end
+      if Flipper.enabled?(:champva_log_all_s3_uploads, @current_user)
+        response ? handle_put_object_response(response, key, file) : handle_put_object_error(e)
+      else
+        result
       end
     end
 
     def upload_file(key, file)
-      Datadog::Tracing.trace('S3 Upload File(s)') do
-        obj = resource.bucket(bucket).object(key)
-        obj.upload_file(file)
+      obj = resource.bucket(bucket).object(key)
+      obj.upload_file(file)
 
-        { success: true }
-      rescue => e
-        { success: false, error_message: "S3 UploadFile failure for #{file}: #{e.message}" }
-      end
+      { success: true }
+    rescue => e
+      { success: false, error_message: "S3 UploadFile failure for #{file}: #{e.message}" }
     end
 
     def monitor

modules/ivc_champva/spec/services/email_spec.rb

@@ -25,11 +25,6 @@
         allow(Rails).to receive(:env).and_return('staging')
       end
 
-      it 'traces the sending email process' do
-        expect(Datadog::Tracing).to receive(:trace).with('Send PEGA Status Update Email').and_yield
-        subject.send_email
-      end
-
       it 'enqueues VANotify::EmailJob with correct parameters' do
         expect(VANotify::EmailJob).to receive(:perform_async).with(
           data[:email],
@@ -60,7 +55,6 @@
       end
 
       it 'handles the error and logs it' do
-        allow(Datadog::Tracing).to receive(:trace).and_yield
         allow(Rails.logger).to receive(:error)
 
         expect { subject.send_email }.not_to raise_error