oboe-heroku 0.9.0.1 → 0.9.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa6cde0325de70e2f6e7218a1c9f4268f136834a
-  data.tar.gz: 38e42a03e506dc439db13cc4ef2535d1dacef956
+  metadata.gz: c750cd90cba44aa258f1606bad70bc038676dede
+  data.tar.gz: 57730112d66e41b7781f56e6f01b9cb8021838f4
 SHA512:
-  metadata.gz: 35790a7bb3634e1750299e97451bea1f3be21853dac3d9cd94ed0cfe2dff50d448a6a4fc445e6d7a3cf222d22e783d5b215fe501ad0bb44d286a1a6b9fcceed6
-  data.tar.gz: 9365f4ac4a3c1942e9d512a28811c62b8200ad4567f69c83f866de7faf894b0ed21f1940aa7030f02f4479ec9f489da12dd00610caa6ab3e7160f069e734812c
+  metadata.gz: 854c13b9e3321e41cb1199cf1807b7c71437253386b1bc0042ab95a1a28d1731f1f1bd6b569c492ecc0692bdbe64f2a9fef9039782955052be634ea70b02f84c
+  data.tar.gz: 2b4f3a7a705bb209c850a01506829c32a0f15c0c8fa7327444e446fc5c861791121ddb7af93f5a9f467268f807955b22627e47642943ec340fffa097c1c9a2bd

data/ext/oboe_metal/src/oboe.hpp

@@ -118,7 +118,8 @@ public:
     /**
      * Check if the current request should be traced based on the current settings.
      *
-     * If in_xtrace is empty, then sampling will be considered as a new trace.
+     * If in_xtrace is empty, or if it is identified as a foreign (ie. cross customer)
+     * trace, then sampling will be considered as a new trace.
      * Otherwise sampling will be considered as adding to the current trace.
      * Different layers may have special rules.  Also special rules for AppView
      * Web synthetic traces apply if in_tv_meta is given a non-empty string.
@@ -128,14 +129,19 @@ public:
      *  @param layer Name of the layer being considered for tracing
      *  @param in_xtrace Incoming X-Trace ID (NULL or empty string if not present)
      *  @param in_tv_meta AppView Web ID from X-TV-Meta HTTP header or higher layer (NULL or empty string if not present).
-     *  @return True if the request should be traced; otherwise false.
+     *  @return Zero to not trace; otherwise return the sample rate used in the low order
+     *          bytes 0 to 2 and the sample source in the higher-order byte 3.
      */
-    static bool sampleRequest(
+    static int sampleRequest(
         std::string layer,
         std::string in_xtrace,
         std::string in_tv_meta)
     {
-        return (oboe_sample_layer(layer.c_str(), in_xtrace.c_str(), in_tv_meta.c_str(), NULL, NULL));
+        int sample_rate = 0;
+        int sample_source = 0;
+        int rc = (oboe_sample_layer(layer.c_str(), in_xtrace.c_str(), in_tv_meta.c_str(), &sample_rate, &sample_source));
+
+        return (rc == 0 ? 0 : (((sample_source & 0xFF) << 24) | (sample_rate & 0xFFFFFF)));
     }
 
     /**

data/ext/oboe_metal/src/oboe_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.4
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -422,7 +422,7 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
   return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast(r) (r)
+#  define SWIG_AddCast
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -486,18 +486,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCmp(const char *nb, const char *tb) {
-  int equiv = 1;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  int equiv = 0;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (equiv != 0 && *ne) {
+  while (!equiv && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
+    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
     if (*ne) ++ne;
   }
   return equiv;
@@ -505,13 +505,24 @@ SWIG_TypeCmp(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
+SWIG_TypeCompare(const char *nb, const char *tb) {
+  int equiv = 0;
+  const char* te = tb + strlen(tb);
+  const char* ne = nb;
+  while (!equiv && *ne) {
+    for (nb = ne; *ne; ++ne) {
+      if (*ne == '|') break;
+    }
+    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    if (*ne) ++ne;
+  }
+  return equiv;
 }
 
+
 /*
   Check the typename
 */
@@ -1387,7 +1398,7 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
 
 /* Runtime API */
 
-#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule(clientdata)
+#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule()	
 #define SWIG_SetModule(clientdata, pointer) 		SWIG_Ruby_SetModule(pointer)
 
 
@@ -1541,7 +1552,7 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
         downcast methods. */
       if (obj != Qnil) {
         VALUE value = rb_iv_get(obj, "@__swigtype__");
-        const char* type_name = RSTRING_PTR(value);
+        char* type_name = RSTRING_PTR(value);
 				
         if (strcmp(type->name, type_name) == 0) {
           return obj;
@@ -1723,7 +1734,7 @@ SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty) {
 }
 
 SWIGRUNTIME swig_module_info *
-SWIG_Ruby_GetModule(void *SWIGUNUSEDPARM(clientdata))
+SWIG_Ruby_GetModule(void)
 {
   VALUE pointer;
   swig_module_info *ret = 0;
@@ -1763,7 +1774,7 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 SWIGINTERN
 int SWIG_Ruby_isCallable( VALUE proc )
 {
-  if ( rb_respond_to( proc, swig_call_id ) )
+  if ( rb_respond_to( proc, swig_call_id ) == Qtrue )
     return 1;
   return 0;
 }
@@ -1776,7 +1787,7 @@ int SWIG_Ruby_isCallable( VALUE proc )
 SWIGINTERN
 int SWIG_Ruby_arity( VALUE proc, int minimal )
 {
-  if ( rb_respond_to( proc, swig_arity_id ) )
+  if ( rb_respond_to( proc, swig_arity_id ) == Qtrue )
     {
       VALUE num = rb_funcall( proc, swig_arity_id, 0 );
       int arity = NUM2INT(num);
@@ -1831,7 +1842,7 @@ static VALUE mOboe_metal;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020011 
+#define SWIGVERSION 0x020004 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1885,7 +1896,11 @@ SWIGINTERN int
 SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 {
   if (TYPE(obj) == T_STRING) {
+    #if defined(StringValuePtr)
     char *cstr = StringValuePtr(obj); 
+    #else
+    char *cstr = STR2CSTR(obj);
+    #endif
     size_t size = RSTRING_LEN(obj) + 1;
     if (cptr)  {
       if (alloc) {
@@ -1984,7 +1999,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/tmp/local/share/swig/2.0.11/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig2.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2032,7 +2047,7 @@ SWIG_AsVal_int (VALUE obj, int *val)
 
 
 
-/*@SWIG:/tmp/local/share/swig/2.0.11/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig2.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2060,7 +2075,7 @@ SWIG_AsVal_double (VALUE obj, double *val)
   return SWIG_TypeError;
 }
 
-static swig_class SwigClassMetadata;
+swig_class SwigClassMetadata;
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 SWIGINTERN VALUE
@@ -2245,7 +2260,7 @@ fail:
 }
 
 
-static swig_class SwigClassContext;
+swig_class SwigClassContext;
 
 SWIGINTERN VALUE
 _wrap_Context_setTracingMode(int argc, VALUE *argv, VALUE self) {
@@ -2294,7 +2309,7 @@ _wrap_Context_sampleRequest(int argc, VALUE *argv, VALUE self) {
   std::string arg1 ;
   std::string arg2 ;
   std::string arg3 ;
-  bool result;
+  int result;
   VALUE vresult = Qnil;
   
   if ((argc < 3) || (argc > 3)) {
@@ -2327,8 +2342,8 @@ _wrap_Context_sampleRequest(int argc, VALUE *argv, VALUE self) {
     arg3 = *ptr;
     if (SWIG_IsNewObj(res)) delete ptr;
   }
-  result = (bool)Context::sampleRequest(arg1,arg2,arg3);
-  vresult = SWIG_From_bool(static_cast< bool >(result));
+  result = (int)Context::sampleRequest(arg1,arg2,arg3);
+  vresult = SWIG_From_int(static_cast< int >(result));
   return vresult;
 fail:
   return Qnil;
@@ -2590,7 +2605,7 @@ free_Context(Context *arg1) {
     delete arg1;
 }
 
-static swig_class SwigClassEvent;
+swig_class SwigClassEvent;
 
 SWIGINTERN void
 free_Event(Event *arg1) {
@@ -3037,7 +3052,7 @@ fail:
 }
 
 
-static swig_class SwigClassReporter;
+swig_class SwigClassReporter;
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 SWIGINTERN VALUE
@@ -3224,7 +3239,7 @@ fail:
 }
 
 
-static swig_class SwigClassSslReporter;
+swig_class SwigClassSslReporter;
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 SWIGINTERN VALUE
@@ -3400,7 +3415,7 @@ fail:
 }
 
 
-static swig_class SwigClassUdpReporter;
+swig_class SwigClassUdpReporter;
 
 SWIGINTERN VALUE
 _wrap_new_UdpReporter__SWIG_0(int argc, VALUE *argv, VALUE self) {
@@ -3653,7 +3668,7 @@ fail:
 }
 
 
-static swig_class SwigClassFileReporter;
+swig_class SwigClassFileReporter;
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 SWIGINTERN VALUE
@@ -3829,7 +3844,7 @@ fail:
 }
 
 
-static swig_class SwigClassDebugLogger;
+swig_class SwigClassDebugLogger;
 
 SWIGINTERN VALUE
 _wrap_DebugLogger_log(int argc, VALUE *argv, VALUE self) {
@@ -3968,7 +3983,7 @@ fail:
 }
 
 
-static swig_class SwigClassDebugLog;
+swig_class SwigClassDebugLog;
 
 SWIGINTERN VALUE
 _wrap_DebugLog_getLevelName(int argc, VALUE *argv, VALUE self) {
@@ -4274,7 +4289,7 @@ free_DebugLog(DebugLog *arg1) {
     delete arg1;
 }
 
-static swig_class SwigClassConfig;
+swig_class SwigClassConfig;
 
 SWIGINTERN VALUE
 _wrap_Config_checkVersion(int argc, VALUE *argv, VALUE self) {
@@ -4505,6 +4520,8 @@ SWIG_InitializeModule(void *clientdata) {
   swig_module_info *module_head, *iter;
   int found, init;
 
+  clientdata = clientdata;
+
   /* check to see if the circular list has been setup, if not, set it up */
   if (swig_module.next==0) {
     /* Initialize the swig_module */
@@ -4542,7 +4559,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
 
-  /* When multiple interpreters are used, a module could have already been initialized in
+  /* When multiple interpeters are used, a module could have already been initialized in
      a different interpreter, but not yet have a pointer in this interpreter.
      In this case, we do not want to continue adding types... everything should be
      set up already */

data/lib/base.rb

@@ -1,9 +1,32 @@
 # Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
+  
+# Constants from liboboe
+OBOE_TRACE_NEVER   = 0
+OBOE_TRACE_ALWAYS  = 1
+OBOE_TRACE_THROUGH = 2
+
+OBOE_SAMPLE_RATE_SOURCE_FILE                   = 1
+OBOE_SAMPLE_RATE_SOURCE_DEFAULT                = 2
+OBOE_SAMPLE_RATE_SOURCE_OBOE                   = 3
+OBOE_SAMPLE_RATE_SOURCE_LAST_OBOE              = 4
+OBOE_SAMPLE_RATE_SOURCE_DEFAULT_MISCONFIGURED  = 5
+OBOE_SAMPLE_RATE_SOURCE_OBOE_DEFAULT           = 6
+
+# Masks for bitwise ops
+ZERO_MASK = 0b00000000000000000000000000
+
+SAMPLE_RATE_MASK   = 0b00111111111111111111111111
+SAMPLE_SOURCE_MASK = 0b11000000000000000000000000
+
+ZERO_SAMPLE_RATE_MASK   = 0b11000000000000000000000000
+ZERO_SAMPLE_SOURCE_MASK = 0b00111111111111111111111111
 
 module OboeBase
   attr_accessor :reporter
   attr_accessor :loaded
+  attr_accessor :sample_source
+  attr_accessor :sample_rate
 
   def self.included(cls)
     self.loaded = true

data/lib/heroku_metal.rb

@@ -44,7 +44,9 @@ module Oboe_metal
     #
     def self.start
       begin
-        Oboe_metal::Context.init() 
+        Oboe_metal::Context.init()
+
+        Oboe.logger.debug "[oboe/debug] Initializing Heroku based reporter."
         
         # The Oboe Reporter is configured via Heroku config variables.
         Oboe.reporter = Oboe::Reporter.new(nil, nil)
@@ -68,13 +70,23 @@ module Oboe
   include Oboe_metal
 
   class << self
-
     def sample?(opts = {})
       # Assure defaults since SWIG enforces Strings
       opts[:layer]      ||= ''
       opts[:xtrace]     ||= ''
-      opts['TV-Meta']   ||= ''
-      Oboe::Context.sampleRequest(opts[:layer], opts[:xtrace], opts['TV-Meta'])
+      opts['X-TV-Meta'] ||= ''
+
+      rv = Oboe::Context.sampleRequest(opts[:layer], opts[:xtrace], opts['X-TV-Meta'])
+
+      # For older liboboe that returns true/false, just return that.
+      return rv if [TrueClass, FalseClass].include?(rv.class) or (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
+
+      rv
     end
     
     def set_tracing_mode(mode)
@@ -84,21 +96,20 @@ module Oboe
 
       case value
       when :never
-        # OBOE_TRACE_NEVER
-        Oboe::Context.setTracingMode(0)
+        Oboe::Context.setTracingMode(OBOE_TRACE_NEVER)
+
       when :always
-        # OBOE_TRACE_ALWAYS
-        Oboe::Context.setTracingMode(1)
+        Oboe::Context.setTracingMode(OBOE_TRACE_ALWAYS)
+
       when :through
-        # OBOE_TRACE_THROUGH
-        Oboe::Context.setTracingMode(2)
+        Oboe::Context.setTracingMode(OBOE_TRACE_THROUGH)
+
       else
         Oboe.logger.fatal "[oboe/error] Invalid tracing mode set: #{mode}"
-        # OBOE_TRACE_ALWAYS
-        Oboe::Context.setTracingMode(1)
+        Oboe::Context.setTracingMode(OBOE_TRACE_THROUGH)
       end
     end
-    
+
     def set_sample_rate(rate)
       if Oboe.loaded
         # Update liboboe with the new SampleRate value

data/lib/oboe-heroku.rb

@@ -19,7 +19,7 @@ begin
     # Require the core oboe gem
     require 'oboe'
 
-    ::OboeHeroku::Loading.initialize
+    ::OboeHeroku::Loading.configure
   end
 rescue Exception => e
   $stderr.puts "[oboe-heroku/error] Problem loading: #{e.message}"

data/lib/oboe-heroku/loading.rb

@@ -1,7 +1,7 @@
 module OboeHeroku
   module Loading
 
-    def self.initialize
+    def self.configure
       # OBOE_TRACE_NEVER   0
       # OBOE_TRACE_ALWAYS  1
       # OBOE_TRACE_THROUGH 2
@@ -27,7 +27,7 @@ module OboeHeroku
         # OBOE_TRACE_ALWAYS
         Oboe::Context.setTracingMode(1)
       end
-    end # self.initialize_heroku
+    end # self.configure
 
   end
 end

data/lib/oboe-heroku/version.rb

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

data/oboe-heroku.gemspec

@@ -5,6 +5,8 @@ Gem::Specification.new do |s|
   s.name = %q{oboe-heroku}
   s.version = OboeHeroku::Version::STRING
   s.date = Time.now.strftime('%Y-%m-%d')
+
+  s.license = "AppNeta Open License, Version 1.0"
   
   s.authors = ["Peter Giacomo Lombardo", "Guy Lancaster"]
   s.email = %q{traceviewsupport@appneta.com}
@@ -18,7 +20,7 @@ Gem::Specification.new do |s|
    
   s.extensions = ['ext/oboe_metal/extconf.rb']
     
-  s.add_dependency(%q<oboe>, [">= 2.3.3.7"])
+  s.add_dependency(%q<oboe>, [">= 2.4.0.1"])
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oboe-heroku
 version: !ruby/object:Gem::Version
-  version: 0.9.0.1
+  version: 0.9.7.1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oboe
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.3.3.7
+        version: 2.4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.3.3.7
+        version: 2.4.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +99,8 @@ files:
 - oboe-heroku.gemspec
 - tasks/.keep
 homepage: http://www.appneta.com/application-performance-management
-licenses: []
+licenses:
+- AppNeta Open License, Version 1.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: AppNeta TraceView performance instrumentation gem for the Heroku platform