redis-stream 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 198b2311a7fcf1023c8c51bb8ea96a6b6626a516539ba459005038703fbc430a
-  data.tar.gz: 89c7601f9fcc02ebd0b195f8728231fba42a5a2f5f4ce60b749107f8a9c21c9e
+  metadata.gz: c68feb94f854987274b877134586cc49f146621d1bca1463dc7727c3d3330890
+  data.tar.gz: 3d0217743ed703c37bbe51c8fa69c89c0ee58749589d2edd3241c5950dae3447
 SHA512:
-  metadata.gz: 0bc5a91481625900e58ff00614776c2eef887cec65e6b0aad5e1b05d74442309f6d37a2e605a5b45542dbd1179870552b6ac4076dc675136b01f0b26c8c9b900
-  data.tar.gz: ab7ddb55e73a6f917ddd108499faff5c2ec69c96e7a861c63cafb32f9fc2040e66dd221babfd5d28098cba4c2abb2ef29752ab9e6eeb45d7f22bfc1acba9b79d
+  metadata.gz: 5b02a972747cf975360ceda206121f0dfd6e2dd12764eb1c7b90114785b932100b089629f19c7a09af5d49a0e648c775fd84400c2183cc0cdd5c0e2e2b2cf5de
+  data.tar.gz: 8816191f416792538278642d832d497e10cdcb3f4396ce9440825bad722a53a132111af3054f3d4289f5a0368726c7447d67e59c251f519de8a4ba7871cf34f1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    redis-stream (0.4.1)
+    redis-stream (0.4.2)
       moneta (~> 1.2)
       multi_json (~> 1.14)
       redis (= 4.1.3)

data/lib/redis/stream/client.rb

@@ -80,18 +80,19 @@ class Redis
       # no passthrough variable here. The passthrough is available in the start method
       def add(data = {}, options = {})
         raise "Client isn't running" unless @state.eql?(Redis::Stream::State::RUNNING)
-
-        default_options = {"to" => "*", "group" => "*", "type" => Redis::Stream::Type::ACTION, "cache_key" => nil, "tracer" => nil}
-        options = default_options.merge(options)
-
-        type = options["type"]
-        to = options["to"]
-        group = options["group"]
-        payload = build_payload(data, options)
-        add_id = @redis.xadd(@stream, payload)
-        #  @send_queue << add_id
-
-        @logger.info("#{@consumer_id} - send to '#{to}' in group '#{group}' with id '#{add_id}' of type '#{type}'")
+        add_id = nil
+        OpenTracing.start_active_span('add') do |scope|
+          default_options = {"to" => "*", "group" => "*", "type" => Redis::Stream::Type::ACTION, "cache_key" => nil, "tracer" => nil}
+          options = default_options.merge(options)
+
+          type = options["type"]
+          to = options["to"]
+          group = options["group"]
+          payload = build_payload(data, options)
+          add_id = @redis.xadd(@stream, payload)
+
+          @logger.info("#{@consumer_id} - send to '#{to}' in group '#{group}' with id '#{add_id}' of type '#{type}'")
+        end
         add_id
       end
 
@@ -202,9 +203,6 @@ class Redis
         end
       end
 
-      def trace_error(operation_name, span = nil)
-        trace(operation_name, span)
-      end
       private
 
       def build_payload(data, options)
@@ -304,61 +302,53 @@ class Redis
       # @param [Boolean] async          return the message if synchronous else call handle_incoming
       # @param [Boolean] passthrough    Receive all messages also the ones intended for other consumers
       def read_next_message_from_stream(async = true, passthrough = false)
-        if @state == Redis::Stream::State::RUNNING
-          result = @redis.xread(@stream, @lastid, block: 1000, count: 1) if @group.nil?
-          result = @redis.xreadgroup(@group, @consumer_id, @stream, '>', block: 1000, count: 1) if @group
-
-          unless result.empty?
-            id, data_out = result[@stream][0]
-            ack_count = @redis.xack(@stream, @group, id) if @group
-
-            tracer_data = JSON.parse(data_out["tracer"])
-            unless tracer_data.nil? || tracer_data.empty?
-              tracer_span = OpenTracing.extract(OpenTracing::FORMAT_TEXT_MAP, tracer_data)
-              data_out["tracer"] = OpenTracing.start_active_span(@consumer_id, child_of: tracer_span)
-            end
+          if @state == Redis::Stream::State::RUNNING
+            result = @redis.xread(@stream, @lastid, block: 1000, count: 1) if @group.nil?
+            result = @redis.xreadgroup(@group, @consumer_id, @stream, '>', block: 1000, count: 1) if @group
+
+            unless result.empty?
+              id, data_out = result[@stream][0]
+              ack_count = @redis.xack(@stream, @group, id) if @group
+
+              tracer_data = JSON.parse(data_out["tracer"])
+              unless tracer_data.nil? || tracer_data.empty?
+                #trace_scope.span.log_kv('has_tracer' => true)
+                tracer_span = OpenTracing.extract(OpenTracing::FORMAT_TEXT_MAP, tracer_data)
+                data_out["tracer"] = OpenTracing.start_span(@consumer_id, child_of: tracer_span)
+              end
 
-            begin
-              data_out["payload"] = JSON.parse(data_out["payload"])
-            rescue Exception => e
-              @logger.error("#{@consumer_id} error parsing payload: #{e.message}")
-            end
+              begin
+                data_out["payload"] = JSON.parse(data_out["payload"])
+              rescue Exception => e
+                @logger.error("#{@consumer_id} error parsing payload: #{e.message}")
+              end
 
-            # if @send_queue.include?(id)
-            #   @send_queue.delete(id)
-            #   @logger.warning("#{@consumer_id} - send queue is not empty: #{@send_queue.join(',')}") if @send_queue.length > 0
-            #   unless passthrough
-            #     #@logger.info("#{@consumer_id} - ignoring self")
-            #     return false
-            #   end
-            # end
-
-            if data_out["from"].eql?(@consumer_id)
-              return false
-            end
+              if data_out["from"].eql?(@consumer_id)
+                return false
+              end
 
-            unless (data_out["to"].nil? || data_out["to"].eql?('') || data_out["to"].eql?('*') || data_out["to"].eql?(@consumer_id)) &&
-                (data_out["to_group"].nil? || data_out["to_group"].eql?('') || data_out["to_group"].eql?('*') || data_out["to_group"].eql?(@group))
-              @logger.info("#{@consumer_id} - ignoring message from '#{data_out["from"]}' to '#{data_out["to"]}-#{data_out["to_group"]}'")
+              unless (data_out["to"].nil? || data_out["to"].eql?('') || data_out["to"].eql?('*') || data_out["to"].eql?(@consumer_id)) &&
+                  (data_out["to_group"].nil? || data_out["to_group"].eql?('') || data_out["to_group"].eql?('*') || data_out["to_group"].eql?(@group))
+                @logger.info("#{@consumer_id} - ignoring message from '#{data_out["from"]}' to '#{data_out["to"]}-#{data_out["to_group"]}'")
 
-              return false
-            end
+                return false
+              end
 
-            @logger.info("#{@consumer_id} - received from '#{data_out["from"]}' of type '#{data_out['type']}' to '#{data_out["to"]}' in group '#{data_out["to_group"]}' with message id '#{id}' - with ack #{ack_count}")
+              @logger.info("#{@consumer_id} - received from '#{data_out["from"]}' of type '#{data_out['type']}' to '#{data_out["to"]}' in group '#{data_out["to_group"]}' with message id '#{id}' - with ack #{ack_count}")
 
-            if data_out["type"].eql?(Redis::Stream::Type::PING)
-              add(data_out["payload"].to_s, "to" => data_out["from"], "group" => "*", "type" => Redis::Stream::Type::PONG)
-              return false
-            end
+              if data_out["type"].eql?(Redis::Stream::Type::PING)
+                add(data_out["payload"].to_s, "to" => data_out["from"], "group" => "*", "type" => Redis::Stream::Type::PONG)
+                return false
+              end
 
-            if data_out["type"].eql?(Redis::Stream::Type::PONG)
-              return false
-            end
+              if data_out["type"].eql?(Redis::Stream::Type::PONG)
+                return false
+              end
 
-            return data_out unless async
-            handle_incoming(data_out)
+              return data_out unless async
+              handle_incoming(data_out)
+            end
           end
-        end
       rescue Exception => e
         return false
       end

data/lib/redis/stream/version.rb

@@ -1,6 +1,6 @@
 #encoding: UTF-8
 class Redis
   module Stream
-    VERSION = "0.4.2"
+    VERSION = "0.4.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-stream
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Mehmet Celik