signalfx-tracing 1.6.1 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb69751bf1eff41423dfb43a0470b00194ee39ca02cd1647eecbe845e31e0472
-  data.tar.gz: c3d1bb44a2fda8b7aa96b68ed98be8e1d6a23a502f570e7e04eb5ef42f413b1c
+  metadata.gz: e1a81b9b2fa728642164bf2bc2ee4b48d80b3a4b23a74b11e962d1e7506ab02b
+  data.tar.gz: 5a57de5df779ffdaf83f7fd8b3948b5d75b9fd3339fc00c10a6eef005ec62762
 SHA512:
-  metadata.gz: 977d6e639a0bd2098d23147cee9de114fca97e8156f67e186775a457c380a11ac52169765c3a5d796f170b89e8f4c04971366f6382428ddc4a015ccd8de1df33
-  data.tar.gz: c475b7183dcd21489595eb46d0168550b0b0f4b40bf0a9e8fe1f2f6321b9a4e5feee53913c93ba73d746f1ad3c6b89fd3cc4c1aa0f921542554ebf951f533cd0
+  metadata.gz: 7c1398cc79cce7c1bdf3f54b7906b79df8d20cf8a135656751f081dae48af1d532e5a0469dfbec275a0f2f87ae63de3e5f5701e48a67f2bb5b3df23297a1767e
+  data.tar.gz: 87c64425e3a95ecb8e2529d0974aa9281fb70b2dc7d15c74134b71ca156f5673610a05e91ea37680a2ed37912ad1433439b6da41fa8679bf3abeb5f1ce20b6a0

data/README.md

@@ -26,25 +26,25 @@ Here are the requirements and supported software for the library.
 
 | Library                         | Instrumentation name                   | Versions Supported |
 | ------------------------------- | -------------------------------------- | ------------------ |
-| [ActiveRecord](#active-record)  | activerecord-opentracing               | ~> 5.0             |
+| [ActiveRecord](#active-record)  | signalfx-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.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)                   | 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           |
-| [Sequel](#sequel)               | sequel-instrumentation                 | >= 3.47.0          |
-| [Sidekiq](#sidekiq)             | sfx-sidekiq-opentracing                | >= 0.7.0           |
-| [Sinatra](#sinatra)             | sinatra-instrumentation                | >= 1.0.0           |
+| [Faraday](#faraday)             | signalfx-faraday-instrumentation       | >= 0.2.1           |
+| [Grape](#grape)                 | signalfx-grape-instrumentation         | >= 0.2.0           |
+| [Mongo](#mongo)                 | signalfgx-mongodb-instrumentation      | >= 2.1.0           |
+| [Mysql2](#mysql2)               | signalfx-mysql2-instrumentation        | >= 0.4.0           |
+| [Net::HTTP](#nethttp)           | signalfx-nethttp-instrumentation       | Ruby >= 2.0        |
+| [Pg](#pg)                       | signalfx-pg-instrumentation            | >= 0.18.0          |
+| [Rack](#rack)                   | signalfx-rack-tracer                   | >= 0.10.0          |
+| [Rails](#rails)                 | signalfx-rails-instrumentation         | >= 3.0.0           |
+| [Redis](#redis)                 | signalfx-redis-instrumentation         | >= 4.0.0           |
+| [RestClient](#restclient)       | signalfx-restclient-instrumentation    | >= 1.5.0           |
+| [Sequel](#sequel)               | signalfx-sequel-instrumentation        | >= 3.47.0          |
+| [Sidekiq](#sidekiq)             | signalfx-sidekiq-opentracing           | >= 0.7.0           |
+| [Sinatra](#sinatra)             | signalfx-sinatra-instrumentation       | >= 1.0.0           |
 
 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 `sfx-rack-tracer` instrumentation with your dependency manager
+Sinatra, install the `signalfx-rack-tracer` instrumentation with your dependency manager
 or with the bootstrap utility. In these cases, the routes through the web
 server are automatically traced.
 
@@ -89,8 +89,8 @@ The steps assume you have RubyGems and Bundler.
 3. Add each applicable instrumentation to your application's Gemfile. For
    example, this is how you add Rails and Redis:
    ```bash
-   $ gem 'rails-instrumentation'
-   $ gem 'redis-instrumentation'
+   $ gem 'signalfx-rails-instrumentation'
+   $ gem 'signalfx-redis-instrumentation'
    ```
    For information about instrumentation names, see supported libraries and their
    current versions in `gem.deps.rb`. If you configure Rails instrumentation, it
@@ -158,7 +158,7 @@ This instrumentation creates spans for each Active Record query using the Active
 Support notifications framework. If you configure Rails instrumentation, it also configures Active Record instrumentation, so you don't need to instrument both.
 
 The source for this instrumentation is located
-[here](https://github.com/salemove/ruby-activerecord-opentracing).
+[here](https://github.com/signalfx/ruby-activerecord-opentracing).
 
 #### Usage
 
@@ -218,7 +218,7 @@ requests. If the remote service has instrumentation that is aware of Rack,
 those spans will be automatically nested with Faraday's spans.
 
 The source for this instrumentation is located
-[here](https://github.com/opentracing-contrib/ruby-faraday-tracer).
+[here](https://github.com/signalfx/ruby-faraday-tracer).
 
 #### Usage
 
@@ -371,7 +371,7 @@ end
 ```
 ### Rack
 
-Rack spans are created using the `sfx-rack-tracer` gem. This is enabled
+Rack spans are created using the `signalfx-rack-tracer` gem. This is enabled
 automatically for other frameworks that are built on top of Rack, but it can
 also be separately enabled.
 
@@ -396,7 +396,7 @@ use Rack::Tracer
 ### Rails
 
 Rails applications can be traced using the notifications provided by ActiveSupport.
-It will use `sfx-rack-tracer` to trace by requests.
+It will use `signalfx-rack-tracer` to trace by requests.
 
 The forked source for this instrumentation is located
 [here](https://github.com/signalfx/ruby-rails-instrumentation).
@@ -543,7 +543,7 @@ Arguments:
 ### Sinatra
 
 Sinatra instrumentation traces requests and template rendering. The instrumenter
-registers a Sinatra extension that uses `sfx-rack-tracer` to trace requests and
+registers a Sinatra extension that uses `signalfx-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

@@ -4,21 +4,21 @@ require 'ostruct'
 require 'pp'
 
 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.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" => ["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"],
-  "sidekiq" => ["sfx-sidekiq-opentracing", "~> 0.0.3"],
-  "sinatra" => ["sinatra-instrumentation", "~> 0.1.2"]
+  "activerecord" => ["signalfx-activerecord-opentracing", "~> 0.1.0"],
+  "elasticsearch" => ["signalfx-elasticsearch-instrumentation", "~> 0.2.0"],
+  "faraday" => ["signalfx-faraday-instrumentation", "~> 0.2.1"],
+  "grape" => ["signalfx-grape-instrumentation", "~> 0.1.0"],
+  "mongodb" => ["signalfx-mongodb-instrumentation", "~> 0.1.1"],
+  "mysql2" => ["signalfx-mysql2-instrumentation", "~> 0.1.1"],
+  "nethttp" => ["signalfx-nethttp-instrumentation", "~> 0.2.0"],
+  "pg" => ["signalfx-pg-instrumentation", "~> 0.1.0"],
+  "rack" => ["signalfx-rack-tracer", "~> 0.1.0"],
+  "rails" => ["signalfx-rails-instrumentation", "~> 0.2.0"],
+  "redis" => ["signalfx-redis-instrumentation", "~> 0.1.0"],
+  "restclient" => ["signalfx-restclient-instrumentation", "~> 0.1.0"],
+  "sequel" => ["signalfx-sequel-instrumentation", "~> 0.1.0"],
+  "sidekiq" => ["signalfx-sidekiq-opentracing", "~> 0.1.0"],
+  "sinatra" => ["signalfx-sinatra-instrumentation", "~> 0.1.0"]
 }
 
 options = OpenStruct.new

data/gem.deps.rb

@@ -1,17 +1,17 @@
 group :instrumentations do
-  gem 'activerecord-opentracing', '~> 0.2.1'
-  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 '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'
-  gem 'sfx-sidekiq-opentracing', '~> 0.0.3'
-  gem 'signalfx-elasticsearch-instrumentation', '~> 0.1.0'
-  gem 'signalfx-faraday-instrumentation', '~> 0.1.1'
-  gem 'sinatra-instrumentation', '~> 0.1.2'
+  gem 'signalfx-activerecord-opentracing', '~> 0.1.0'
+  gem 'signalfx-grape-instrumentation', "~> 0.1.0"
+  gem 'signalfx-mongodb-instrumentation', '~> 0.1.1'
+  gem 'signalfx-mysql2-instrumentation', '~> 0.1.1'
+  gem 'signalfx-nethttp-instrumentation', '~> 0.2.0'
+  gem 'signalfx-pg-instrumentation',  '~> 0.1.0'
+  gem 'signalfx-rack-tracer', '~> 0.1.0'
+  gem 'signalfx-rails-instrumentation', '~> 0.2.0'
+  gem 'signalfx-redis-instrumentation', '~> 0.1.0'
+  gem 'signalfx-restclient-instrumentation', '~> 0.1.0'
+  gem 'signalfx-sequel-instrumentation', '~> 0.1.0'
+  gem 'signalfx-sidekiq-opentracing', '~> 0.1.0'
+  gem 'signalfx-elasticsearch-instrumentation', '~> 0.2.0'
+  gem 'signalfx-faraday-instrumentation', '~> 0.2.1'
+  gem 'signalfx-sinatra-instrumentation', '~> 0.1.0'
 end

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

@@ -20,15 +20,19 @@ module SignalFx
 
             begin
               require 'rails/instrumentation'
-              require 'rack/tracer'
             rescue LoadError => e
               puts e.message
               return
             end
 
             if opts.fetch(:rack_tracer, true)
-              # add rack middlewares
-              ::Rails.configuration.middleware.insert(0, ::Rack::Tracer)
+              begin
+                # add rack middlewares
+                require 'rack/tracer'
+                ::Rails.configuration.middleware.insert(0, ::Rack::Tracer)
+              rescue LoadError => e
+                puts e.message
+              end
             end
 
             exclude_events = opts.fetch(:exclude_events, [])

data/lib/signalfx/tracing/span.rb

@@ -4,24 +4,15 @@ module SignalFx
   module Tracing
     module Span
       def record_exception(exception, record_error=true) 
-        set_tag('error', true) if record_error
-
-        fields = {
-          :event => 'error',
-          :'error.kind' => exception.class.to_s,
-          :'error.object' => exception,
-          :message => exception.message,
-        }
-
+        set_tag(:error, true) if record_error
+        set_tag(:'sfx.error.kind', exception.class.to_s) 
+        set_tag(:'sfx.error.message', exception.message)
         if not exception.backtrace.nil?
-          fields[:stack] = exception.backtrace.join('\n')
+          set_tag(:'sfx.error.stack', exception.backtrace.join('\n'))
         end
-
-        log_kv(**fields)
       end
     end
   end
 end
 
-
-Jaeger::Span.class_eval { include SignalFx::Tracing::Span }
+Jaeger::Span.class_eval { prepend SignalFx::Tracing::Span }

data/lib/signalfx/tracing/version.rb

@@ -1,5 +1,5 @@
 module Signalfx
   module Tracing
-    VERSION = "1.6.1"
+    VERSION = "2.3.1"
   end
 end

data/signalfx-tracing.gemspec

@@ -34,9 +34,9 @@ Gem::Specification.new do |spec|
   # `gem install -g`
 
   # stdlib instrumentations
-  spec.add_dependency "nethttp-instrumentation", "~> 0.1.2"
+  spec.add_dependency "signalfx-nethttp-instrumentation", "~> 0.2.0"
 
   # uncomment and run `bundle install` in order to run the whole test suite
-  # spec.add_development_dependency "faraday", "~> 1.0"
-  # spec.add_development_dependency "signalfx-faraday-instrumentation"
+  spec.add_development_dependency "faraday", "~> 1.0"
+  spec.add_development_dependency "signalfx-faraday-instrumentation", "~> 0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signalfx-tracing
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 2.3.1
 platform: ruby
 authors:
 - SignalFx, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,19 +81,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: nethttp-instrumentation
+  name: signalfx-nethttp-instrumentation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: signalfx-faraday-instrumentation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 description:
 email:
 - info@signalfx.com