oboe 2.7.7.1 → 2.7.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e12e0be2eaca4139071f49e208ec204361471e53
-  data.tar.gz: fcfbe0144510290a381a8fbc35920e4d3bdec921
+  metadata.gz: 2b9bbd08a173607dee7479100a3d26a882dda4f1
+  data.tar.gz: 8ae72fb3f10506ccc4947628e77a55f3af33c6b7
 SHA512:
-  metadata.gz: 4678a5789e8b976ce37ff8581121172eca657aace4f8f061b848e4fc09bfbcc42e111bae4133dedd53e2ed8dd0b1514d5c5dfe4b1eb4d2a976cfd37d3742ab76
-  data.tar.gz: a44ed9f77128673584d096a169f47098b77f8406495af01117dc81c8cecf294c483969123f143e01997003a6bd50583e39cf6b14ab3799e8c06ea75dd907a98b
+  metadata.gz: c2b91731560f39824bb91dd58c25cfc4b5c4f16a799477d29c1e8e1565100962665b273c4ac920c47fe413bad7c635b6d7071905f6f4df352fb5d11859643af4
+  data.tar.gz: ae29ddce04ecec926340fedd43167a277e1afc05993c2405f868da6e37552d6ea7ff37e7770358547ebc9667b7ebf7c9f73abb61a66008ea6f1b9aa3b7594cce

data/Gemfile

@@ -39,7 +39,11 @@ if defined?(JRUBY_VERSION)
 else
   gem 'mysql'
   gem 'mysql2'
-  gem 'pg'
+  if RUBY_VERSION < '1.9.3'
+    gem 'pg', '0.17.1'
+  else
+    gem 'pg'
+  end
 end
 
 if RUBY_VERSION >= '1.9'

data/lib/joboe_metal.rb

@@ -153,14 +153,17 @@ module Oboe
         # Store the returned SampleRateConfig into Oboe::Config
         if sr_cfg
           begin
-            Oboe.sample_rate = sr_cfg.sampleRate
-            Oboe.sample_source = sr_cfg.sampleRateSource.a
+            Oboe::Config.sample_rate = cfg.sampleRate
+            Oboe::Config.sample_source = cfg.sampleRateSourceValue
             # If we fail here, we do so quietly.  This was we don't spam logs
             # on every request
           end
+        else
+          Oboe.sample_rate = -1
+          Oboe.sample_source = -1
         end
 
-        sr_cfg
+        sr_cfg ? true : false
       rescue => e
         Oboe.logger.debug "[oboe/debug] #{e.message}"
         false

data/lib/oboe/api/logging.rb

@@ -69,9 +69,33 @@ module Oboe
         Oboe::Context.fromString(xtrace) if Oboe.pickup_context?(xtrace)
 
         if Oboe.tracing?
+          # Pre-existing context.  Either we inherited context from an
+          # incoming X-Trace request header or under JRuby, Joboe started
+          # tracing before the JRuby code was called (e.g. Tomcat)
           Oboe.is_continued_trace = true
+
+          if Oboe.has_xtrace_header
+            opts[:TraceOrigin] = :continued_header
+          elsif Oboe.has_incoming_context
+            opts[:TraceOrigin] = :continued_context
+          else
+            opts[:TraceOrigin] = :continued
+          end
+
           log_entry(layer, opts)
-        elsif opts.key?('Force') || Oboe.sample?(opts.merge(:layer => layer, :xtrace => xtrace))
+
+        elsif opts.key?('Force')
+          # Forced tracing: used by __Init reporting
+          opts[:TraceOrigin] = :forced
+          log_event(layer, 'entry', Oboe::Context.startTrace, opts)
+
+        elsif Oboe.sample?(opts.merge(:layer => layer, :xtrace => xtrace))
+          # Probablistic tracing of a subset of requests based off of
+          # sample rate and sample source
+          opts[:SampleRate]        = Oboe.sample_rate
+          opts[:SampleSource]      = Oboe.sample_source
+          opts[:TraceOrigin] = :always_sampled
+
           log_event(layer, 'entry', Oboe::Context.startTrace, opts)
         end
       end

data/lib/oboe/base.rb

@@ -31,8 +31,8 @@ module OboeBase
 
   attr_accessor :reporter
   attr_accessor :loaded
-  attr_accessor :sample_source
-  attr_accessor :sample_rate
+  thread_local :sample_source
+  thread_local :sample_rate
   thread_local :layer
   thread_local :layer_op
 

data/lib/oboe/inst/rack.rb

@@ -37,6 +37,8 @@ module Oboe
         report_kvs['Forwarded-Port']    = env['HTTP_X_FORWARDED_PORT']   if env.key?('HTTP_X_FORWARDED_PORT')
 
         report_kvs['Ruby.Oboe.Version'] = ::Oboe::Version::STRING
+        report_kvs['ProcessID']         = Process.pid
+        report_kvs['ThreadID']          = Thread.current.to_s[/0x\w*/]
       rescue StandardError => e
         # Discard any potential exceptions. Debug log and report whatever we can.
         Oboe.logger.debug "[oboe/debug] Rack KV collection error: #{e.inspect}"
@@ -50,13 +52,6 @@ module Oboe
       report_kvs = {}
       report_kvs[:URL] = URI.unescape(req.path)
 
-      if Oboe.always?
-        # Only report these KVs under tracing_mode 'always' (never for 'through')
-        # These KVs need to be in the entry event for server side.
-        report_kvs[:SampleRate]        = Oboe.sample_rate
-        report_kvs[:SampleSource]      = Oboe.sample_source
-      end
-
       # Under JRuby, JOboe may have already started a trace.  Make note of this
       # if so and don't clear context on log_end (see oboe/api/logging.rb)
       Oboe.has_incoming_context = Oboe.tracing?

data/lib/oboe/version.rb

@@ -8,7 +8,7 @@ module Oboe
   module Version
     MAJOR = 2
     MINOR = 7
-    PATCH = 7
+    PATCH = 8
     BUILD = 1
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/lib/oboe_metal.rb

@@ -85,7 +85,7 @@ module Oboe
   class << self
     def sample?(opts = {})
       begin
-        return false unless Oboe.always?
+        return false unless Oboe.always? && Oboe.loaded
 
         # Assure defaults since SWIG enforces Strings
         layer   = opts[:layer]      ? opts[:layer].strip      : ''
@@ -94,13 +94,23 @@ module Oboe
 
         rv = Oboe::Context.sampleRequest(layer, xtrace, tv_meta)
 
-        # For older liboboe that returns true/false, just return that.
-        return rv if [TrueClass, FalseClass].include?(rv.class) || (rv == 0)
-
-        # liboboe version > 1.3.1 returning a bit masked integer with SampleRate and
-        # source embedded
-        Oboe.sample_rate = (rv & SAMPLE_RATE_MASK)
-        Oboe.sample_source = (rv & SAMPLE_SOURCE_MASK) >> 24
+        if rv == 0
+          if ENV.key?('OBOE_GEM_TEST')
+            # When in test, always trace and don't clear
+            # the stored sample rate/source
+            true
+          else
+            Oboe.sample_rate = -1
+            Oboe.sample_source = -1
+            false
+          end
+        else
+          # liboboe version > 1.3.1 returning a bit masked integer with SampleRate and
+          # source embedded
+          Oboe.sample_rate = (rv & SAMPLE_RATE_MASK)
+          Oboe.sample_source = (rv & SAMPLE_SOURCE_MASK) >> 24
+          true
+        end
       rescue StandardError => e
         Oboe.logger.debug "[oboe/error] sample? error: #{e.inspect}"
         false

data/test/frameworks/apps/grape_simple.rb

@@ -1,7 +1,6 @@
 require 'grape'
 
 class GrapeSimple < Grape::API
-  set :reload, true
 
   get '/json_endpoint' do
     present({ :test => true })

data/test/instrumentation/rack_test.rb

@@ -45,6 +45,8 @@ class RackTestApp < Minitest::Test
 
     assert traces[0].has_key?('SampleRate')
     assert traces[0].has_key?('SampleSource')
+    assert traces[1].has_key?('ProcessID')
+    assert traces[1].has_key?('ThreadID')
 
     assert last_response.ok?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oboe
 version: !ruby/object:Gem::Version
-  version: 2.7.7.1
+  version: 2.7.8.1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-14 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -187,36 +187,36 @@ signing_key:
 specification_version: 4
 summary: AppNeta TraceView performance instrumentation gem for Ruby
 test_files:
-- test/support/config_test.rb
-- test/support/xtrace_test.rb
-- test/support/liboboe_settings_test.rb
-- test/profiling/method_test.rb
-- test/minitest_helper.rb
-- test/frameworks/sinatra_test.rb
 - test/frameworks/grape_test.rb
+- test/frameworks/padrino_test.rb
+- test/frameworks/sinatra_test.rb
 - test/frameworks/apps/sinatra_simple.rb
-- test/frameworks/apps/grape_simple.rb
 - test/frameworks/apps/padrino_simple.rb
-- test/frameworks/padrino_test.rb
-- test/instrumentation/memcache_test.rb
-- test/instrumentation/moped_test.rb
-- test/instrumentation/rack_test.rb
-- test/instrumentation/http_test.rb
+- test/frameworks/apps/grape_simple.rb
+- test/minitest_helper.rb
+- test/instrumentation/mongo_test.rb
 - test/instrumentation/redis_hashes_test.rb
-- test/instrumentation/em_http_request_test.rb
+- test/instrumentation/sequel_pg_test.rb
 - test/instrumentation/redis_misc_test.rb
-- test/instrumentation/redis_sets_test.rb
-- test/instrumentation/memcached_test.rb
+- test/instrumentation/dalli_test.rb
 - test/instrumentation/redis_keys_test.rb
+- test/instrumentation/redis_sortedsets_test.rb
+- test/instrumentation/redis_strings_test.rb
+- test/instrumentation/sequel_mysql_test.rb
+- test/instrumentation/redis_sets_test.rb
+- test/instrumentation/http_test.rb
 - test/instrumentation/typhoeus_test.rb
 - test/instrumentation/resque_test.rb
+- test/instrumentation/em_http_request_test.rb
+- test/instrumentation/moped_test.rb
+- test/instrumentation/rack_test.rb
+- test/instrumentation/memcache_test.rb
 - test/instrumentation/faraday_test.rb
-- test/instrumentation/redis_sortedsets_test.rb
-- test/instrumentation/dalli_test.rb
-- test/instrumentation/sequel_mysql_test.rb
 - test/instrumentation/redis_lists_test.rb
-- test/instrumentation/cassandra_test.rb
-- test/instrumentation/redis_strings_test.rb
-- test/instrumentation/sequel_pg_test.rb
-- test/instrumentation/mongo_test.rb
 - test/instrumentation/sequel_mysql2_test.rb
+- test/instrumentation/cassandra_test.rb
+- test/instrumentation/memcached_test.rb
+- test/profiling/method_test.rb
+- test/support/liboboe_settings_test.rb
+- test/support/config_test.rb
+- test/support/xtrace_test.rb