signalfx-tracing 1.4.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3ac0a01141d6701e7d3017525cdcc710ec1b2115a19f671d61ed10f06766a09
-  data.tar.gz: 839316022dd7d73149f8e2d31b95761872e58e8ea2e158de5784cd708990fbab
+  metadata.gz: e746c7d7bd14f60dd0f45b263b38e05e4f4e591b221ad877d047c38aaf4ec8bf
+  data.tar.gz: 7916da5154ead8d2cd37325bfa1bf9ed4f254704919d9802fb883a5783a0aeb9
 SHA512:
-  metadata.gz: b8408b6e53193f91c41a76d115c3695f3bce83e917362804cd987b60cbeb5d66aa592f6709f842e8aaf874c2070443e8fc33340723f13093df7e35c997b74bf1
-  data.tar.gz: a2e6b995a3d30c97b786a3d923bca036175cd2458f0a66dfe5bc1ced94b13488660948b024e492f50320ca88cfd467acf0acd10807976bf6cda8bc437d7a7b34
+  metadata.gz: 8e82266212716e99449a73c3d11a8bbee4229c213b95d3be3cea1e96e562ea97969f807f95ebfec0c5e12fae2155ad9b7b8a6960eee7a6a7675e51979d8554f9
+  data.tar.gz: 26cd1d84fb7171603390a5f569122d7a91919e5c53b44041a358d651c685ae428d538e81afc6af780bec5024320dae394b0e8d2790e8ea4523077fdc8d8089c0

data/.gitignore

@@ -1,3 +1,4 @@
+/vendor/
 *.lock
 *.gem
 .idea

data/README.md

@@ -34,7 +34,7 @@ Here are the requirements and supported software for the library.
 | [Mysql2](#mysql2)               | mysql2-instrumentation                 | >= 0.4.0           |
 | [Net::HTTP](#nethttp)           | nethttp-instrumentation                | Ruby >= 2.0        |
 | [Pg](#pg)                       | pg-instrumentation                     | >= 0.18.0          |
-| [Rack](#rack)                   | rack-tracer                            | >= 0.1             |
+| [Rack](#rack)                   | sfx-rack-tracer                        | >= 0.10.0          |
 | [Rails](#rails)                 | rails-instrumentation                  | >= 3.0.0           |
 | [Redis](#redis)                 | redis-instrumentation                  | >= 4.0.0           |
 | [RestClient](#restclient)       | restclient-instrumentation             | >= 1.5.0           |
@@ -44,7 +44,7 @@ Here are the requirements and supported software for the library.
 
 Instrumentation for routes using Puma or Passenger is provided through
 Rack. If you use a framework that builds on top of Rack, such as Rails or
-Sinatra, install the `rack-tracer` instrumentation with your dependency manager
+Sinatra, install the `sfx-rack-tracer` instrumentation with your dependency manager
 or with the bootstrap utility. In these cases, the routes through the web
 server are automatically traced.
 
@@ -369,7 +369,7 @@ end
 ```
 ### Rack
 
-Rack spans are created using the `rack-tracer` gem. This is enabled
+Rack spans are created using the `sfx-rack-tracer` gem. This is enabled
 automatically for other frameworks that are built on top of Rack, but it can
 also be separately enabled.
 
@@ -394,7 +394,7 @@ use Rack::Tracer
 ### Rails
 
 Rails applications can be traced using the notifications provided by ActiveSupport.
-It will use `rack-tracer` to trace by requests.
+It will use `sfx-rack-tracer` to trace by requests.
 
 The forked source for this instrumentation is located
 [here](https://github.com/signalfx/ruby-rails-instrumentation).
@@ -541,7 +541,7 @@ Arguments:
 ### Sinatra
 
 Sinatra instrumentation traces requests and template rendering. The instrumenter
-registers a Sinatra extension that uses `rack-tracer` to trace requests and
+registers a Sinatra extension that uses `sfx-rack-tracer` to trace requests and
 monkey-patches to trace view rendering. Rack instrumentation is automatically
 enabled when using Sinatra instrumentation.
 

data/bin/sfx-rb-trace-bootstrap

@@ -12,8 +12,8 @@ instrumentations = {
   "mysql2" => ["mysql2-instrumentation", "~> 0.2.1"],
   "nethttp" => ["nethttp-instrumentation", "~> 0.1.2"],
   "pg" => ["pg-instrumentation", "~> 0.1.0"],
-  "rack" => ["rack-tracer", { git: 'git://github.com/signalfx/ruby-rack-tracer.git', branch: 'sfx_release' }],
-  "rails" => ["rails-instrumentation", "~> 0.1.3"],
+  "rack" => ["sfx-rack-tracer", "~> 0.10.0"],
+  "rails" => ["rails-instrumentation", "~> 0.1.5"],
   "redis" => ["redis-instrumentation", "~> 0.2.0"],
   "restclient" => ["restclient-instrumentation", "~> 0.1.1"],
   "sequel" => ["sequel-instrumentation", "~> 0.1.0"],

data/gem.deps.rb

@@ -5,7 +5,7 @@ group :instrumentations do
   gem 'mysql2-instrumentation', '~> 0.2.1'
   gem 'nethttp-instrumentation', '~> 0.1.2'
   gem 'pg-instrumentation',  '~> 0.1.0'
-  gem 'rack-tracer', git: 'git://github.com/signalfx/ruby-rack-tracer.git', branch: 'sfx_release'
+  gem 'sfx-rack-tracer', '0.10.0'
   gem 'rails-instrumentation', '0.1.3'
   gem 'redis-instrumentation', '~> 0.2.0'
   gem 'restclient-instrumentation', '~> 0.1.1'

data/lib/signalfx/tracing.rb

@@ -2,8 +2,11 @@ require 'jaeger/client'
 require 'signalfx/tracing/http_sender'
 require 'signalfx/tracing/register'
 require 'signalfx/tracing/compat'
+require 'signalfx/tracing/client'
 require 'signalfx/tracing/sfx_logger'
 require 'signalfx/tracing/tags'
+require 'signalfx/tracing/tracer'
+require 'signalfx/tracing/span'
 require 'thread'
 
 module SignalFx
@@ -75,7 +78,7 @@ module SignalFx
               OpenTracing::FORMAT_TEXT_MAP => [Jaeger::Client::Extractors::B3TextMapCodec]
             }
 
-            @tracer = Jaeger::Client.build(
+            @tracer = SignalFx::Tracing::Client.build(
               service_name: service_name,
               reporter: @reporter,
               injectors: injectors,

data/lib/signalfx/tracing/client.rb

@@ -0,0 +1,38 @@
+module SignalFx
+  module Tracing
+    module Client
+      include ::Jaeger::Client 
+
+      def self.build(host: '127.0.0.1',
+                     port: 6831,
+                     service_name:,
+                     flush_interval: DEFAULT_FLUSH_INTERVAL,
+                     sampler: Samplers::Const.new(true),
+                     logger: Logger.new(STDOUT),
+                     sender: nil,
+                     reporter: nil,
+                     injectors: {},
+                     extractors: {},
+                     tags: {})
+        encoder = Encoders::ThriftEncoder.new(service_name: service_name, tags: tags)
+
+        if sender
+          warn '[DEPRECATION] Passing `sender` directly to Jaeger::Client.build is deprecated.' \
+          'Please use `reporter` instead.'
+        end
+
+        reporter ||= Reporters::RemoteReporter.new(
+          sender: sender || UdpSender.new(host: host, port: port, encoder: encoder, logger: logger),
+          flush_interval: flush_interval
+        )
+
+        Tracer.new(
+          reporter: reporter,
+          sampler: sampler,
+          injectors: Injectors.prepare(injectors),
+          extractors: Extractors.prepare(extractors)
+        )
+      end
+    end
+  end
+end

data/lib/signalfx/tracing/instrumentation/faraday.rb

@@ -31,9 +31,9 @@ module SignalFx
             ::Faraday::Connection.module_eval do
               alias_method :initialize_original, :initialize
 
-              def initialize(url = nil, options = nil)
+              def initialize(url = nil, options = nil, &block)
                 # initialize the connection as usual
-                initialize_original(url, options)
+                initialize_original(url, options, &block)
 
                 # before we let go, add the Faraday tracer to the beginning of the stack
                 @builder.insert(0, ::Faraday::Tracer)

data/lib/signalfx/tracing/span.rb

@@ -0,0 +1,21 @@
+require 'jaeger/span'
+
+module SignalFx
+  module Tracing
+    module Span
+      def set_error(error) 
+        set_tag('error', true)
+        log_kv(
+          event: 'error',
+          :'error.kind' => error.class.to_s,
+          :'error.object' => error,
+          message: error.message,
+          stack: error.backtrace.join("\n")
+        )
+      end
+    end
+  end
+end
+
+
+Jaeger::Span.class_eval { include SignalFx::Tracing::Span }

data/lib/signalfx/tracing/tracer.rb

@@ -1,14 +1,22 @@
+require 'jaeger/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
 # setter for @reporter.
+# This also adds the set_error method that can be used to add an exception to
+# the currently active span.
 
 module SignalFx
   module Tracing
-    class Tracer < ::Jaeger::Client::Tracer
+    class Tracer < ::Jaeger::Tracer
       def set_reporter(reporter)
         @reporter = reporter
       end
+
+      def set_error(error)
+        span = active_span
+        span.set_error(error) if span 
+      end
     end
   end
 end

data/lib/signalfx/tracing/version.rb

@@ -1,5 +1,5 @@
 module Signalfx
   module Tracing
-    VERSION = "1.4.0"
+    VERSION = "1.5.1"
   end
 end

data/signalfx-tracing.gemspec

@@ -20,8 +20,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "test-unit"
 
   # TODO pin versions once consistent across all dependencies
   spec.add_dependency "opentracing", "> 0.3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signalfx-tracing
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - SignalFx, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2020-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: opentracing
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +110,7 @@ files:
 - bin/sfx-rb-trace-bootstrap
 - gem.deps.rb
 - lib/signalfx/tracing.rb
+- lib/signalfx/tracing/client.rb
 - lib/signalfx/tracing/compat.rb
 - lib/signalfx/tracing/compat/phusion_passenger.rb
 - lib/signalfx/tracing/http_sender.rb
@@ -118,6 +133,7 @@ files:
 - lib/signalfx/tracing/register.rb
 - lib/signalfx/tracing/reporter/auto_reviving_async_reporter.rb
 - lib/signalfx/tracing/sfx_logger.rb
+- lib/signalfx/tracing/span.rb
 - lib/signalfx/tracing/tags.rb
 - lib/signalfx/tracing/tracer.rb
 - lib/signalfx/tracing/version.rb
@@ -141,8 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Auto-instrumentation framework for Ruby