oboe-heroku 0.8.0.1 → 0.8.0.9

data/ext/oboe_metal/src/libs/liboboe.la

@@ -17,7 +17,7 @@ old_library='liboboe.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -levent -L/tmp/local/lib -lfb303 /tmp/local/lib/libthrift.la /tmp/local/lib/libthriftnb.la /tmp/local/lib/libthriftz.la -lssl -lboost_thread -lboost_date_time -lpthread -lcrypto /tmp/local/lib/libevent.la -lrt'
+dependency_libs=' -L/tmp/local/lib -lfb303 /tmp/local/lib/libthrift.la -L/tmp/local//lib /tmp/local/lib/libthriftnb.la /tmp/local/lib/libthriftz.la -lssl -lrt -lboost_thread -lboost_date_time -lpthread -lcrypto /tmp/local/lib/libevent.la -levent'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''

data/ext/oboe_metal/src/{oboe.h → oboe/oboe.h}

@@ -47,6 +47,10 @@ extern "C" {
 #define OBOE_REPORTER_PROTOCOL_FILE "file"
 #define OBOE_REPORTER_PROTOCOL_UDP "udp"
 #define OBOE_REPORTER_PROTOCOL_SSL "ssl"
+#define OBOE_REPORTER_PROTOCOL_DEFAULT OBOE_REPORTER_PROTOCOL_UDP
+
+/** Maximum reasonable length of an arguments string for configuring a reporter. */
+#define OBOE_REPORTER_ARGS_SIZE 4000
 
 // structs
 
@@ -335,9 +339,12 @@ int oboe_sample_request(const char *layer, const char *in_xtrace, oboe_settings_
 /**
  * Check if this request should be sampled.
  *
- * Checks for sample rate flags and settings for the specified layer, considers any
- * special features in the X-Trace and X-TV-Meta HTTP headers, and, if appropriate,
- * rolls the virtual dice to decide if this request should be sampled.
+ * Checks for sample rate flags and settings for the specified layer, considers
+ * the current tracing mode and any special features in the X-Trace and
+ * X-TV-Meta HTTP headers, and, if appropriate, rolls the virtual dice to
+ * decide if this request should be sampled.
+ *
+ * This is designed to be called once per layer per request.
  *
  * This replaces oboe_sample_request with a version that uses the settings
  * configuration kept in thread-local storage and takes the X-TV-Meta HTTP
@@ -384,7 +391,6 @@ extern int oboe_config_check_version(int version, int revision);
 extern int oboe_config_get_version();
 
 /**
-<<<<<<< HEAD
  * Prototype for a logger call-back function.
  *
  * A logging function of this form can be added to the logger chain using

data/ext/oboe_metal/src/oboe.hpp

@@ -8,7 +8,7 @@
 #define OBOE_HPP
 
 #include <string>
-#include <oboe.h>
+#include <oboe/oboe.h>
 
 
 class Event;
@@ -116,19 +116,19 @@ public:
     }
 
     /**
-     *  Check if the current request should be sampled based on settings.
+     * 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.
-     *  Otherwise sampling will be considered as adding to the current trace.
-     *  Different layers may have special rules.
+     * If in_xtrace is empty, 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.
      *
-     *  If a valid X-TV-Meta identifier is provided and AppView Web sample
-     *  always is enabled then return true independent of the other conditions.
+     * This is designed to be called once per layer per request.
      *
      *  @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 we should trace; otherwise false.
+     *  @return True if the request should be traced; otherwise false.
      */
     static bool sampleRequest(
         std::string layer,

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.4
+ * Version 2.0.11
  * 
  * 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
+#  define SWIG_AddCast(r) (r)
 #  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 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) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -505,24 +505,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   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_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;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -1398,7 +1387,7 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
 
 /* Runtime API */
 
-#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule()	
+#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer) 		SWIG_Ruby_SetModule(pointer)
 
 
@@ -1552,7 +1541,7 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
         downcast methods. */
       if (obj != Qnil) {
         VALUE value = rb_iv_get(obj, "@__swigtype__");
-        char* type_name = RSTRING_PTR(value);
+        const char* type_name = RSTRING_PTR(value);
 				
         if (strcmp(type->name, type_name) == 0) {
           return obj;
@@ -1734,7 +1723,7 @@ SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty) {
 }
 
 SWIGRUNTIME swig_module_info *
-SWIG_Ruby_GetModule(void)
+SWIG_Ruby_GetModule(void *SWIGUNUSEDPARM(clientdata))
 {
   VALUE pointer;
   swig_module_info *ret = 0;
@@ -1774,7 +1763,7 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 SWIGINTERN
 int SWIG_Ruby_isCallable( VALUE proc )
 {
-  if ( rb_respond_to( proc, swig_call_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_call_id ) )
     return 1;
   return 0;
 }
@@ -1787,7 +1776,7 @@ int SWIG_Ruby_isCallable( VALUE proc )
 SWIGINTERN
 int SWIG_Ruby_arity( VALUE proc, int minimal )
 {
-  if ( rb_respond_to( proc, swig_arity_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_arity_id ) )
     {
       VALUE num = rb_funcall( proc, swig_arity_id, 0 );
       int arity = NUM2INT(num);
@@ -1842,7 +1831,7 @@ static VALUE mOboe_metal;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020004 
+#define SWIGVERSION 0x020011 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1896,11 +1885,7 @@ 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) {
@@ -1999,7 +1984,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/share/swig2.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/local/share/swig/2.0.11/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2047,7 +2032,7 @@ SWIG_AsVal_int (VALUE obj, int *val)
 
 
 
-/*@SWIG:/usr/share/swig2.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/local/share/swig/2.0.11/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2075,7 +2060,7 @@ SWIG_AsVal_double (VALUE obj, double *val)
   return SWIG_TypeError;
 }
 
-swig_class SwigClassMetadata;
+static swig_class SwigClassMetadata;
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 SWIGINTERN VALUE
@@ -2260,7 +2245,7 @@ fail:
 }
 
 
-swig_class SwigClassContext;
+static swig_class SwigClassContext;
 
 SWIGINTERN VALUE
 _wrap_Context_setTracingMode(int argc, VALUE *argv, VALUE self) {
@@ -2605,7 +2590,7 @@ free_Context(Context *arg1) {
     delete arg1;
 }
 
-swig_class SwigClassEvent;
+static swig_class SwigClassEvent;
 
 SWIGINTERN void
 free_Event(Event *arg1) {
@@ -3052,7 +3037,7 @@ fail:
 }
 
 
-swig_class SwigClassReporter;
+static swig_class SwigClassReporter;
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 SWIGINTERN VALUE
@@ -3239,7 +3224,7 @@ fail:
 }
 
 
-swig_class SwigClassSslReporter;
+static swig_class SwigClassSslReporter;
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 SWIGINTERN VALUE
@@ -3415,7 +3400,7 @@ fail:
 }
 
 
-swig_class SwigClassUdpReporter;
+static swig_class SwigClassUdpReporter;
 
 SWIGINTERN VALUE
 _wrap_new_UdpReporter__SWIG_0(int argc, VALUE *argv, VALUE self) {
@@ -3668,7 +3653,7 @@ fail:
 }
 
 
-swig_class SwigClassFileReporter;
+static swig_class SwigClassFileReporter;
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 SWIGINTERN VALUE
@@ -3844,7 +3829,7 @@ fail:
 }
 
 
-swig_class SwigClassDebugLogger;
+static swig_class SwigClassDebugLogger;
 
 SWIGINTERN VALUE
 _wrap_DebugLogger_log(int argc, VALUE *argv, VALUE self) {
@@ -3983,7 +3968,7 @@ fail:
 }
 
 
-swig_class SwigClassDebugLog;
+static swig_class SwigClassDebugLog;
 
 SWIGINTERN VALUE
 _wrap_DebugLog_getLevelName(int argc, VALUE *argv, VALUE self) {
@@ -4289,7 +4274,7 @@ free_DebugLog(DebugLog *arg1) {
     delete arg1;
 }
 
-swig_class SwigClassConfig;
+static swig_class SwigClassConfig;
 
 SWIGINTERN VALUE
 _wrap_Config_checkVersion(int argc, VALUE *argv, VALUE self) {
@@ -4520,8 +4505,6 @@ 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 */
@@ -4559,7 +4542,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
 
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters 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/heroku_metal.rb

@@ -54,30 +54,22 @@ module Oboe
       Oboe::Config[:tracing_mode].to_s == "always"
     end
     
-    def continue?
-      Oboe::Context.isValid and not Oboe.never?
-    end
-    
     def never?
       Oboe::Config[:tracing_mode].to_s == "never"
     end
 
-    def now?
-      Oboe::Context.isValid and not Oboe.never?
-    end
-    
     def passthrough?
       ["always", "through"].include?(Oboe::Config[:tracing_mode])
     end
       
-    def sample?
-      Oboe::Context.sampleRequest('', '', '')
+    def sample?(opts = {})
+      # Assure defaults since SWIG enforces Strings
+      opts[:layer]      ||= ''
+      opts[:xtrace]     ||= ''
+      opts['X-TV-Meta'] ||= ''
+      Oboe::Context.sampleRequest(opts[:layer], opts[:xtrace], opts['X-TV-Meta'])
     end
 
-    def start?
-      not Oboe::Context.isValid and Oboe.always?
-    end
-    
     def through?
       Oboe::Config[:tracing_mode] == "through"
     end

data/lib/oboe-heroku/version.rb

@@ -3,7 +3,7 @@ class OboeHeroku
     MAJOR = 0
     MINOR = 8
     PATCH = 0
-    BUILD = 1
+    BUILD = 9
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

data/oboe-heroku.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
    
     s.extensions = ['ext/oboe_metal/extconf.rb']
     
-    s.add_dependency(%q<oboe>, [">= 2.1.1"])
+    s.add_dependency(%q<oboe>, [">= 2.1.3"])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oboe-heroku
 version: !ruby/object:Gem::Version
-  version: 0.8.0.1
+  version: 0.8.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oboe
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.3
 description: The oboe-heroku gem provides TraceView instrumentation for Ruby and Ruby
   frameworks on Heroku.
 email: traceviewsupport@appneta.com
@@ -60,9 +60,9 @@ files:
 - ext/oboe_metal/src/libs/libthriftnb.la
 - ext/oboe_metal/src/libs/libthriftz-0.9.0.so
 - ext/oboe_metal/src/libs/libthriftz.la
-- ext/oboe_metal/src/oboe.h
 - ext/oboe_metal/src/oboe.hpp
-- ext/oboe_metal/src/oboe_debug.h
+- ext/oboe_metal/src/oboe/oboe.h
+- ext/oboe_metal/src/oboe/oboe_debug.h
 - ext/oboe_metal/src/oboe_wrap.cxx
 - lib/heroku_metal.rb
 - lib/oboe-heroku.rb