ruby-zipkin 0.2.905 → 0.2.906

data/lib/ruby-zipkin.rb

@@ -7,6 +7,7 @@ require 'ruby-zipkin/metadata_logger'
 require 'ruby-zipkin/tracesampler'
 require 'ruby-zipkin/trace_filter'
 require 'base64'
+require 'raven'
 
 module RubyZipkin extend self
 
@@ -21,28 +22,34 @@ module RubyZipkin extend self
       @uri_filter_list = uri_filter_list
       @http_header_filter_list = http_header_filter_list
       @scribe = Scribe.new("#{scribe_server}:#{scribe_port}")
-      log_file = File.new('/srv/flexd/current/log/stdout.log', 'a')
-      logger = Logger.new(log_file, 'weekly')
-      $stdout = log_file
-      puts "using scribe server: #{@scribe.to_s}"
+
+      #sentry logging
+      Raven.configure do |config|
+        config.dsn = 'https://311886275dcd4698b08192e03fec9416:689d930e50244bec9ab695575ed4e774@app.getsentry.com/14698'
+      end
+
+      Raven.capture_message( "using scribe server: #{@scribe.to_s} - #{scribe_server}:#{scribe_port}")
       puts "#{scribe_server}:#{scribe_port}"
       ::Trace.tracer = ::Trace::ZipkinTracer.new(Scriber.new(@scribe), scribe_max_buffer)
       end
 
     def call(env)
-      begin
-        ::Trace.default_endpoint = ::Trace.default_endpoint.with_service_name(@service_name + "_#{normalized_uri(env['PATH_INFO'])}")
-        ::Trace.sample_rate = 1
-        env[ZipkinTraceHeader::PARENT_SPAN_ID] = @spanid
-        env[ZipkinTraceHeader::TRACE_ID] = @tid
-
-        @status, @headers, @response = @app.call(env)
-        tracing_filter(get_or_create_trace_id2(env), env, @headers)
-
-      rescue => e
-        #Tracing errors shouldn't block a request.
-        puts "Zipkin error: #{e} \n #{e.backtrace}"
-        raise e
+      Raven.caputure do
+        begin
+          ::Trace.default_endpoint = ::Trace.default_endpoint.with_service_name(@service_name + "_#{normalized_uri(env['PATH_INFO'])}")
+          ::Trace.sample_rate = 1
+          env[ZipkinTraceHeader::PARENT_SPAN_ID] = @spanid
+          env[ZipkinTraceHeader::TRACE_ID] = @tid
+
+          @status, @headers, @response = @app.call(env)
+          tracing_filter(get_or_create_trace_id2(env), env, @headers)
+
+        rescue => e
+          #Tracing errors shouldn't block a request.
+          puts "Zipkin error: #{e} \n #{e.backtrace}"
+          Raven.capture_message "Zipkin error: #{e} \n #{e.backtrace}"
+          raise e
+        end
       end
       [@status, @headers, @response]
     end
@@ -125,6 +132,8 @@ module RubyZipkin extend self
 
     def get_or_create_trace_id2(env)
       id = ::Trace::TraceId.new(::Trace.generate_id, nil, ::Trace.generate_id, true, ::Trace::Flags::DEBUG)
+      Raven.capture_message id.inspect
+      id
     end
   end
 end

data/lib/ruby-zipkin/version.rb

@@ -1,3 +1,3 @@
 module RubyZipkin
-  VERSION = "0.2.905"
+  VERSION = "0.2.906"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-zipkin
 version: !ruby/object:Gem::Version 
-  hash: 1797
+  hash: 1795
   prerelease: 
   segments: 
   - 0
   - 2
-  - 905
-  version: 0.2.905
+  - 906
+  version: 0.2.906
 platform: ruby
 authors: 
 - Ivan Marcin
@@ -63,6 +63,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sentry-raven
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: Track rack header requests on zipkin
 email: 
 - ivan.marcin@lookout.com