signalfx-tracing 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2500771a323b85fcf4948487ea747b189cf33f617bc352588f85431e81c985d
-  data.tar.gz: 650f933316eb342764780d85423453bce13f94c5f7f6a36b549a3cdb9a9a49fb
+  metadata.gz: cba6686f3650fe7e78107b4361557d19f6c113027130637e6a0fa951ab9572d6
+  data.tar.gz: 0016fde2502c3f243c5c8041763883ec1563ee50de05f273f5084916d0b8257f
 SHA512:
-  metadata.gz: 67d3029eafada474fba523cc94bc590aa225785da84a343925b5cb07520bed3a4b673c7e58fa8de35c1f5e8bf4666042bd331aa89ca1d18c615c87a29bc2609c
-  data.tar.gz: 652bf97c1b07d61d45c24c3f51446cd2018c84bd10e0ba79c9fbf8b684bec2ff0179b4614219f88197c792aeed0813e69f4232028a2335b2f024d2e6bf3b15c3
+  metadata.gz: fe820cfaebb70a14236557a2c0b3d56da086845b5bf32ad8fc423535d6abb3925b0777135ffffba44fc13d069c2540f8f0f42e2ad6c8c2b17d07b129bb4b22fa
+  data.tar.gz: d63db2fd564d7bda03cc6ac0a16b9dea32c75561d9a5c1facdbbeff99c246805dac1c77f65b82d440dd104584632038174d6976733e8ab5030b6af82cb1fb85e

data/README.md

@@ -50,9 +50,6 @@ Valid lib names are listed below with the instrumentation documentation.
   - Default: `signalfx-ruby-tracing`
 - `access_token`: SignalFx access token for authentication.
   - Default: `''`
-- `fork_safe`: If `true`, makes the tracer safe to fork if events cannot
-  be controlled
-  - Default: `false`
 
 Environment variables can be used to configure `service_name` and `access_token`
 if not given to the `configure` method.
@@ -326,17 +323,3 @@ SignalFx::Tracing::Instrumenter.configure do |p|
 end
 ```
 
-## Troubleshooting
-
-### Forking
-
-If spans are no longer sent after forking a process, the span reporter thread
-has been lost while copying to the process.
-
-The reporter can be revived by calling `SignalFx::Tracing::Instrumenter.revive`
-in the newly created process.
-
-When the new process can't be handled directly, setting `fork_safe: true`
-when configuring the instrumentation will use a reporter that checks and revives
-itself every time a span is reported.
-

data/lib/signalfx/tracing.rb

@@ -1,9 +1,5 @@
 require 'jaeger/client'
-require 'jaeger/client/injectors'
-require 'jaeger/client/extractors'
-require 'signalfx/tracing/reporter/auto_reviving_async_reporter'
 require 'signalfx/tracing/http_sender'
-require 'signalfx/tracing/tracer'
 require 'signalfx/tracing/register'
 require 'signalfx/tracing/compat'
 require 'thread'
@@ -15,18 +11,16 @@ module SignalFx
       class << self
 
         attr_reader :ingest_url, :service_name, :access_token
-        attr_accessor :tracer
+        attr_accessor :tracer, :reporter
 
         def configure(tracer: nil,
                       ingest_url: ENV['SIGNALFX_INGEST_URL'] || 'https://ingest.signalfx.com/v1/trace',
                       service_name: ENV['SIGNALFX_SERVICE_NAME'] || "signalfx-ruby-tracing",
                       access_token: ENV['SIGNALFX_ACCESS_TOKEN'],
-                      auto_instrument: false,
-                      fork_safe: false)
+                      auto_instrument: false)
           @ingest_url = ingest_url
           @service_name = service_name
           @access_token = access_token
-          @fork_safe = fork_safe
           set_tracer(tracer: tracer, service_name: service_name, access_token: access_token)
 
           if auto_instrument
@@ -58,9 +52,7 @@ module SignalFx
 
             encoder = Jaeger::Client::Encoders::ThriftEncoder.new(service_name: service_name)
             @http_sender = SignalFx::Tracing::HttpSenderWithFlag.new(url: @ingest_url, headers: headers, encoder: encoder)
-            reporter = create_reporter(@http_sender)
-
-            sampler = Jaeger::Client::Samplers::Const.new(true)
+            @reporter = Jaeger::Client::Reporters::RemoteReporter.new(sender: @http_sender, flush_interval: 1)
 
             injectors = {
               OpenTracing::FORMAT_RACK => [Jaeger::Client::Injectors::B3RackCodec]
@@ -69,29 +61,20 @@ module SignalFx
               OpenTracing::FORMAT_RACK => [Jaeger::Client::Extractors::B3RackCodec]
             }
 
-            @tracer = SignalFx::Tracing::Tracer.new(reporter: reporter, sampler: sampler, injectors: injectors, extractors: extractors)
+            @tracer = Jaeger::Client.build(
+              service_name: service_name,
+              reporter: @reporter,
+              injectors: injectors,
+              extractors: extractors
+            )
             OpenTracing.global_tracer = @tracer
           else
             @tracer = tracer
           end
         end
 
-        # This method will either use the default reporter, which will not check
-        # for the sender thread, or if fork_safe is true then it will create the
-        # self-reviving reporter. The main use for this is
-        # when the process with the tracer gets forked or goes through some
-        # other process that kills child threads.
-        def create_reporter(sender)
-          if @fork_safe
-            SignalFx::Tracing::AutoRevivingAsyncReporter.new(sender, 1)
-          else
-            Jaeger::Client::AsyncReporter.create(sender: sender, flush_interval: 1)
-          end
-        end
-
-        # at the moment this just sets a new reporter in the tracer
         def revive
-          @tracer.set_reporter(create_reporter(@http_sender)) if @tracer.respond_to? :set_reporter
+          set_tracer(service_name: @service_name, access_token: @access_token)
         end
       end
     end

data/lib/signalfx/tracing/http_sender.rb

@@ -1,4 +1,3 @@
-require 'jaeger/client/http_sender'
 
 # This child class of HttpSender exists to allow Net::HTTP instrumentation to
 # ignore requests made by the tracer. The tracer uses the Thrift HTTP Transport,

data/lib/signalfx/tracing/reporter/auto_reviving_async_reporter.rb

@@ -1,5 +1,3 @@
-require 'jaeger/client/async_reporter'
-
 # The Jaeger client's AsyncReporter creates a thread to handle sending spans on
 # a flush interval. However, when a forking web server like Passenger forks a
 # process that includes the tracer, the sender thread is lost.

data/lib/signalfx/tracing/tracer.rb

@@ -1,4 +1,3 @@
-require 'jaeger/client/tracer'
 
 # The default jaeger tracer doesn't expose @reporter, and attr_accessor can't
 # be added after the fact in a child class. So this just adds an old-fashioned

data/lib/signalfx/tracing/version.rb

@@ -1,5 +1,5 @@
 module Signalfx
   module Tracing
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

data/signalfx-tracing.gemspec

@@ -36,20 +36,19 @@ Gem::Specification.new do |spec|
 
   # TODO pin versions once consistent across all dependencies
   spec.add_dependency "opentracing", "> 0.3.0"
-  # spec.add_dependency "jaeger-client", "~> 0.6.1"
-  spec.add_dependency "jaeger-client", "~> 0.7.0"
+  spec.add_dependency "jaeger-client", "~> 0.10.0"
 
-  spec.add_dependency "sinatra-instrumentation", "~> 0.1"
-  spec.add_dependency "nethttp-instrumentation", "~> 0.1"
-  spec.add_dependency "restclient-instrumentation", "~> 0.1"
-  spec.add_dependency "mongodb-instrumentation", "~> 0.1"
-  spec.add_dependency "mysql2-instrumentation", "~> 0.1"
-  spec.add_dependency "redis-instrumentation", "~> 0.1"
+  spec.add_dependency "sinatra-instrumentation", "~> 0.1.2"
+  spec.add_dependency "nethttp-instrumentation", "~> 0.1.2"
+  spec.add_dependency "restclient-instrumentation", "~> 0.1.1"
+  spec.add_dependency "mongodb-instrumentation", "~> 0.1.1"
+  spec.add_dependency "mysql2-instrumentation", "~> 0.1.0"
+  spec.add_dependency "redis-instrumentation", "~> 0.1.0"
 
   # forks
-  spec.add_dependency "signalfx-rails-instrumentation", "~> 0.1"
-  spec.add_dependency "signalfx-elasticsearch-instrumentation", "~> 0.1"
-  spec.add_dependency "signalfx-faraday-instrumentation", "~> 0.1.0"
+  spec.add_dependency "signalfx-rails-instrumentation", "~> 0.1.4"
+  spec.add_dependency "signalfx-elasticsearch-instrumentation", "~> 0.1.0"
+  spec.add_dependency "signalfx-faraday-instrumentation", "~> 0.1.1"
 
   # external
   spec.add_dependency "rack-tracer", "~> 0.8"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signalfx-tracing
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Ashwin Chandrasekar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2019-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,140 +58,140 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: sinatra-instrumentation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: nethttp-instrumentation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: restclient-instrumentation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: mongodb-instrumentation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: mysql2-instrumentation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: redis-instrumentation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: signalfx-rails-instrumentation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: signalfx-elasticsearch-instrumentation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: signalfx-faraday-instrumentation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: rack-tracer
   requirement: !ruby/object:Gem::Requirement