signalfx-tracing 1.4.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a97734502b6a3086f287a0b3190e87f955ef504ed7d84e9d52c8daae57775498
-  data.tar.gz: 0c2afab9431d500c0c00ead0c4ce39ab65218816d3c87169a111b8b313664685
+  metadata.gz: 76f49e90a746e01bab86b3172c2ddd7f49aae975d70191f297a1e18e110e558d
+  data.tar.gz: 677c15658a0d10c61c8defc270e1c9a4d84c8e838626dfc9fc63198927ba755f
 SHA512:
-  metadata.gz: 71ef7d2302c154ac3ec32527875864b58c79896e4f78213aeeb12806a2c806b75287980a8143d1f2d5ee3d345af1f1ab8c7892fffba5a596cff423434dfd6b21
-  data.tar.gz: e4f1620cb3c8e2389a2baad58b615fdd5e7a16b8098e8060a69473a1d4d429f546c2edbd073b3ef1157e5201257cd0a4ef157a4964a54ce5e0d0d9a48dca4501
+  metadata.gz: b934a8cdc290183f72306b772e1b4422171ad3c717fe97c9f9c697deb543c67d95ce25b7c7073dcc50e30a888a1ae5101477fb6260c611c82c985ee81d11b7bb
+  data.tar.gz: 91a4a8d6817d3c28cb70672f315706a5c4153d279a956682650c0adf4d7ec69fa6ab305c38dce31220eca11932a924e6d63484427c18288057218cb13b69fa77

data/.gitignore

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

data/README.md

@@ -29,12 +29,12 @@ Here are the requirements and supported software for the library.
 | [ActiveRecord](#active-record)  | activerecord-opentracing               | ~> 5.0             |
 | [Elasticsearch](#elasticsearch) | signalfx-elasticsearch-instrumentation | >= 6.0.2           |
 | [Faraday](#faraday)             | signalfx-faraday-instrumentation       | >= 0.9.0           |
-| [Grape](#grape)                 | grape-instrumentation                  | >= 0.13.0          |
+| [Grape](#grape)                 | grape-instrumentation                  | >= 0.2.0           |
 | [Mongo](#mongo)                 | mongodb-instrumentation                | >= 2.1.0           |
 | [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,12 +369,12 @@ 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.
 
 The source for this instrumentation is located
-[here](https://github.com/opentracing-contrib/ruby-rack-tracer).
+[here](https://github.com/signalfx/ruby-rack-tracer).
 
 #### Usage
 
@@ -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

@@ -7,13 +7,13 @@ instrumentations = {
   "activerecord" => ["activerecord-opentracing", "~> 0.2.1"],
   "elasticsearch" => ["signalfx-elasticsearch-instrumentation", "~> 0.1.0"],
   "faraday" => ["signalfx-faraday-instrumentation", "~> 0.1.1"],
-  "grape" => ["grape-instrumentation", "~> 0.1.0"],
+  "grape" => ["grape-instrumentation", "~> 0.2.0"],
   "mongodb" => ["mongodb-instrumentation", "~> 0.1.1"],
   "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

@@ -1,12 +1,12 @@
 group :instrumentations do
   gem 'activerecord-opentracing', '~> 0.2.1'
-  gem 'grape-instrumentation', "~> 0.1.0"
+  gem 'grape-instrumentation', "~> 0.2.0"
   gem 'mongodb-instrumentation', '~> 0.1.1'
   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 'rails-instrumentation', '0.1.3'
+  gem 'sfx-rack-tracer', '~> 0.10.0'
+  gem 'rails-instrumentation', '~> 0.1.5'
   gem 'redis-instrumentation', '~> 0.2.0'
   gem 'restclient-instrumentation', '~> 0.1.1'
   gem 'sequel-instrumentation', '~> 0.1.0'

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/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.1"
+    VERSION = "1.5.2"
   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"
@@ -34,6 +35,4 @@ Gem::Specification.new do |spec|
 
   # stdlib instrumentations
   spec.add_dependency "nethttp-instrumentation", "~> 0.1.2"
-
-  spec.add_development_dependency 'signalfx-faraday-instrumentation~> 0.1.1', '~> 0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signalfx-tracing
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.2
 platform: ruby
 authors:
 - SignalFx, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-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
@@ -80,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
-- !ruby/object:Gem::Dependency
-  name: signalfx-faraday-instrumentation~> 0.1.1
-  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'
 description:
 email:
 - info@signalfx.com
@@ -110,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
@@ -132,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
@@ -155,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