oboe 2.6.3.0 → 2.6.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 849242c14c945d9a5687e47d042729a919a29589
-  data.tar.gz: 3b21c37c48ea8b1813d9268b2c0acc10de8b4a34
+  metadata.gz: bb3169ea3038b6293a945efb858b06d37de67546
+  data.tar.gz: d1ea231c855de19561bf20a7fe6fc468ac26c990
 SHA512:
-  metadata.gz: cc0243bcd66501f11e95eae0401b94721881e29baabf218286a5f78b440db4426b20a8e4ea3c0b91aac3bd46452b5943c25a7d841f1a0d44e7351451793cff0c
-  data.tar.gz: 5ccdaa4436264e9d2775909dfc4d9a8fca1dae95ba98e112339061df7e6c6342653796110a02508237bc50d70ad26991dc6ced62e952306f68f4dcaebba7b59a
+  metadata.gz: 2ca6ed914c0622b9aae98bf859500b7a08cd012c67f63b493914c2bdd1bc8663082aa75635efbde97aa966f3f39deb1b9c290169544b8ecf0547243e1c939a63
+  data.tar.gz: 97db5fa26ea2233bb9da5723ff4675874d8590868dd7a2e22e8aa3339fe9d4da066662c1ef679a1c1f122f36d73ea62ede976c5d3214c0d0fca185e03034a3a0

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# oboe 2.6.4.1 (04/30/14)
+
+This patch release adds detection and support for Redhat [OpenShift](https://www.openshift.com/).  See our OpenShift [TraceView cartridge](https://github.com/appneta/openshift-cartridge-traceview) for base libraries before using this gem on OpenShift.
+
+# oboe 2.6.3.0 (04/07/14)
+
+This patch releases fixes a number of smaller issues:
+
+* the gem will no longer start traces on static assets (https://github.com/appneta/oboe-ruby/pull/31)
+* fix occasionally broken `profile_name` values when using [custom method tracing](https://github.com/appneta/oboe-ruby#tracing-methods)
+* fix for incorrectly starting traces when in `through` tracing mode under certain circumstances
+* Expand the test suite to validate sample rates and tracing modes (https://github.com/appneta/oboe-ruby/pull/8)
 
 # oboe 2.6.2.0 (03/24/14)
 

data/ext/oboe_metal/extconf.rb

@@ -12,7 +12,21 @@ else
   jruby = false
 end
 
-dir_config('oboe')
+openshift = ENV.has_key?('OPENSHIFT_TRACEVIEW_DIR')
+
+# When on OpenShift, set the mkmf lib paths so we have no issues linking to
+# the TraceView libs.
+if openshift
+  tv_lib64 = "#{ENV['OPENSHIFT_TRACEVIEW_DIR']}usr/lib64"
+  tv_tlyzer = "#{ENV['OPENSHIFT_TRACEVIEW_DIR']}usr/lib64/tracelyzer"
+
+  idefault = "#{ENV['OPENSHIFT_TRACEVIEW_DIR']}usr/include"
+  ldefault = "#{tv_lib64}:#{tv_tlyzer}"
+
+  dir_config('oboe', idefault, ldefault)
+else
+  dir_config('oboe')
+end
 
 if jruby or ENV.has_key?('TRACEVIEW_URL') 
   # Build the noop extension under JRuby and Heroku.
@@ -30,6 +44,11 @@ elsif have_library('oboe', 'oboe_config_get_revision', 'oboe/oboe.h')
   $CPPFLAGS << " #{ENV["CPPFLAGS"]}"
   $LIBS << " #{ENV["LIBS"]}"
 
+  # On OpenShift user rpath to point out the TraceView libraries
+  if openshift
+    $LDFLAGS << " #{ENV["LDFLAGS"]} -Wl,-rpath=#{tv_lib64},--rpath=#{tv_tlyzer}"
+  end
+
   if RUBY_VERSION < '1.9'
     cpp_command('g++') 
     $CPPFLAGS << "-I./src/"

data/lib/oboe/config.rb

@@ -65,9 +65,18 @@ module Oboe
       # avoid collecting and reporting query literals to TraceView.
       @@config[:sanitize_sql] = false
 
-      # The default configuration
-      @@config[:tracing_mode] = "through"
-      @@config[:reporter_host] = "127.0.0.1"
+      if ENV.has_key?('OPENSHIFT_TRACEVIEW_TLYZER_IP')
+        # We're running on OpenShift
+        @@config[:tracing_mode] = "always"
+        @@config[:reporter_host] = ENV['OPENSHIFT_TRACEVIEW_TLYZER_IP']
+        @@config[:reporter_port] = ENV['OPENSHIFT_TRACEVIEW_TLYZER_PORT']
+      else
+        # The default configuration
+        @@config[:tracing_mode] = "through"
+        @@config[:reporter_host] = "127.0.0.1"
+        @@config[:reporter_port] = "7831"
+      end
+        
       @@config[:verbose] = false
     end
 

data/lib/oboe/version.rb

@@ -5,8 +5,8 @@ module Oboe
   module Version
     MAJOR = 2
     MINOR = 6 
-    PATCH = 3
-    BUILD = 0
+    PATCH = 4
+    BUILD = 1
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

data/lib/oboe_metal.rb

@@ -51,7 +51,7 @@ module Oboe_metal
         if ENV['RACK_ENV'] == "test"
           Oboe.reporter = Oboe::FileReporter.new("/tmp/trace_output.bson")
         else
-          Oboe.reporter = Oboe::UdpReporter.new(Oboe::Config[:reporter_host])
+          Oboe.reporter = Oboe::UdpReporter.new(Oboe::Config[:reporter_host], Oboe::Config[:reporter_port])
         end
 
         # Only report __Init from here if we are not instrumenting a framework.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oboe
 version: !ruby/object:Gem::Version
-  version: 2.6.3.0
+  version: 2.6.4.1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake