redis-stream 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddb0974393a49118bf47eb414666042ced6d2af3ada9599587cf8523380942c7
-  data.tar.gz: '054409416ce1c03c12b6dbbe6a1cdf26bc7e187437c27f868cb429ffe0de77be'
+  metadata.gz: 198b2311a7fcf1023c8c51bb8ea96a6b6626a516539ba459005038703fbc430a
+  data.tar.gz: 89c7601f9fcc02ebd0b195f8728231fba42a5a2f5f4ce60b749107f8a9c21c9e
 SHA512:
-  metadata.gz: 4a8d03a8827926994f5d62850355052088d25933ac99b9d0198d00f73f4b04a1a25795dbb7ea5f9ff96997ae6d99fdba9f90ef43c5c295c5a8faf4389f0c7dcd
-  data.tar.gz: dafeaa60370f1bd9b0616f154769d03caf5d6e3a6c450626d6e53926250ea7fe4f19574e2afa1707856d6ac63b4262efbb1786da9b4e4870b8b629780c06c145
+  metadata.gz: 0bc5a91481625900e58ff00614776c2eef887cec65e6b0aad5e1b05d74442309f6d37a2e605a5b45542dbd1179870552b6ac4076dc675136b01f0b26c8c9b900
+  data.tar.gz: ab7ddb55e73a6f917ddd108499faff5c2ec69c96e7a861c63cafb32f9fc2040e66dd221babfd5d28098cba4c2abb2ef29752ab9e6eeb45d7f22bfc1acba9b79d

data/.travis.yml

@@ -5,6 +5,5 @@ cache: bundler
 rvm:
   - 2.5
   - jruby
-services:
-  - redis
 before_install: gem install bundler -v 2.0.1
+before_script: sudo redis-server /etc/redis/redis.conf --port 7000

data/Gemfile.lock

@@ -1,31 +1,25 @@
 PATH
   remote: .
   specs:
-    redis-stream (0.4.0)
+    redis-stream (0.4.1)
       moneta (~> 1.2)
       multi_json (~> 1.14)
       redis (= 4.1.3)
-      zipkin-tracer (~> 0.43)
+      zipkin (~> 1.6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    concurrent-ruby (1.1.5)
-    faraday (0.17.3)
-      multipart-post (>= 1.2, < 3)
+    json (2.3.0)
     minitest (5.13.0)
     moneta (1.2.1)
     multi_json (1.14.1)
-    multipart-post (2.1.1)
-    rack (2.1.2)
+    opentracing (0.5.0)
     rake (10.5.0)
     redis (4.1.3)
-    sucker_punch (2.1.2)
-      concurrent-ruby (~> 1.0)
-    zipkin-tracer (0.43.0)
-      faraday (~> 0.13)
-      rack (>= 1.0)
-      sucker_punch (~> 2.0)
+    zipkin (1.6.1)
+      json
+      opentracing (~> 0.3)
 
 PLATFORMS
   java

data/config.yml

@@ -1,3 +1,4 @@
 data_cache: "/Users/mehmetc/Tmp/resolver/data_cache"
+zipkin: "http://127.0.0.1:9411"
 redis:
-  url: "redis://127.0.0.1:7000/0"
+  url: "redis://127.0.0.1:7000/0"

data/lib/redis/stream/client.rb

@@ -6,7 +6,7 @@ require "thread"
 require "redis/stream/inspect"
 require "redis/stream/config"
 require "redis/stream/data_cache"
-require "redis/stream/tracer/zipkin_tracer"
+require "zipkin/tracer"
 
 class Redis
   module Stream
@@ -29,7 +29,8 @@ class Redis
                            "db" => 0,
                            "config_file_path" => '.',
                            "logger" => Logger.new(STDOUT),
-                           "zipkin_config" => {}}
+                           "tracer" => nil
+        }
         options = default_options.merge(options)
 
         Redis::Stream::Config.path = options['config_file_path']
@@ -39,7 +40,6 @@ class Redis
         db = options["db"]
         @logger = options["logger"]
         @cache = options.include?('caching') && options['caching'] ? Redis::Stream::DataCache.new : nil
-        @tracer = ZipkinTracer::RedisStreamHandler.new(self, options["zipkin_config"])
         @name = name
         @state = Redis::Stream::State::IDLE
         @stream = stream_name
@@ -60,6 +60,12 @@ class Redis
 
         raise "No redis" if @redis.nil?
 
+        if options.has_key?('tracer') && !options['tracer'].nil?
+          OpenTracing.global_tracer = options["tracer"]
+        elsif Redis::Stream::Config.include?(:zipkin)
+          OpenTracing.global_tracer = Zipkin::Tracer.build(url: Redis::Stream::Config[:zipkin], service_name: "#{@name}-#{@group}", flush_interval: 1)
+        end
+
         @state = Redis::Stream::State::RUNNING if options.include?("sync_start") && options["sync_start"]
         setup_stream
 
@@ -67,15 +73,6 @@ class Redis
         @logger.info "#{@consumer_id} - Last ID = #{@last_id}"
       end
 
-      def trace(topic, span = nil, &block)
-        @tracer.trace(topic, span, &block)
-      end
-
-      def trace_error(msg, span, &block)
-        @tracer.trace_error(msg, span, &block)
-      end
-
-
       # add: add a message to the stream
       # @param [Object] data                    Any data you want to transmit
       # @param [Hash{String->String}]           Options
@@ -84,7 +81,7 @@ class Redis
       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}
+        default_options = {"to" => "*", "group" => "*", "type" => Redis::Stream::Type::ACTION, "cache_key" => nil, "tracer" => nil}
         options = default_options.merge(options)
 
         type = options["type"]
@@ -104,7 +101,7 @@ class Redis
       def sync_add(data = {}, options = {})
         raise "Client isn't running" unless @state.eql?(Redis::Stream::State::RUNNING)
 
-        default_options = {"to" => "*", "group" => "*", "type" => Redis::Stream::Type::ACTION, "time_out" => 5, "passthrough" => false, "cache_key" => nil}
+        default_options = {"to" => "*", "group" => "*", "type" => Redis::Stream::Type::ACTION, "time_out" => 5, "passthrough" => false, "cache_key" => nil, "tracer" => nil}
         options = default_options.merge(options)
 
         to = options["to"]
@@ -114,7 +111,7 @@ class Redis
 
         #@state = Redis::Stream::State::RUNNING
         data_out = nil
-        add_id = add(data, "to" => to, "group" => group, "type" => options["type"], "cache_key" => options["cache_key"])
+        add_id = add(data, "to" => to, "group" => group, "type" => options["type"], "cache_key" => options["cache_key"], "tracer" => options['tracer'])
 
         time = Time.now
 
@@ -188,14 +185,39 @@ class Redis
         end
       end
 
+      def trace(operation_name, parent_scope = nil)
+        # span = OpenTracing.start_span(operation_name)
+        # yield span if block_given?
+        # span.finish
+
+        # active_scope = OpenTracing.scope_manager.active
+        if parent_scope.is_a?(Zipkin::Scope)
+          OpenTracing.start_active_span(operation_name, child_of: parent_scope.span) do |scope|
+            yield scope if block_given?
+          end
+        else
+          OpenTracing.start_active_span(operation_name) do |scope|
+            yield scope if block_given?
+          end
+        end
+      end
 
+      def trace_error(operation_name, span = nil)
+        trace(operation_name, span)
+      end
       private
 
       def build_payload(data, options)
         to = options['to']
         group = options['group']
         type = options['type']
-
+        tracer_data = {}
+        if options['tracer'].nil?
+          tracer_data = nil
+        else
+          tracer_span = options['tracer']
+          OpenTracing.inject(tracer_span.context, OpenTracing::FORMAT_TEXT_MAP, tracer_data)
+        end
         payload = nil
 
         unless @cache.nil?
@@ -212,6 +234,7 @@ class Redis
                     from_group: group,
                     to: @consumer_id,
                     to_group: @group,
+                    tracer: tracer_data.to_json,
                     payload: @cache[cache_key].to_json
                 }
                 @logger.info("#{@consumer_id} - fetching from cache with key #{cache_key}")
@@ -230,6 +253,7 @@ class Redis
               from_group: @group,
               to: to,
               to_group: group,
+              tracer: tracer_data.to_json,
               payload: data.to_json
           }
         end
@@ -288,6 +312,12 @@ class Redis
             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
+
             begin
               data_out["payload"] = JSON.parse(data_out["payload"])
             rescue Exception => e
@@ -303,7 +333,7 @@ class Redis
             #   end
             # end
 
-            if (data_out["from"].eql?(@consumer_id))
+            if data_out["from"].eql?(@consumer_id)
               return false
             end
 

data/lib/redis/stream/version.rb

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

data/redis-stream.gemspec

@@ -42,5 +42,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "redis", "4.1.3"
   spec.add_dependency "moneta", "~> 1.2"
   spec.add_dependency "multi_json", "~> 1.14"
-  spec.add_dependency "zipkin-tracer", "~> 0.43"
+  spec.add_dependency "zipkin", "~> 1.6.1"
 end

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: redis-stream
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Mehmet Celik
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2020-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-  name: minitest
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.1.3
-  name: redis
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.1.3
 - !ruby/object:Gem::Dependency
+  name: moneta
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-  name: moneta
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
-  name: multi_json
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
 - !ruby/object:Gem::Dependency
+  name: zipkin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
-  name: zipkin-tracer
-  prerelease: false
+        version: 1.6.1
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
+        version: 1.6.1
 description: Simple stream library using Redis Streams
 email:
 - mehmet@celik.be
@@ -145,7 +145,7 @@ metadata:
   homepage_uri: https://github.com/mehmetc/redis-stream
   source_code_uri: https://github.com/mehmetc/redis-stream
   changelog_uri: https://github.com/mehmetc/redis-stream
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -160,9 +160,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.9
-signing_key:
+rubygems_version: 3.0.6
+signing_key: 
 specification_version: 4
 summary: Sugar coating Redis Streams
 test_files: []