redis-stream 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c68feb94f854987274b877134586cc49f146621d1bca1463dc7727c3d3330890
-  data.tar.gz: 3d0217743ed703c37bbe51c8fa69c89c0ee58749589d2edd3241c5950dae3447
+  metadata.gz: 12a0fad9e74538a076401cd2dc1e27a58c75369d72eb179d8d03a4454141c3a7
+  data.tar.gz: 399575ac314cbc13e19d25ffb3970576598b7194395192571861b7a0f92a15b3
 SHA512:
-  metadata.gz: 5b02a972747cf975360ceda206121f0dfd6e2dd12764eb1c7b90114785b932100b089629f19c7a09af5d49a0e648c775fd84400c2183cc0cdd5c0e2e2b2cf5de
-  data.tar.gz: 8816191f416792538278642d832d497e10cdcb3f4396ce9440825bad722a53a132111af3054f3d4289f5a0368726c7447d67e59c251f519de8a4ba7871cf34f1
+  metadata.gz: d843bdd4be24eecf5eef0d0f326e3405c2f0e2829d4c545f8e4b13f7d2acf30fc3f8436a4bb010713e6c9e85217b4ddfdf5769cb98bbb05308e33102d09b8140
+  data.tar.gz: 53cca2ee28d14c21e0f3220d72f2d0fa9c241da2e5aac7f2015c69688637163a8132072be6cf20e878adfc7741fb05ee76b2a811f63f2cdf3804be97cf7944e8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    redis-stream (0.4.2)
+    redis-stream (0.4.4)
       moneta (~> 1.2)
       multi_json (~> 1.14)
       redis (= 4.1.3)
@@ -15,7 +15,7 @@ GEM
     moneta (1.2.1)
     multi_json (1.14.1)
     opentracing (0.5.0)
-    rake (10.5.0)
+    rake (13.0.1)
     redis (4.1.3)
     zipkin (1.6.1)
       json
@@ -28,7 +28,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   minitest (~> 5.0)
-  rake (~> 10.0)
+  rake (~> 13.0)
   redis-stream!
 
 BUNDLED WITH

data/lib/redis/stream/client.rb

@@ -219,7 +219,7 @@ class Redis
         payload = nil
 
         unless @cache.nil?
-          if options["cache_key"].nil?
+          if options.include?("cache_key")
             cache_key = @cache.build_key(data)
             if @cache.include?(cache_key)
               if data && data.include?('from_cache') && data['from_cache'].eql?(0)
@@ -240,6 +240,7 @@ class Redis
 
             end
           else
+            @logger.info("#{@consumer_id} - fetching from cache with key #{cache_key}")
             @cache[options["cache_key"]] = data
           end
 

data/lib/redis/stream/version.rb

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

data/redis-stream.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_dependency "redis", "4.1.3"
   spec.add_dependency "moneta", "~> 1.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-stream
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Mehmet Celik
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-22 00:00:00.000000000 Z
+date: 2020-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +133,6 @@ files:
 - lib/redis/stream/group.rb
 - lib/redis/stream/inspect.rb
 - lib/redis/stream/state.rb
-- lib/redis/stream/tracer/zipkin_tracer.rb
 - lib/redis/stream/type.rb
 - lib/redis/stream/version.rb
 - redis-stream.gemspec

data/lib/redis/stream/tracer/zipkin_tracer.rb

@@ -1,75 +0,0 @@
-require 'socket'
-require 'zipkin-tracer'
-
-module ZipkinTracer
-  class RedisStreamHandler
-    def initialize(stream, config = nil)
-      @stream = stream
-
-      @config = Config.new(nil, config)
-      @tracer = TracerFactory.new.tracer(@config) rescue nil
-    end
-
-    def trace(topic, span=nil)
-      if @tracer.nil? || @tracer.class.name.eql?("Trace::NullSender")
-        yield nil if block_given?
-      else
-        trace_id = trace_id_from_span(span)
-        TraceContainer.with_trace_id(trace_id) do
-          trace_id = trace_id.next_id unless span.nil?
-          @tracer.with_new_span(trace_id, topic) do |new_span|
-            new_span.kind = Trace::Span::Kind::CLIENT
-            new_span.record("Session")
-            new_span.record_tag('group', @stream.group)
-            new_span.record_tag('stream',@stream.stream)
-            new_span.record_tag('client', @stream.name)
-
-            yield new_span if block_given?
-          end
-        end
-      end
-    rescue Exception => e
-      @stream.logger.error(e.message)
-      return nil
-    end
-
-    def trace_error(msg, span = nil)
-      if @tracer.nil? || @tracer.class.name.eql?("Trace::NullSender")
-        yield nil if block_given?
-      else
-        span.record_tag(Trace::Span::Tag::ERROR, msg)
-        yield span if block_given?
-      end
-    rescue Exception => e
-      @stream.logger.error(e.message)
-      return nil
-    end
-
-    private
-    def trace_id_from_span(span=nil)
-      if span.nil?
-        span_id  = TraceGenerator.new.generate_id
-        trace_id = TraceGenerator.new.generate_id_from_span_id(span_id)
-        parent_span_id = nil
-        sampled = false
-        flags = 0
-        shared = false
-      else
-        span_h = span.to_h
-        span_id  = span_h[:id]
-        trace_id = span_h[:traceId]
-        parent_span_id = span_h[:parent_span_id]
-        sampled = false
-        flags = 0
-        shared = true
-      end
-
-      Trace::TraceId.new(trace_id, parent_span_id, span_id, sampled, flags, shared)
-    rescue Exception => e
-      @stream.logger.error(e.message)
-      return nil
-    end
-
-
-  end
-end