fastly_nsq 1.15.0 → 1.17.1

data/lib/fastly_nsq/http/nsqd.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'fastly_nsq/http'
+require "fastly_nsq/http"
 
 class FastlyNsq::Http
   ##
@@ -13,11 +13,11 @@ class FastlyNsq::Http
     def_delegator :client, :get
     def_delegator :client, :post
 
-    BASE_NSQD_URL = ENV.fetch('NSQD_URL') do
-      if ENV['NSQD_HTTPS_ADDRESS']
-        "https://#{ENV.fetch('NSQD_HTTPS_ADDRESS')}"
+    BASE_NSQD_URL = ENV.fetch("NSQD_URL") do
+      if ENV["NSQD_HTTPS_ADDRESS"]
+        "https://#{ENV.fetch("NSQD_HTTPS_ADDRESS")}"
       else
-        "http://#{ENV.fetch('NSQD_HTTP_ADDRESS')}"
+        "http://#{ENV.fetch("NSQD_HTTP_ADDRESS")}"
       end
     end
     VALID_FORMATS = %w[text json].freeze
@@ -27,13 +27,13 @@ class FastlyNsq::Http
     #
     # NOTE: The only "unhealthy" state is if nsqd failed to write messages to disk when overflow occurred.
     def self.ping(**args)
-      new(request_uri: '/ping', **args).get
+      new(request_uri: "/ping", **args).get
     end
 
     ##
     # NSQ version information
     def self.info(**args)
-      new(request_uri: '/info', **args).get
+      new(request_uri: "/info", **args).get
     end
 
     ##
@@ -47,12 +47,12 @@ class FastlyNsq::Http
     #
     # @example Fetch Statistics for topic: 'foo', channel: 'bar' as text
     #   Nsqd.stats(topic: 'foo', channel: 'bar', format: 'text')
-    def self.stats(topic: nil, channel: nil, format: 'json', **args)
+    def self.stats(topic: nil, channel: nil, format: "json", **args)
       raise InvalidFormatError unless VALID_FORMATS.include?(format)
-      params = { format: format }
+      params = {format: format}
       params[:topic] = topic if topic
       params[:channel] = channel if channel
-      new(request_uri: '/stats', **args).get(params)
+      new(request_uri: "/stats", **args).get(params)
     end
 
     ##
@@ -62,9 +62,9 @@ class FastlyNsq::Http
     # @param defer [String] the time in ms to delay message delivery
     # @param message the message body
     def self.pub(topic:, message:, defer: nil, **args)
-      params = { topic: topic }
+      params = {topic: topic}
       params[:defer] = defer if defer
-      new(request_uri: '/pub', **args).post(params, message)
+      new(request_uri: "/pub", **args).post(params, message)
     end
 
     ##
@@ -83,17 +83,17 @@ class FastlyNsq::Http
     # @param topic [String] the topic to publish to
     # @param binary [Boolean] enables binary mode
     # @param message the messages to send with \n used to seperate messages
-    def self.mpub(topic:, binary: false, message:, **args)
-      binary_param = binary ? 'true' : 'false'
-      raise NotImplementedError, 'binary mode has yet to be implemented' if binary
-      params = { topic: topic, binary: binary_param }
-      new(request_uri: '/mpub', **args).post(params, message)
+    def self.mpub(topic:, message:, binary: false, **args)
+      binary_param = binary ? "true" : "false"
+      raise NotImplementedError, "binary mode has yet to be implemented" if binary
+      params = {topic: topic, binary: binary_param}
+      new(request_uri: "/mpub", **args).post(params, message)
     end
 
     ##
     # List of nsqlookupd TCP addresses
     def self.config_nsqlookupd_tcp_addresses(**args)
-      new(request_uri: '/config/nsqlookupd_tcp_addresses', **args).get
+      new(request_uri: "/config/nsqlookupd_tcp_addresses", **args).get
     end
 
     ##
@@ -101,7 +101,7 @@ class FastlyNsq::Http
     #
     # @param topic [String] the topic to create
     def self.topic_create(topic:, **args)
-      new(request_uri: '/topic/create', **args).post(topic: topic)
+      new(request_uri: "/topic/create", **args).post(topic: topic)
     end
 
     ##
@@ -109,7 +109,7 @@ class FastlyNsq::Http
     #
     # @param topic [String] the existing topic to delete
     def self.topic_delete(topic:, **args)
-      new(request_uri: '/topic/delete', **args).post(topic: topic)
+      new(request_uri: "/topic/delete", **args).post(topic: topic)
     end
 
     ##
@@ -117,7 +117,7 @@ class FastlyNsq::Http
     #
     # @param topic [String] the existing topic to empty
     def self.topic_empty(topic:, **args)
-      new(request_uri: '/topic/empty', **args).post(topic: topic)
+      new(request_uri: "/topic/empty", **args).post(topic: topic)
     end
 
     ##
@@ -126,7 +126,7 @@ class FastlyNsq::Http
     #
     # @param topic [String] the existing topic to pause
     def self.topic_pause(topic:, **args)
-      new(request_uri: '/topic/pause', **args).post(topic: topic)
+      new(request_uri: "/topic/pause", **args).post(topic: topic)
     end
 
     ##
@@ -134,7 +134,7 @@ class FastlyNsq::Http
     #
     # @param topic [String] the existing, paused topic to unpause
     def self.topic_unpause(topic:, **args)
-      new(request_uri: '/topic/unpause', **args).post(topic: topic)
+      new(request_uri: "/topic/unpause", **args).post(topic: topic)
     end
 
     ##
@@ -143,7 +143,7 @@ class FastlyNsq::Http
     # @param topic [String] the existing topic
     # @param channel [String] the channel to create
     def self.channel_create(topic:, channel:, **args)
-      new(request_uri: '/channel/create', **args).post(topic: topic, channel: channel)
+      new(request_uri: "/channel/create", **args).post(topic: topic, channel: channel)
     end
 
     ##
@@ -152,7 +152,7 @@ class FastlyNsq::Http
     # @param topic [String] the existing topic
     # @param channel [String] the channel to delete
     def self.channel_delete(topic:, channel:, **args)
-      new(request_uri: '/channel/delete', **args).post(topic: topic, channel: channel)
+      new(request_uri: "/channel/delete", **args).post(topic: topic, channel: channel)
     end
 
     ##
@@ -161,7 +161,7 @@ class FastlyNsq::Http
     # @param topic [String] the existing topic
     # @param channel [String] the channel to empty
     def self.channel_empty(topic:, channel:, **args)
-      new(request_uri: '/channel/empty', **args).post(topic: topic, channel: channel)
+      new(request_uri: "/channel/empty", **args).post(topic: topic, channel: channel)
     end
 
     ##
@@ -171,7 +171,7 @@ class FastlyNsq::Http
     # @param topic [String] the existing topic
     # @param channel [String] the channel to pause
     def self.channel_pause(topic:, channel:, **args)
-      new(request_uri: '/channel/pause', **args).post(topic: topic, channel: channel)
+      new(request_uri: "/channel/pause", **args).post(topic: topic, channel: channel)
     end
 
     ##
@@ -180,7 +180,7 @@ class FastlyNsq::Http
     # @param topic [String] the existing topic
     # @param channel [String] the existing, paused, channel to unpause
     def self.channel_unpause(topic:, channel:, **args)
-      new(request_uri: '/channel/unpause', **args).post(topic: topic, channel: channel)
+      new(request_uri: "/channel/unpause", **args).post(topic: topic, channel: channel)
     end
 
     ##

data/lib/fastly_nsq/http/nsqlookupd.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'fastly_nsq/http'
+require "fastly_nsq/http"
 
 class FastlyNsq::Http
   ##
@@ -12,20 +12,20 @@ class FastlyNsq::Http
     extend Forwardable
     def_delegator :client, :get
 
-    BASE_NSQLOOKUPD_URL = "http://#{ENV.fetch('NSQLOOKUPD_HTTP_ADDRESS', '').split(',')[0]}"
+    BASE_NSQLOOKUPD_URL = "http://#{ENV.fetch("NSQLOOKUPD_HTTP_ADDRESS", "").split(",")[0]}"
 
     ##
     # List of producers for a given topic
     #
     # @param topic [String] the topic for which to list producers
     def self.lookup(topic:, **args)
-      new(request_uri: '/lookup', **args).get(topic: topic)
+      new(request_uri: "/lookup", **args).get(topic: topic)
     end
 
     ##
     # List of all known topics
     def self.topics(**args)
-      new(request_uri: '/topics', **args).get
+      new(request_uri: "/topics", **args).get
     end
 
     ##
@@ -33,13 +33,13 @@ class FastlyNsq::Http
     #
     # @param topic [String] the topic for which to list channels
     def self.channels(topic:, **args)
-      new(request_uri: '/channels', **args).get(topic: topic)
+      new(request_uri: "/channels", **args).get(topic: topic)
     end
 
     ##
     # List all known nsqd nodes
     def self.nodes(**args)
-      new(request_uri: '/nodes', **args).get
+      new(request_uri: "/nodes", **args).get
     end
 
     ##
@@ -47,7 +47,7 @@ class FastlyNsq::Http
     #
     # @param topic [String] the exsiting topic to delete
     def self.delete_topic(topic:, **args)
-      new(request_uri: '/delete_topic', **args).get(topic: topic)
+      new(request_uri: "/delete_topic", **args).get(topic: topic)
     end
 
     ##
@@ -56,7 +56,7 @@ class FastlyNsq::Http
     # @param topic [String] an exsiting topic
     # @param channel [String] the exsiting channel to delete
     def self.delete_channel(topic:, channel:, **args)
-      new(request_uri: '/delete_channel', **args).get(topic: topic, channel: channel)
+      new(request_uri: "/delete_channel", **args).get(topic: topic, channel: channel)
     end
 
     ##
@@ -67,19 +67,19 @@ class FastlyNsq::Http
     # @param topic [String] the existing topic
     # @param node [String] the producer (nsqd) to tombstone (identified by <broadcast_address>:<http_port>)
     def self.tombstone_topic_producer(topic:, node:, **args)
-      new(request_uri: '/tombstone_topic_producer', **args).get(topic: topic, node: node)
+      new(request_uri: "/tombstone_topic_producer", **args).get(topic: topic, node: node)
     end
 
     ##
     # Monitoring endpoint, should return +OK+
     def self.ping(**args)
-      new(request_uri: '/ping', **args).get
+      new(request_uri: "/ping", **args).get
     end
 
     ##
     # Returns nsqlookupd version information
     def self.info(**args)
-      new(request_uri: '/info', **args).get
+      new(request_uri: "/info", **args).get
     end
 
     ##

data/lib/fastly_nsq/http.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'net/https'
-require 'fastly_nsq/http/nsqd'
-require 'fastly_nsq/http/nsqlookupd'
+require "net/https"
+require "fastly_nsq/http/nsqd"
+require "fastly_nsq/http/nsqlookupd"
 
 ##
 # Adapter class for HTTP requests to NSQD
@@ -15,7 +15,7 @@ require 'fastly_nsq/http/nsqlookupd'
 # @see FastlyNsq::Http::Nsqd
 # @see FastlyNsq::Http::Nsqlookupd
 class FastlyNsq::Http
-  def initialize(uri:, cert_filename: ENV['NSQ_SSL_CERTIFICATE'], key_filename: ENV['NSQ_SSL_KEY'])
+  def initialize(uri:, cert_filename: ENV["NSQ_SSL_CERTIFICATE"], key_filename: ENV["NSQ_SSL_KEY"])
     @uri = uri.is_a?(URI) ? uri : URI.parse(uri)
     @cert_filename = cert_filename
     @key_filename = key_filename

data/lib/fastly_nsq/launcher.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'fastly_nsq/safe_thread'
+require "fastly_nsq/safe_thread"
 
 ##
 # FastlyNsq::Launcher is a lighweight wrapper of a thread manager
@@ -17,18 +17,18 @@ class FastlyNsq::Launcher
     FastlyNsq.manager
   end
 
-  def initialize(timeout: 5, pulse: 5, logger: FastlyNsq.logger, **options)
-    @done    = false
-    @timeout = timeout
-    @pulse   = pulse
-    @logger  = logger
+  def initialize(**options)
+    @done = false
+    @timeout = options[:timeout] || 5
+    @pulse = options[:pulse] || 5
+    @logger = options[:logger] || FastlyNsq.logger
 
-    FastlyNsq.manager = FastlyNsq::Manager.new(options)
+    FastlyNsq.manager = FastlyNsq::Manager.new(**options)
     FastlyNsq.fire_event :startup
   end
 
   def beat
-    @heartbeat ||= safe_thread('heartbeat', &method(:start_heartbeat))
+    @heartbeat ||= safe_thread("heartbeat", &method(:start_heartbeat))
   end
 
   def stop
@@ -51,13 +51,13 @@ class FastlyNsq::Launcher
   def heartbeat
     logger.debug do
       [
-        'HEARTBEAT:',
-        'busy:', manager.pool.length,
-        'processed:', manager.pool.completed_task_count,
-        'max_threads:', manager.pool.max_length,
-        'max_queue_size:', manager.pool.largest_length,
-        'listeners:', manager.listeners.count
-      ].join(' ')
+        "HEARTBEAT:",
+        "busy:", manager.pool.length,
+        "processed:", manager.pool.completed_task_count,
+        "max_threads:", manager.pool.max_length,
+        "max_queue_size:", manager.pool.largest_length,
+        "listeners:", manager.listeners.count
+      ].join(" ")
     end
 
     # TODO: Check the health of the system overall and kill it if needed
@@ -73,6 +73,6 @@ class FastlyNsq::Launcher
       heartbeat
       sleep pulse
     end
-    logger.info('Heartbeat stopping...')
+    logger.info("Heartbeat stopping...")
   end
 end

data/lib/fastly_nsq/listener.rb

@@ -77,25 +77,25 @@ class FastlyNsq::Listener
   #     max_attempts: 15,
   #   )
   def initialize(topic:, processor:, preprocessor: FastlyNsq.preprocessor, channel: FastlyNsq.channel, consumer: nil,
-                 logger: FastlyNsq.logger, priority: DEFAULT_PRIORITY, connect_timeout: DEFAULT_CONNECTION_TIMEOUT,
-                 max_attempts: FastlyNsq.max_attempts, **consumer_options)
+    logger: FastlyNsq.logger, priority: DEFAULT_PRIORITY, connect_timeout: DEFAULT_CONNECTION_TIMEOUT,
+    max_attempts: FastlyNsq.max_attempts, **consumer_options)
 
     raise ArgumentError, "processor #{processor.inspect} does not respond to #call" unless processor.respond_to?(:call)
     raise ArgumentError, "priority #{priority.inspect} must be a Integer" unless priority.is_a?(Integer)
 
-    @channel      = channel
-    @logger       = logger
+    @channel = channel
+    @logger = logger
     @max_attempts = max_attempts
     @preprocessor = preprocessor
-    @priority     = priority
-    @processor    = processor
-    @topic        = topic
+    @priority = priority
+    @processor = processor
+    @topic = topic
 
     @consumer = consumer || FastlyNsq::Consumer.new(topic: topic,
-                                                    connect_timeout: connect_timeout,
-                                                    channel: channel,
-                                                    queue: FastlyNsq::Feeder.new(self, priority),
-                                                    max_attempts: max_attempts,
+      connect_timeout: connect_timeout,
+      channel: channel,
+      queue: FastlyNsq::Feeder.new(self, priority),
+      max_attempts: max_attempts,
                                                     **consumer_options)
 
     FastlyNsq.manager.add_listener(self)
@@ -114,11 +114,12 @@ class FastlyNsq::Listener
     message = FastlyNsq::Message.new(nsq_message)
 
     msg_info = {
-      channel:  channel,
-      topic:    topic,
-      attempts: nsq_message.attempts,
-      id:       Digest::MD5.hexdigest(nsq_message.body.to_s),
-      metadata: message.meta,
+      channel: channel,
+      topic: topic,
+      attempts: message.attempts,
+      id: Digest::MD5.hexdigest(nsq_message.body.to_s),
+      nsq_id: message.id,
+      metadata: message.meta
     }
 
     logger.info do

data/lib/fastly_nsq/manager.rb

@@ -17,14 +17,15 @@ class FastlyNsq::Manager
   ##
   # Create a FastlyNsq::Manager
   #
-  # @param logger [Logger]
-  # @param max_threads [Integer] Maxiumum number of threads to be used by {FastlyNsq::PriorityThreadPool}
-  # @param pool_options [Hash] Options forwarded to {FastlyNsq::PriorityThreadPool} constructor.
-  def initialize(logger: FastlyNsq.logger, max_threads: FastlyNsq.max_processing_pool_threads, **pool_options)
-    @done      = false
-    @logger    = logger
-    @pool      = FastlyNsq::PriorityThreadPool.new(
-      { fallback_policy: :caller_runs, max_threads: max_threads }.merge(pool_options),
+  # @param opts [Hash] Set of options passed to FastlyNsqw::PriorityThreadPool. valid options include:
+  # * max_threads [Integer] Maxiumum number of threads to be used by {FastlyNsq::PriorityThreadPool}
+  # * logger [Logger]
+  def initialize(**opts) # logger: FastlyNsq.logger, max_threads: FastlyNsq.max_processing_pool_threads)
+    @done = false
+    @logger = opts[:logger] || FastlyNsq.logger
+    max_threads = opts[:max_threads] || FastlyNsq.max_processing_pool_threads
+    @pool = FastlyNsq::PriorityThreadPool.new(
+      {fallback_policy: :caller_runs, max_threads: max_threads}.merge(opts)
     )
   end
 
@@ -99,7 +100,7 @@ class FastlyNsq::Manager
   ##
   # Terminate all listeners
   def stop_listeners
-    logger.info { 'Stopping listeners' }
+    logger.info { "Stopping listeners" }
     listeners.each(&:terminate)
     topic_listeners.clear
   end
@@ -110,13 +111,13 @@ class FastlyNsq::Manager
   # Shutdown the pool
   # @param deadline [Integer] Number of seconds to wait for pool to stop processing
   def stop_processing(deadline)
-    logger.info { 'Stopping processors' }
+    logger.info { "Stopping processors" }
     pool.shutdown
 
-    logger.info { 'Waiting for processors to finish...' }
+    logger.info { "Waiting for processors to finish..." }
     return if pool.wait_for_termination(deadline)
 
-    logger.info { 'Killing processors...' }
+    logger.info { "Killing processors..." }
     pool.kill
   end
 end

data/lib/fastly_nsq/message.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'json'
+require "json"
 
 ##
 # Adapter to Nsq::Message. Provides convenience methods for interacting
@@ -20,7 +20,11 @@ class FastlyNsq::Message
   #   Delegated to +self.nsq_message+
   #   @return [Nsq::Message#timestamp]
   #   @see https://www.rubydoc.info/gems/nsq-ruby/Nsq/Message#timestamp-instance_method
-  def_delegators :@nsq_message, :attempts, :touch, :timestamp
+  # @!method id
+  #   Delegated to +self.nsq_message+
+  #   @return [Nsq::Message#id]
+  #   @see https://www.rubydoc.info/gems/nsq-ruby/Nsq/Message#id-instance_method
+  def_delegators :@nsq_message, :attempts, :touch, :timestamp, :id
 
   # @return [Symbol] Message state. Returns +nil+ if message has not been requeued or finished.
   attr_reader :managed
@@ -32,7 +36,7 @@ class FastlyNsq::Message
   # @return [String] Nsq::Message body
   attr_reader :raw_body
 
-  alias to_s raw_body
+  alias_method :to_s, :raw_body
 
   ##
   # @param nsq_message [Nsq::Message]
@@ -42,11 +46,11 @@ class FastlyNsq::Message
   end
 
   def data
-    @data ||= body['data']
+    @data ||= body["data"]
   end
 
   def meta
-    @meta ||= body['meta']
+    @meta ||= body["meta"]
   end
 
   def body

data/lib/fastly_nsq/messenger.rb

@@ -10,7 +10,7 @@
 #     meta: metadata_hash,
 #   )
 module FastlyNsq::Messenger
-  DEFAULT_ORIGIN = 'Unknown'
+  DEFAULT_ORIGIN = "Unknown"
   @originating_service = DEFAULT_ORIGIN
 
   module_function
@@ -18,23 +18,26 @@ module FastlyNsq::Messenger
   ##
   # Deliver an NSQ message. Uses +pub+
   #
-  # Will add two keys to the `+meta+ payload that cannot be overidden:
-  #   +originating_service+ which defaults to {FastlyNsq#originating_service} and
-  #   +sent_at+ which will be set to +Time.now.iso8601(5)+ when the payload is created.
+  # Adds keys to the `+meta+:
+  #   +originating_service+ which defaults to {FastlyNsq#originating_service}.
+  #   +sent_at+ which will be set to +Time.now.iso8601(5)+ if the +sent_at+ param is nil OR
+  #   if the passed +sent_at+ is not a valid timestamp.
   # @param message [#to_json(*)] written to the +data+ key of the NSQ message payload
   # @param topic [String] NSQ topic on which to deliver the message
   # @param originating_service [String] added to meta key of message payload
+  # @param sent_at [Time] Timestamp that will be added to the meta payload
   # @param meta [Hash]
   # @return [Void]
   # @example
   #   FastlyNsq::Messenger.deliver(
   #     message: {a: 1, count: 123},
   #     topic: 'count',
+  #     meta: { sent_at: Time.now }
   #   )
-  def deliver(message:, topic:, originating_service: nil, meta: {})
+  def deliver(message:, topic:, originating_service: nil, sent_at: nil, meta: {})
     payload = {
       data: message,
-      meta: populate_meta(originating_service: originating_service, meta: meta),
+      meta: populate_meta(originating_service: originating_service, sent_at: sent_at, meta: meta)
     }
 
     deliver_payload(topic: topic, payload: payload.to_json)
@@ -43,15 +46,16 @@ module FastlyNsq::Messenger
   ##
   # Deliver many NSQ messages at once. Uses +mpub+
   #
-  # For each message will add two keys to the `+meta+ payload of each message
-  # that cannot be overidden:
-  #   +originating_service+ which defaults to {FastlyNsq#originating_service} and
-  #   +sent_at+ which will be set to +Time.now.iso8601(5)+ when messages are processed.
+  # For each message will add two keys to the `+meta+ payload of each message:
+  #   +originating_service+ which defaults to {FastlyNsq#originating_service}
+  #   +sent_at+ which will be set to +Time.now.iso8601(5)+ when messages are processed if not included
+  #   in the +meta+ param OR if the pased +sent_at+ is not a valid timestamp.
   #   The +sent_at+ time and +originating_service+ will be the same for every message.
   # @param messages [Array] Array of message which will be written to +data+ key of the
   #   individual NSQ message payload. Each message needs to respond to +to_json(*)+.
   # @param topic [String] NSQ topic on which to deliver the message
   # @param originating_service [String] added to meta key of message payload
+  # @param sent_at [Time] Timestamp that will be added to the meta payload
   # @param meta [Hash]
   # @return [Void]
   # @example
@@ -59,13 +63,13 @@ module FastlyNsq::Messenger
   #     messages: [{a: 1, count: 11}, {a: 2, count: 22}],
   #     topic: 'counts',
   #   )
-  def deliver_multi(messages:, topic:, originating_service: nil, meta: {})
-    meta = populate_meta(originating_service: originating_service, meta: meta)
+  def deliver_multi(messages:, topic:, originating_service: nil, sent_at: nil, meta: {})
+    meta = populate_meta(originating_service: originating_service, sent_at: sent_at, meta: meta)
 
     payload = messages.each_with_object([]) do |message, a|
       msg = {
         data: message,
-        meta: meta,
+        meta: meta
       }
 
       a << msg.to_json
@@ -121,9 +125,15 @@ module FastlyNsq::Messenger
     producer_for(topic: topic) { |producer| producer.write payload }
   end
 
-  def populate_meta(originating_service: nil, meta: {})
+  def populate_meta(originating_service: nil, sent_at: nil, meta: {})
     meta[:originating_service] = originating_service || self.originating_service
-    meta[:sent_at] = Time.now.iso8601(5)
+
+    meta[:sent_at] = if sent_at && sent_at.respond_to?(:iso8601)
+      sent_at.iso8601(5)
+    else
+      Time.now.iso8601(5)
+    end
+
     meta
   end
 end

data/lib/fastly_nsq/new_relic.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 begin
-  require 'newrelic_rpm'
-rescue LoadError # rubocop:disable Lint/HandleExceptions
+  require "newrelic_rpm"
+rescue LoadError
 end
 
 ##
@@ -11,7 +11,7 @@ end
 class FastlyNsq::NewRelic
   include NewRelic::Agent::Instrumentation::ControllerInstrumentation if defined?(::NewRelic)
 
-  CATEGORY = 'OtherTransaction/FastlyNsqProcessor'
+  CATEGORY = "OtherTransaction/FastlyNsqProcessor"
 
   attr_reader :agent
 
@@ -22,14 +22,14 @@ class FastlyNsq::NewRelic
   #   tracer = FastlyNsq::NewRelic.new
   #   tracer.notice_error(exception)
   def initialize(agent = nil)
-    @agent = agent || (Object.const_defined?('NewRelic') ? NewRelic::Agent : nil)
+    @agent = agent || (Object.const_defined?(:NewRelic) ? NewRelic::Agent : nil)
   end
 
   ##
   # Returns true if NewRelic is loaded and available.
   # @return [Boolean]
   def enabled?
-    @enabled ||= Object.const_defined?('NewRelic')
+    @enabled ||= Object.const_defined?(:NewRelic)
   end
 
   ##
@@ -49,7 +49,7 @@ class FastlyNsq::NewRelic
   # @see {https://www.rubydoc.info/github/newrelic/rpm/NewRelic%2FAgent%2FInstrumentation%2FControllerInstrumentation:perform_action_with_newrelic_trace}
   def trace_with_newrelic(**args)
     if enabled?
-      perform_action_with_newrelic_trace(trace_args(args)) do
+      perform_action_with_newrelic_trace(trace_args(**args)) do
         yield
       end
     else
@@ -61,8 +61,8 @@ class FastlyNsq::NewRelic
 
   def trace_args(**args)
     {
-      name: 'call',
-      category: CATEGORY,
+      name: "call",
+      category: CATEGORY
     }.merge(args)
   end
 end

data/lib/fastly_nsq/priority_queue.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class FastlyNsq::PriorityQueue < FastContainers::PriorityQueue
-  alias << push
-  alias length size
+  alias_method :<<, :push
+  alias_method :length, :size
 
   def shift
     pop