oboe 2.3.4.1 → 2.4.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 33bba2d752d8947638ef9b22ad51e4b5c947e8a8
+  data.tar.gz: b4f96bd122d67e99bf6647203b51097c49181e8c
+SHA512:
+  metadata.gz: 78319d63f067e929ac9e293be2770b9c820bf853ee713f301169a5d905a69a1d0edb8218288d6fa65cf9de749f9487642ad826974faae49fc06af8c5ca118bb1
+  data.tar.gz: a985bb58d63612bc8c93304ae3c3a5ea25e48a27c4a1856a945d3d919a4a3e556f68959d6fd2d0e8062246abe2d2ac51ba7cf3aa409442e0401e75122ab66cea

data/.travis.yml

@@ -7,11 +7,15 @@ rvm:
   - ree
 
 # Attempt Travis/Cassandra fix re: https://github.com/travis-ci/travis-ci/issues/1484
+# Updated Cassandra: https://github.com/travis-ci/travis-ci/issues/1650
 before_install:
-#  - sudo sh -c "echo 'JVM_OPTS=\"\${JVM_OPTS} -Djava.net.preferIPv4Stack=false\"' >> /usr/local/cassandra/conf/cassandra-env.sh"
-#  - echo "127.0.0.1 " `hostname` | sudo tee /etc/hosts
-#  - sudo service cassandra start
-#  - sleep 5
+  - gem update --system 2.1.11
+  - gem --version
+  - sudo sh -c "echo 'JVM_OPTS=\"\${JVM_OPTS} -Djava.net.preferIPv4Stack=false\"' >> /usr/local/cassandra/conf/cassandra-env.sh"
+  - echo "127.0.0.1 " `hostname` | sudo tee /etc/hosts
+  - sudo service cassandra start
+
+before_script: sleep 10
 
 install: 
   - wget https://www.tracelytics.com/install_tracelytics.sh
@@ -24,5 +28,5 @@ before_script:
 services: 
   - mongodb
   - memcached
-#  - cassandra
+  - cassandra
 

data/CHANGELOG

@@ -1,3 +1,15 @@
+# oboe 2.4.0.1 (01/12/13)
+
+* Report SampleRate & SampleSource per updated SWIG API
+* Change OboeHeroku __Init Key 
+* Remove oboe_fu artifacts
+* CodeClimate Initiated improvements
+* Remove SSL connection requirement from Net::HTTP tests
+* oboe.gemspec doesn't specify Ruby 1.8 json dependency
+* add config to blacklist tracing of actions (thanks @nathantsoi!)
+* Report the application server used
+* Support Oboe::Config.merge! and warn on non-existent (thanks @adamjt!)
+
 # oboe 2.3.4.1 (11/21/13)
 
 * Stacks that use a caching system like Varnish could see corrupted traces; fixed. 

data/Gemfile

@@ -3,13 +3,13 @@ source 'https://rubygems.org'
 # Import dependencies from oboe.gemspec
 gemspec :name => 'oboe'
 
-gem 'rake'
 
 group :development, :test do
   gem 'minitest'
   gem 'minitest-reporters'
   gem 'rack-test'
   gem 'appraisal'
+  gem 'bson'
 end
 
 group :development do
@@ -17,6 +17,7 @@ group :development do
   gem 'ruby-debug19', :platform => :mri_19, :require => 'ruby-debug'
   gem 'debugger',     :platform => :mri_20 
   gem 'perftools.rb', :platform => :mri,    :require => 'perftools'
+  gem 'pry'
 end
 
 # Instrumented gems
@@ -28,5 +29,4 @@ gem 'mongo'
 gem 'bson_ext' # For Mongo, Yours Truly
 gem 'moped' unless (RUBY_VERSION =~ /^1.8/) == 0
 gem 'resque'
-gem 'rack-test'
 

data/README.md

@@ -9,6 +9,10 @@ It has the ability to report performance metrics on an array of libraries, datab
 
 It requires a [TraceView](http://www.appneta.com/products/traceview/) account to view metrics.  Get yours, [it's free](http://www.appneta.com/products/traceview-free-account/).
 
+[![Gem Version](https://badge.fury.io/rb/oboe.png)](http://badge.fury.io/rb/oboe)
+[![Build Status](https://travis-ci.org/appneta/oboe-ruby.png?branch=master)](https://travis-ci.org/appneta/oboe-ruby)
+[![Code Climate](https://codeclimate.com/github/appneta/oboe-ruby.png)](https://codeclimate.com/github/appneta/oboe-ruby)
+
 # Installation
 
 The oboe gem is [available on Rubygems](https://rubygems.org/gems/oboe) and can be installed with:

data/ext/oboe_metal/src/oboe.hpp

@@ -91,26 +91,32 @@ 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 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.
      *
-     *  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.
+     * @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 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)));
     }
 
     // returns pointer to current context (from thread-local storage)

data/ext/oboe_metal/src/oboe_wrap.cxx

@@ -2029,6 +2029,16 @@ SWIG_AsVal_int (VALUE obj, int *val)
 }
 
 
+  #define SWIG_From_long   LONG2NUM 
+
+
+SWIGINTERNINLINE VALUE
+SWIG_From_int  (int value)
+{    
+  return SWIG_From_long  (value);
+}
+
+
 
 
 
@@ -2060,16 +2070,6 @@ SWIG_AsVal_double (VALUE obj, double *val)
   return SWIG_TypeError;
 }
 
-
-  #define SWIG_From_long   LONG2NUM 
-
-
-SWIGINTERNINLINE VALUE
-SWIG_From_int  (int value)
-{    
-  return SWIG_From_long  (value);
-}
-
 swig_class SwigClassMetadata;
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
@@ -2304,7 +2304,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)) {
@@ -2337,8 +2337,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;

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/oboe/api/layerinit.rb

@@ -15,9 +15,38 @@ module Oboe
           platform_info['Force']                   = true
           platform_info['Ruby.Platform.Version']   = RUBY_PLATFORM
           platform_info['Ruby.Version']            = RUBY_VERSION
-          platform_info['Ruby.Rails.Version']      = ::Rails.version if defined?(::Rails)
           platform_info['Ruby.Oboe.Version']       = ::Oboe::Version::STRING
-          platform_info['Ruby.OboeHeroku.Version'] = ::OboeHeroku::Version::STRING if defined?(::OboeHeroku)
+          platform_info['RubyHeroku.Oboe.Version'] = ::OboeHeroku::Version::STRING if defined?(::OboeHeroku)
+
+          # Report the framework in use
+          platform_info['Ruby.Rails.Version'] = "Rails-#{::Rails.version}"  if defined?(::Rails)
+          platform_info['Ruby.Grape.Version'] = "Grape-#{::Grape::VERSION}" if defined?(::Grape)
+          platform_info['Ruby.Cramp.Version'] = "Cramp-#{::Cramp::VERSION}" if defined?(::Cramp)
+
+          if defined?(::Padrino)
+            platform_info['Ruby.Padrino.Version'] = "Padrino-#{::Padrino::VERSION}"
+          elsif defined?(::Sinatra)
+            platform_info['Ruby.Sinatra.Version'] = "Sinatra-#{::Sinatra::VERSION}"
+          end
+
+          # Report the server in use (if possible)
+          if defined?(::Unicorn)
+            platform_info['Ruby.AppContainer.Version'] = "Unicorn-#{::Unicorn::Const::UNICORN_VERSION}"
+          elsif defined?(::Puma)
+            platform_info['Ruby.AppContainer.Version'] = "Puma-#{::Puma::Const::PUMA_VERSION} (#{::Puma::Const::CODE_NAME})"
+          elsif defined?(::PhusionPassenger)
+            platform_info['Ruby.AppContainer.Version'] = "#{::PhusionPassenger::PACKAGE_NAME}-#{::PhusionPassenger::VERSION_STRING}"
+          elsif defined?(::Thin)
+            platform_info['Ruby.AppContainer.Version'] = "Thin-#{::Thin::VERSION::STRING} (#{::Thin::VERSION::CODENAME})"
+          elsif defined?(::Mongrel)
+            platform_info['Ruby.AppContainer.Version'] = "Mongrel-#{::Mongrel::Const::MONGREL_VERSION}"
+          elsif defined?(::Mongrel2)
+            platform_info['Ruby.AppContainer.Version'] = "Mongrel2-#{::Mongrel2::VERSION}"
+          elsif defined?(::Trinidad)
+            platform_info['Ruby.AppContainer.Version'] = "Trinidad-#{::Trinidad::VERSION}"
+          else
+            platform_info['Ruby.AppContainer.Version'] = "Unknown"
+          end
         rescue
         end
 

data/lib/oboe/config.rb

@@ -62,16 +62,9 @@ module Oboe
       @@config[:sanitize_sql] = false
 
       # The default configuration
-      default_config = {
-        :tracing_mode => "through",
-        :reporter_host => "127.0.0.1",
-        :sample_rate => 300000,
-        :verbose => false 
-      }
-      update!(default_config)
-      
-      # For Initialization, mark this as the default SampleRate
-      @@config[:sample_source] = 2 # OBOE_SAMPLE_RATE_SOURCE_DEFAULT
+      @@config[:tracing_mode] = "through"
+      @@config[:reporter_host] = "127.0.0.1"
+      @@config[:verbose] = false
     end
 
     def self.update!(data)
@@ -80,6 +73,10 @@ module Oboe
       end
     end
 
+    def self.merge!(data)
+      self.update!(data)
+    end
+
     def self.[](key)
       @@config[key.to_sym]
     end
@@ -92,10 +89,6 @@ module Oboe
       end
 
       if key == :sample_rate
-        # When setting SampleRate, note that it's been manually set
-        # OBOE_SAMPLE_RATE_SOURCE_FILE == 1
-        @@config[:sample_source] = 1 
-
         unless value.is_a?(Integer) or value.is_a?(Float)
           raise "oboe :sample_rate must be a number between 1 and 1000000 (1m)" 
         end
@@ -121,6 +114,9 @@ module Oboe
       if sym.to_s =~ /(.+)=$/
         self[$1] = args.first
       else
+        unless @@config.has_key?(sym)
+          Oboe.logger.warn "[oboe/warn] Unknown method call on Oboe::Config: #{sym}"
+        end
         self[sym]
       end
     end

data/lib/oboe/frameworks/rails/inst/action_controller.rb

@@ -48,6 +48,9 @@ module Oboe
       end
       
       def process_action_with_oboe(method_name, *args)
+        return process_action_without_oboe(method_name, *args) if Oboe::Config[:action_blacklist].present? &&
+          Oboe::Config[:action_blacklist][[self.controller_name, self.action_name].join('#')]
+
         report_kvs = {
           :Controller   => self.class.name,
           :Action       => self.action_name,

data/lib/oboe/frameworks/rails/inst/connection_adapters/utils.rb

@@ -10,21 +10,13 @@ module Oboe
           opts = {}
 
           begin
-            if binds.empty? 
-              # Raw SQL.  Sanitize if requested
-              if Oboe::Config[:sanitize_sql]
-                opts[:Query] = sql.gsub(/\'[\s\S][^\']*\'/, '?')
-              else
-                opts[:Query] = sql.to_s
-              end
+            if Oboe::Config[:sanitize_sql]
+              # Sanitize SQL and don't report binds
+              opts[:Query] = sql.gsub(/\'[\s\S][^\']*\'/, '?')
             else
-              # We have bind parameters.  Only report if :sanitize_sql isn't true
-              unless Oboe::Config[:sanitize_sql]
-                opts[:Query] = sql.to_s
-                opts[:QueryArgs] = binds.map { |col, val| type_cast(val, col) }
-              else
-                opts[:Query] = sql.gsub(/\'[\s\S][^\']*\'/, '?')
-              end
+              # Report raw SQL and any binds if they exist
+              opts[:Query] = sql.to_s
+              opts[:QueryArgs] = binds.map { |col, val| type_cast(val, col) } unless binds.empty?
             end
 
             opts[:Name] = name.to_s if name
@@ -39,7 +31,7 @@ module Oboe
             opts[:Database]   = config["database"] if config.has_key?("database")
             opts[:RemoteHost] = config["host"]     if config.has_key?("host")
             opts[:Flavor]     = config["adapter"]  if config.has_key?("adapter")
-          rescue Exception => e
+          rescue StandardError => e
             Oboe.logger.debug "Exception raised capturing ActiveRecord KVs: #{e.inspect}"
             Oboe.logger.debug e.backtrace.join("\n")
           end

data/lib/oboe/inst/cassandra.rb

@@ -43,41 +43,33 @@ module Oboe
       end
 
       def insert_with_oboe(column_family, key, hash, options = {})
-        if Oboe.tracing?
-          report_kvs = extract_trace_details(:insert, column_family, key, hash, options)
+        return insert_without_oboe(column_family, key, hash, options = {}) unless Oboe.tracing?
 
-          Oboe::API.trace('cassandra', report_kvs) do
-            insert_without_oboe(column_family, key, hash, options = {})
-          end
-        else
+        report_kvs = extract_trace_details(:insert, column_family, key, hash, options)
+
+        Oboe::API.trace('cassandra', report_kvs) do
           insert_without_oboe(column_family, key, hash, options = {})
         end
       end
 
       def remove_with_oboe(column_family, key, *columns_and_options)
+        return send :remove_without_oboe, *args unless Oboe.tracing?
+
         args = [column_family, key] + columns_and_options
-        
-        if Oboe.tracing?
-          report_kvs = extract_trace_details(:remove, column_family, key, columns_and_options)
+        report_kvs = extract_trace_details(:remove, column_family, key, columns_and_options)
 
-          Oboe::API.trace('cassandra', report_kvs) do
-            send :remove_without_oboe, *args
-          end
-        else
+        Oboe::API.trace('cassandra', report_kvs) do
           send :remove_without_oboe, *args
         end
       end
 
       def count_columns_with_oboe(column_family, key, *columns_and_options)
+        return send :count_columns_without_oboe, *args unless Oboe.tracing?
+
         args = [column_family, key] + columns_and_options
-        
-        if Oboe.tracing?
-          report_kvs = extract_trace_details(:count_columns, column_family, key, columns_and_options)
+        report_kvs = extract_trace_details(:count_columns, column_family, key, columns_and_options)
 
-          Oboe::API.trace('cassandra', report_kvs) do
-            send :count_columns_without_oboe, *args
-          end
-        else
+        Oboe::API.trace('cassandra', report_kvs) do
           send :count_columns_without_oboe, *args
         end
       end
@@ -97,29 +89,23 @@ module Oboe
       end
       
       def multi_get_columns_with_oboe(column_family, key, *columns_and_options)
+        return send :multi_get_columns_without_oboe, *args unless Oboe.tracing?
+
         args = [column_family, key] + columns_and_options
-        
-        if Oboe.tracing?
-          report_kvs = extract_trace_details(:multi_get_columns, column_family, key, columns_and_options)
+        report_kvs = extract_trace_details(:multi_get_columns, column_family, key, columns_and_options)
 
-          Oboe::API.trace('cassandra', report_kvs, :multi_get_columns) do
-            send :multi_get_columns_without_oboe, *args
-          end
-        else
+        Oboe::API.trace('cassandra', report_kvs, :multi_get_columns) do
           send :multi_get_columns_without_oboe, *args
         end
       end
 
       def get_with_oboe(column_family, key, *columns_and_options)
+        return send :get_without_oboe, *args unless Oboe.tracing?
+
         args = [column_family, key] + columns_and_options
-        
-        if Oboe.tracing?
-          report_kvs = extract_trace_details(:get, column_family, key, columns_and_options)
+        report_kvs = extract_trace_details(:get, column_family, key, columns_and_options)
 
-          Oboe::API.trace('cassandra', report_kvs, :get) do
-            send :get_without_oboe, *args
-          end
-        else
+        Oboe::API.trace('cassandra', report_kvs, :get) do
           send :get_without_oboe, *args
         end
       end
@@ -139,15 +125,12 @@ module Oboe
       end
 
       def exists_with_oboe?(column_family, key, *columns_and_options)
+        return send :exists_without_oboe?, *args unless Oboe.tracing?
+
         args = [column_family, key] + columns_and_options
-        
-        if Oboe.tracing?
-          report_kvs = extract_trace_details(:exists?, column_family, key, columns_and_options)
+        report_kvs = extract_trace_details(:exists?, column_family, key, columns_and_options)
 
-          Oboe::API.trace('cassandra', report_kvs) do
-            send :exists_without_oboe?, *args
-          end
-        else
+        Oboe::API.trace('cassandra', report_kvs) do
           send :exists_without_oboe?, *args
         end
       end
@@ -166,117 +149,102 @@ module Oboe
       end
       
       def get_range_batch_with_oboe(column_family, options = {})
-        if Oboe.tracing?
-          report_kvs = extract_trace_details(:get_range_batch, column_family, nil, nil)
-          args = [column_family, options]
+        return get_range_batch_without_oboe(column_family, options) unless Oboe.tracing?
+          
+        report_kvs = extract_trace_details(:get_range_batch, column_family, nil, nil)
+        args = [column_family, options]
 
-          Oboe::API.trace('cassandra', report_kvs, :get_range_batch) do
-            get_range_batch_without_oboe(column_family, options)
-          end
-        else
+        Oboe::API.trace('cassandra', report_kvs, :get_range_batch) do
           get_range_batch_without_oboe(column_family, options)
         end
       end
       
       def get_indexed_slices_with_oboe(column_family, index_clause, *columns_and_options)
+        return send :get_indexed_slices_without_oboe, *args unless Oboe.tracing?
+
         args = [column_family, index_clause] + columns_and_options
-        
-        if Oboe.tracing?
-          report_kvs = extract_trace_details(:get_indexed_slices, column_family, nil, columns_and_options)
+        report_kvs = extract_trace_details(:get_indexed_slices, column_family, nil, columns_and_options)
 
-          Oboe::API.trace('cassandra', report_kvs) do
-            send :get_indexed_slices_without_oboe, *args
-          end
-        else
+        Oboe::API.trace('cassandra', report_kvs) do
           send :get_indexed_slices_without_oboe, *args
         end
       end
 
       def create_index_with_oboe(keyspace, column_family, column_name, validation_class)
-        if Oboe.tracing?
-          report_kvs = extract_trace_details(:create_index, column_family, nil, nil)
-          begin
-            report_kvs[:Keyspace] = keyspace.to_s
-            report_kvs[:Column_name] = column_name.to_s
-            report_kvs[:Validation_class] = validation_class.to_s
-          rescue
-          end
+        unless Oboe.tracing?
+          return create_index_without_oboe(keyspace, column_family, column_name, validation_class)
+        end
+          
+        report_kvs = extract_trace_details(:create_index, column_family, nil, nil)
+        begin
+          report_kvs[:Keyspace] = keyspace.to_s
+          report_kvs[:Column_name] = column_name.to_s
+          report_kvs[:Validation_class] = validation_class.to_s
+        rescue
+        end
 
-          Oboe::API.trace('cassandra', report_kvs) do
-            create_index_without_oboe(keyspace, column_family, column_name, validation_class)
-          end
-        else
+        Oboe::API.trace('cassandra', report_kvs) do
           create_index_without_oboe(keyspace, column_family, column_name, validation_class)
         end
       end
 
       def drop_index_with_oboe(keyspace, column_family, column_name)
-        if Oboe.tracing?
-          report_kvs = extract_trace_details(:drop_index, column_family, nil, nil)
-          begin
-            report_kvs[:Keyspace] = keyspace.to_s
-            report_kvs[:Column_name] = column_name.to_s
-          rescue
-          end
+        return drop_index_without_oboe(keyspace, column_family, column_name) unless Oboe.tracing?
+        
+        report_kvs = extract_trace_details(:drop_index, column_family, nil, nil)
+        begin
+          report_kvs[:Keyspace] = keyspace.to_s
+          report_kvs[:Column_name] = column_name.to_s
+        rescue
+        end
 
-          Oboe::API.trace('cassandra', report_kvs) do
-            drop_index_without_oboe(keyspace, column_family, column_name)
-          end
-        else
+        Oboe::API.trace('cassandra', report_kvs) do
           drop_index_without_oboe(keyspace, column_family, column_name)
         end
       end
 
       def add_column_family_with_oboe(cf_def)
-        if Oboe.tracing?
-          report_kvs = extract_trace_details(:add_column_family, nil, nil, nil)
-          begin
-            report_kvs[:Cf] = cf_def[:name] if cf_def.is_a?(Hash) and cf_def.has_key?(:name)
-          rescue
-          end
+        return add_column_family_without_oboe(cf_def) unless Oboe.tracing?
 
-          Oboe::API.trace('cassandra', report_kvs) do
-            add_column_family_without_oboe(cf_def)
-          end
-        else
+        report_kvs = extract_trace_details(:add_column_family, nil, nil, nil)
+        begin
+          report_kvs[:Cf] = cf_def[:name] if cf_def.is_a?(Hash) and cf_def.has_key?(:name)
+        rescue
+        end
+
+        Oboe::API.trace('cassandra', report_kvs) do
           add_column_family_without_oboe(cf_def)
         end
       end
       
       def drop_column_family_with_oboe(column_family)
-        if Oboe.tracing?
-          report_kvs = extract_trace_details(:drop_column_family, column_family, nil, nil)
+        return drop_column_family_without_oboe(column_family) unless Oboe.tracing?
 
-          Oboe::API.trace('cassandra', report_kvs) do
-            drop_column_family_without_oboe(column_family)
-          end
-        else
+        report_kvs = extract_trace_details(:drop_column_family, column_family, nil, nil)
+
+        Oboe::API.trace('cassandra', report_kvs) do
           drop_column_family_without_oboe(column_family)
         end
       end
       
       def add_keyspace_with_oboe(ks_def)
-        if Oboe.tracing?
-          report_kvs = extract_trace_details(:add_keyspace, nil, nil, nil)
-          report_kvs[:Name] = ks_def.name rescue ""
+        return add_keyspace_without_oboe(ks_def) unless Oboe.tracing?
 
-          Oboe::API.trace('cassandra', report_kvs) do
-            add_keyspace_without_oboe(ks_def)
-          end
-        else
+        report_kvs = extract_trace_details(:add_keyspace, nil, nil, nil)
+        report_kvs[:Name] = ks_def.name rescue ""
+
+        Oboe::API.trace('cassandra', report_kvs) do
           add_keyspace_without_oboe(ks_def)
         end
       end
       
       def drop_keyspace_with_oboe(keyspace)
-        if Oboe.tracing?
-          report_kvs = extract_trace_details(:drop_keyspace, nil, nil, nil)
-          report_kvs[:Name] = keyspace.to_s rescue ""
+        return drop_keyspace_without_oboe(keyspace) unless Oboe.tracing?
+          
+        report_kvs = extract_trace_details(:drop_keyspace, nil, nil, nil)
+        report_kvs[:Name] = keyspace.to_s rescue ""
 
-          Oboe::API.trace('cassandra', report_kvs) do
-            drop_keyspace_without_oboe(keyspace)
-          end
-        else
+        Oboe::API.trace('cassandra', report_kvs) do
           drop_keyspace_without_oboe(keyspace)
         end
       end