signalfx-tracing 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d8084beade571589adf44ec1abf80119b97ec39a003cbbb140ea4c773295988
-  data.tar.gz: 117f57ee3d8c08085774660863c10aa80c2cc0b8c39447519ce0372ac41e85b5
+  metadata.gz: 9fcec71a1be65bd56fb2e5457c52cdc539f6e13944684cf3b8ab46e45860eef4
+  data.tar.gz: b53568f3b9f9b1e938f34e07388a3922851bf157ae5549c96040d4b0c5a13edf
 SHA512:
-  metadata.gz: 8827b0f0b970821aa91b193256d1e7ab0c080bb740421f6739fd2446a4e06e56eb38ea38fef65d3b94efaa7487d642ab9101e2bc61eb2ebbaa1e3c819fc3144c
-  data.tar.gz: 0caaf7c27b8510d3f2473775787496e52a2386e052f24c380bf9584c2c24a21a1750e1e4475a5c727dc1281b403f7280e8aa3bf88a3c845edcd883b38ecf138a
+  metadata.gz: b898b02c85dda9af08f3f18eeaeb9df693f866e88742d0ace0a9329e9f9eca44494f10ae810bed359b8159a6d71033f7a2be679da66024070673621274be0f19
+  data.tar.gz: 12875b259e36ff96485575085f881def7fb7b806842b33b5aa3601f407ce98b0785d63e61416232439636da8c0e783aa107797512a135cc6cbb726053e3932d6

data/.gitignore

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

data/bin/sfx-rb-trace-bootstrap

@@ -12,7 +12,7 @@ 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' }],
+  "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"],

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.3"
+    VERSION = "1.5.0"
   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.3
+  version: 1.5.0
 platform: ruby
 authors:
 - SignalFx, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-11 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