c8326684-2dab-4611-84c7-9966675ebe5a

Committed 21 Aug 2024 06:16PM UTC coverage: 91.971% (-0.07%) from 92.045%

Build # c8326684-2dab-4611-84c7-9966675ebe5a

Build Type

Pull #2461

circleci

Committed by

christinach

Commit Message

Add logging when event fails validation
Change ruby in the webhook/src to be 2.7

Co-authored-by: Max Kadel <maxkadel@users.noreply.github.com>

Pull Request Pull Request #2461: Rescue message body error on ruby3.2

Run Details

0 of 3 new or added lines in 1 file covered. (0.0%)

3425 of 3724 relevant lines covered (91.97%)

363.04 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

94.12

/app/services/aws_sqs_poller.rb

# This service is intended to be run by a daemon. It watches the AWS SQS poll
# for full dump events and kicks off a job to process them.
class AwsSqsPoller
  def self.poll
    queue_url = Rails.configuration.alma["sqs_queue_url"]
    poller = Aws::SQS::QueuePoller.new(queue_url)
    end_polling = false

    # End polling if the process is killed by restarting.
    Signal.trap("TERM") do
      end_polling = true
    end

    poller.before_request do |_stats|
      throw :stop_polling if end_polling
    end

    poller.poll do |msg|
      message_body = JSON.parse(msg[:body])
      job_name = message_body["job_instance"]["name"]
      next unless Rails.configuration.alma[:jobs].keys.include?(job_name)
      dump = AlmaDumpFactory.bib_dump(message_body)
      # running dump creation in the background prevents the queue
      # event from timing out and requeuing
      AlmaDumpTransferJob.perform_later(
        dump:,
        job_id: message_body["job_instance"]["id"]
      )
    end
  end
end

class AlmaDumpFactory
  attr_reader :message
  class AlmaDumpError < StandardError
    attr_reader :alma_message
    def initialize(alma_message)
      super
      @alma_message = alma_message
    end

    def message
      status = alma_message["job_instance"]["status"]["value"]
      "Alma job completed with invalid status. Alma status: #{status}. Job id: #{alma_message['id']}"
    end
  end

  def initialize(message)
    @message = message
  end

  def self.bib_dump(message)
    new(message).bib_dump
  end

  def bib_dump
    Dump.create(dump_type:,
                event: dump_event,
                generated_date: dump_event.start)
  end

  def dump_type
    @dump_type ||= Rails.configuration.alma[:jobs][job_name]["dump_type"]
  end

  def job_name
    message["job_instance"]["name"]
  end

  def alma_job_status
    status = message["job_instance"]["status"]["value"]
    raise AlmaDumpError, message unless status == 'COMPLETED_SUCCESS'
    status
  rescue => e
    Rails.logger.error(e.message)
    Honeybadger.notify(e)
    status
  end

  def dump_event
    @event ||= Event.create!(
      start: event_start,
      finish: event_finish,
      success: true,
      alma_job_status:,
      message_body: message.to_json
    )
  rescue ActiveRecord::RecordInvalid => e
    Rails.logger.error("#{e.message} message_body: #{message.to_json}")
    Honeybadger.notify("#{e.message} message_body: #{message.to_json}")
    raise e
  end

  def event_start
    message["job_instance"]["start_time"]
  end

  def event_finish
    message["job_instance"]["end_time"]
  end
end

1	# This service is intended to be run by a daemon. It watches the AWS SQS poll
2	# for full dump events and kicks off a job to process them.
3	class AwsSqsPoller	1✔
4	def self.poll	1✔
5	queue_url = Rails.configuration.alma["sqs_queue_url"]	8✔
6	poller = Aws::SQS::QueuePoller.new(queue_url)	8✔
7	end_polling = false	8✔
8
9	# End polling if the process is killed by restarting.
10	Signal.trap("TERM") do	8✔
11	end_polling = true	1✔
12	end
13
14	poller.before_request do \|_stats\|	8✔
15	throw :stop_polling if end_polling	5,084✔
16	end
17
18	poller.poll do \|msg\|	8✔
19	message_body = JSON.parse(msg[:body])	8✔
20	job_name = message_body["job_instance"]["name"]	8✔
21	next unless Rails.configuration.alma[:jobs].keys.include?(job_name)	8✔
22	dump = AlmaDumpFactory.bib_dump(message_body)	7✔
23	# running dump creation in the background prevents the queue
24	# event from timing out and requeuing
25	AlmaDumpTransferJob.perform_later(	7✔
26	dump:,
27	job_id: message_body["job_instance"]["id"]
28	)
29	end
30	end
31	end
32
33	class AlmaDumpFactory	1✔
34	attr_reader :message	1✔
35	class AlmaDumpError < StandardError	1✔
36	attr_reader :alma_message	1✔
37	def initialize(alma_message)	1✔
38	super	4✔
39	@alma_message = alma_message	4✔
40	end
41
42	def message	1✔
43	status = alma_message["job_instance"]["status"]["value"]	10✔
44	"Alma job completed with invalid status. Alma status: #{status}. Job id: #{alma_message['id']}"	10✔
45	end
46	end
47
48	def initialize(message)	1✔
49	@message = message	8✔
50	end
51
52	def self.bib_dump(message)	1✔
53	new(message).bib_dump	8✔
54	end
55
56	def bib_dump	1✔
57	Dump.create(dump_type:,	8✔
58	event: dump_event,
59	generated_date: dump_event.start)
60	end
61
62	def dump_type	1✔
63	@dump_type \|\|= Rails.configuration.alma[:jobs][job_name]["dump_type"]	8✔
64	end
65
66	def job_name	1✔
67	message["job_instance"]["name"]	8✔
68	end
69
70	def alma_job_status	1✔
71	status = message["job_instance"]["status"]["value"]	8✔
72	raise AlmaDumpError, message unless status == 'COMPLETED_SUCCESS'	8✔
73	status	4✔
74	rescue => e
75	Rails.logger.error(e.message)	4✔
76	Honeybadger.notify(e)	4✔
77	status	4✔
78	end
79
80	def dump_event	1✔
81	@event \|\|= Event.create!(	16✔
82	start: event_start,
83	finish: event_finish,
84	success: true,
85	alma_job_status:,
86	message_body: message.to_json
87	)
88	rescue ActiveRecord::RecordInvalid => e
NEW 89	Rails.logger.error("#{e.message} message_body: #{message.to_json}")	×
NEW 90	Honeybadger.notify("#{e.message} message_body: #{message.to_json}")	×
NEW 91	raise e	×
92	end
93
94	def event_start	1✔
95	message["job_instance"]["start_time"]	8✔
96	end
97
98	def event_finish	1✔
99	message["job_instance"]["end_time"]	8✔
100	end
101	end

pulibrary / bibdata / c8326684-2dab-4611-84c7-9966675ebe5a

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous