surfliner-metadata_consumer 0.1.0.pre.alpha.1 → 0.1.0.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60c60314d3c25079cbd39bca122dde8f505cf1060785420928b9e1cb2d105194
-  data.tar.gz: 9b772b1024ca85075794c744d56bc977cf912d72262406c1fb03f906045c22c4
+  metadata.gz: 22ceb6aaafb75d24e2cf646c3ac55eaca9c0fc92183a448f3ad3a09e9920eaea
+  data.tar.gz: 52c43074990eade7d93c32fa471329e845d2776f9229246f57bec81e75fa558d
 SHA512:
-  metadata.gz: 4c97ddf2912e8eebe8ce02f3769b4de525154953d7c24297d384ed6313963e0ed85fc4462143359320799ad18da38c43ebcaa88100988e5bd21187d19fcb9e50
-  data.tar.gz: c300e50c84ba5ecd631ec9307214ba879b08e2444ca633b11122c85e62e9a02d4d4397867fadbd79a42698d7feef09f36f26c57a947a0b03b335b47cbde21c28
+  metadata.gz: f19622750625a84977122fa344b8635bac1d6f80de562237505be22f82aa3acbc532d53f768f0f3b9b7dbda84724d1979b9396e785dca25d30216b71b8746c65
+  data.tar.gz: 47621bc83433c05a36cd0d15a3b3a526eb981b0bd1085014c5179ea7c1dce0ad0a12722895873d629bfc1a510cb3648d1a5b2695d1b797d9960befcbb90e517e

data/Gemfile

@@ -2,5 +2,4 @@
 
 source "https://rubygems.org"
 
-# Specify your gem's dependencies in surfliner_schema.gemspec
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    surfliner-metadata_consumer (0.1.0.pre.alpha.1)
+    surfliner-metadata_consumer (0.1.0.pre.alpha.2)
       bunny (~> 2.23)
       opentelemetry-exporter-otlp (~> 0.26.3)
       opentelemetry-instrumentation-all (~> 0.60.0)
@@ -13,7 +13,7 @@ GEM
   specs:
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    amq-protocol (2.3.2)
+    amq-protocol (2.3.3)
     ast (2.4.2)
     bigdecimal (3.1.9)
     builder (3.3.0)
@@ -34,7 +34,7 @@ GEM
     debug (1.9.2)
       irb (~> 1.10)
       reline (>= 0.3.8)
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.0)
     docile (1.4.1)
     dotenv (2.8.1)
     faraday (2.12.2)
@@ -55,11 +55,11 @@ GEM
     json (2.10.1)
     language_server-protocol (3.17.0.4)
     lint_roller (1.1.0)
-    logger (1.6.5)
+    logger (1.6.6)
     net-http (0.6.0)
       uri
-    opentelemetry-api (1.4.0)
-    opentelemetry-common (0.21.0)
+    opentelemetry-api (1.5.0)
+    opentelemetry-common (0.22.0)
       opentelemetry-api (~> 1.0)
     opentelemetry-exporter-otlp (0.26.3)
       google-protobuf (~> 3.14)
@@ -245,14 +245,14 @@ GEM
       opentelemetry-helpers-sql-obfuscation
       opentelemetry-instrumentation-base (~> 0.22.1)
       opentelemetry-semantic_conventions (>= 1.8.0)
-    opentelemetry-registry (0.3.1)
+    opentelemetry-registry (0.4.0)
       opentelemetry-api (~> 1.1)
     opentelemetry-sdk (1.4.1)
       opentelemetry-api (~> 1.1)
       opentelemetry-common (~> 0.20)
       opentelemetry-registry (~> 0.2)
       opentelemetry-semantic_conventions
-    opentelemetry-semantic_conventions (1.10.1)
+    opentelemetry-semantic_conventions (1.11.0)
       opentelemetry-api (~> 1.0)
     parallel (1.26.3)
     parser (3.3.7.1)
@@ -274,7 +274,7 @@ GEM
     regexp_parser (2.10.0)
     reline (0.6.0)
       io-console (~> 0.5)
-    rexml (3.4.0)
+    rexml (3.4.1)
     rsolr (2.6.0)
       builder (>= 2.1.2)
       faraday (>= 0.9, < 3, != 2.0.0)
@@ -301,7 +301,7 @@ GEM
       rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.0)
+    rubocop-ast (1.38.1)
       parser (>= 3.3.1.0)
     rubocop-performance (1.23.1)
       rubocop (>= 1.48.1, < 2.0)
@@ -332,11 +332,11 @@ GEM
     standard-performance (1.6.0)
       lint_roller (~> 1.1)
       rubocop-performance (~> 1.23.0)
-    stringio (3.1.2)
+    stringio (3.1.5)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
-    uri (1.0.2)
+    uri (1.0.3)
     webmock (3.25.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)

data/README.md

@@ -61,11 +61,11 @@ a configured `SOLR_URL`, e.g.:
 SOLR_URL=http://admin:admin@solr:8983/solr/daylight-dev
 ```
 
-The `bin/simulate-publish-event` script expects an `API_BASE_URI`, used to generate resource URLs
+The `bin/simulate-publish-event` script expects an `METADATA_API_URL_BASE`, used to generate resource URLs
 for provided IDs:
 
 ```sh
-API_BASE_URI=http://superskunk:3000
+METADATA_API_URL_BASE=http://superskunk:3000/resources
 ```
 
 ## Solr / Daylight handler implementation

data/bin/daylight-index-listen

@@ -20,4 +20,6 @@ tracer = OpenTelemetry.tracer_provider.tracer("DaylightConsumerTracer")
 
 handler = Surfliner::MetadataConsumer::Solr::MessageHandler
 
-Surfliner::MetadataConsumer::Consumer.run(logger:, tracer:, handler:)
+opts = { queue: { durable: false } }
+
+Surfliner::MetadataConsumer::Consumer.run(logger:, tracer:, handler:, opts:)

data/bin/simulate-publish-event

@@ -6,18 +6,20 @@ require "logger"
 
 require "surfliner/metadata_consumer/mq_connection"
 
-api_base = ENV.fetch("API_BASE_URI") { "http://example.com/api" }
-logger = Logger.new($stdout)
+api_base     = ENV.fetch("METADATA_API_URL_BASE") { "http://metadata.test/resources" }
+logger       = Logger.new($stdout)
 logger.level = ENV.fetch("LOG_LEVEL") { Logger::INFO }
 
-connection = Surfliner::MetadataConsumer::MqConnection.new(logger: logger).connect
+opts = { queue: { durable: false } }
+
+connection = Surfliner::MetadataConsumer::MqConnection.new(logger:, opts:).connect
 
 begin
   ARGV.each do |id|
     payload =
-      {resourceUrl: "#{api_base}/resources/#{id}",
-       status: :published,
-       time_stamp: DateTime.now}.to_json
+      { resourceUrl: "#{api_base}/#{id}",
+        status:      :published,
+        time_stamp:  DateTime.now }.to_json
 
     logger.info "Publishing to #{connection.routing_key} with #{payload}"
     connection.exchange.publish(payload, routing_key: connection.routing_key)

data/lib/surfliner/metadata_consumer/consumer.rb

@@ -13,8 +13,9 @@ module Surfliner
       # @param tracer [OpenTelemetry::Trace::Tracer] OpenTelemetry tracer
       # @param logger [Logger] log message destination
       # @param handler #handle an object accepting a JSON string
-      def initialize(tracer:, logger:, handler:)
-        @connection = MqConnection.new(logger:)
+      # @param opts [Hash] (see MqConnection#new)
+      def initialize(tracer:, logger:, handler:, opts: nil)
+        @connection = MqConnection.new(logger:, opts:)
         @logger = logger
         @tracer = tracer
         @handler = handler
@@ -24,8 +25,9 @@ module Surfliner
       # @param tracer [OpenTelemetry::Trace::Tracer] OpenTelemetry tracer
       # @param logger [Logger] log message destination
       # @param handler #handle an object accepting a JSON string payload
-      def self.run(tracer:, logger:, handler:)
-        new(tracer:, logger:, handler:).run
+      # @param opts [Hash] (see MqConnection#new)
+      def self.run(tracer:, logger:, handler:, opts: nil)
+        new(tracer:, logger:, handler:, opts:).run
       end
 
       # Starts listening to the message queue and passing messages to the handler.

data/lib/surfliner/metadata_consumer/mq_connection.rb

@@ -4,6 +4,15 @@ module Surfliner
   module MetadataConsumer
     # An object encapsulating a RabbitMQ connection.
     class MqConnection
+      # Default RabbitMQ topic options
+      DEFAULT_TOPIC_OPTS = {auto_delete: true}.freeze
+
+      # Default RabbitMQ queue options
+      DEFAULT_QUEUE_OPTS = {durable: true}.freeze
+
+      # Default RabbitMQ topic and queue options
+      DEFAULT_OPTS = {topic: DEFAULT_TOPIC_OPTS, queue: DEFAULT_QUEUE_OPTS}.freeze
+
       # @return [Logger]  The logger
       attr_reader :logger
 
@@ -22,13 +31,18 @@ module Surfliner
       # @return [MqConfig]  The configuration
       attr_reader :config
 
+      # @return [Hash<Symbol, Hash>]  Options to pass when connecting to RabbitMQ topic and queue. Overrides DEFAULT_OPTS.
+      attr_reader :opts
+
       # Initializes a new `MqConnection`.
       #
       # @param logger [Logger] the logger
       # @param config [MqConfig] the configuration
-      def initialize(logger:, config: MqConfig.from_env)
+      # @param opts [Hash<Symbol, Hash>]  Options to pass when connecting to RabbitMQ topic and queue. Overrides DEFAULT_OPTS.
+      def initialize(logger:, config: MqConfig.from_env, opts: nil)
         @logger = logger
         @config = config
+        @opts = merge_opts(opts)
       end
 
       # Opens a connection.
@@ -41,8 +55,8 @@ module Surfliner
         @connection = Bunny.new(config.connection_url, logger: logger)
         connect_on(connection)
         @channel = connection.create_channel
-        @exchange = channel.topic(config.topic, auto_delete: true)
-        @queue = channel.queue(config.queue_name, durable: true)
+        @exchange = channel.topic(config.topic, topic_opts)
+        @queue = channel.queue(config.queue_name, queue_opts)
         queue.bind(exchange, routing_key: config.routing_key)
 
         self
@@ -68,8 +82,12 @@ module Surfliner
 
       # Closes the connection.
       def close
-        channel&.close
+        return unless channel
+        return if channel.closed?
+        logger.info("closing channel")
+        channel.close
       ensure
+        logger.info("closing connection")
         connection&.close
       end
 
@@ -93,8 +111,28 @@ module Surfliner
         config.port
       end
 
+      # @return [Hash]  Options passed when connecting to RabbitMQ topic
+      def topic_opts
+        opts[:topic]
+      end
+
+      # @return [Hash]  Options passed when connecting to RabbitMQ queue
+      def queue_opts
+        opts[:queue]
+      end
+
       private
 
+      def merge_opts(opts)
+        DEFAULT_OPTS.to_h do |opt_type, opts_default|
+          opts_actual = opts_default.dup
+          if opts && (opts_provided = opts[opt_type])
+            opts_actual.merge!(opts_provided)
+          end
+          [opt_type, opts_actual]
+        end
+      end
+
       def connect_on(connection, timeout = 120)
         timer = 0
         logger.info "Trying to open queue connection with timeout=#{timeout}"

data/lib/surfliner/metadata_consumer/version.rb

@@ -3,6 +3,6 @@ module Surfliner
   # Parent module for this gem
   module MetadataConsumer
     # The gem version
-    VERSION = "0.1.0.pre.alpha.1"
+    VERSION = "0.1.0.pre.alpha.2"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: surfliner-metadata_consumer
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.alpha.1
+  version: 0.1.0.pre.alpha.2
 platform: ruby
 authors:
 - Project Surfliner
 bindir: bin
 cert_chain: []
-date: 2025-02-12 00:00:00.000000000 Z
+date: 2025-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny