oboe 1.3.7 → 1.3.8

data/lib/joboe_metal.rb

@@ -0,0 +1,118 @@
+# Copyright (c) 2012 by Tracelytics, Inc.
+# All rights reserved.
+
+module Oboe_metal
+  include_package 'com.tracelytics.joboe'
+  import 'com.tracelytics.joboe'
+  include_package 'com.tracelytics.joboe.Context'
+  import 'com.tracelytics.joboe.Context'
+  include_package 'com.tracelytics.joboe.Event'
+  import 'com.tracelytics.joboe.Event'
+
+  class Context
+    def self.log(layer, label, options = {}, with_backtrace = true)
+      evt = Oboe::Context.createEvent()
+      evt.addInfo("Layer", layer.to_s)
+      evt.addInfo("Label", label.to_s)
+
+      options.each_pair do |k, v|
+        evt.addInfo(k.to_s, v.to_s)
+      end
+
+      evt.addInfo("Backtrace", Oboe::API.backtrace) if with_backtrace
+
+      Oboe::Reporter.sendReport(evt)
+    end
+
+    def self.layer_op=(op)
+      @layer_op = op
+    end
+
+    def self.layer_op
+      @layer_op
+    end
+
+    def self.tracing_layer_op?(operation)
+      if operation.is_a?(Array)
+        return operation.include?(@layer_op)
+      else
+        return @layer_op == operation
+      end
+    end
+
+    def self.toString
+      md = getMetadata.toString
+    end
+
+    def self.clear
+      clearMetadata
+    end
+
+    def self.get
+      getMetadata
+    end
+  end
+  
+  class Event
+    def self.metadataString(evt)
+      evt.getMetadata.toHexString
+    end
+  end
+
+  def UdpReporter
+    Java::ComTracelyticsJoboe
+  end
+  
+  module Metadata
+    Java::ComTracelyticsJoboeMetaData
+  end
+  
+  module Reporter
+    def self.sendReport(evt)
+      evt.report
+    end
+  end
+end
+
+module Oboe
+  include Oboe_metal
+  
+  # TODO: Ensure that the :tracing_mode is set to "always", "through", or "never"
+  Config = {
+    :tracing_mode => "through",
+    :reporter_host => "127.0.0.1",
+    :sample_rate => 1000000
+  }
+
+  def self.passthrough?
+    ["always", "through"].include?(Oboe::Config[:tracing_mode])
+  end
+
+  def self.always?
+    Oboe::Config[:tracing_mode] == "always"
+  end
+
+  def self.through?
+    Oboe::Config[:tracing_mode] == "through"
+  end
+
+  def self.never?
+    Oboe::Config[:tracing_mode] == "never"
+  end
+
+  def self.now?
+    Oboe::Context.isValid and not Oboe.never?
+  end
+
+  def self.start?
+    not Oboe::Context.isValid and Oboe.always?
+  end
+
+  def self.continue?
+    Oboe::Context.isValid and not Oboe.never?
+  end
+
+  def self.log(layer, label, options = {})
+    Context.log(layer, label, options = options)
+  end
+end

data/lib/method_profiling.rb

@@ -0,0 +1,79 @@
+# Copyright (c) 2012 by Tracelytics, Inc.
+# All rights reserved.
+
+module OboeMethodProfiling
+    def self.included klass
+        klass.extend ClassMethods
+    end
+
+    module ClassMethods
+        def profile_method(method_name, profile_name, store_args=false, store_return=false, profile=false)
+            #this only gets file and line where profiling is turned on, presumably
+            #right after the function definition. ruby 1.9 has nice introspection (Method.source_location)
+            #but its appears no such luck for ruby 1.8
+            version = RbConfig::CONFIG['ruby_version']
+            file = nil
+            line = nil
+            if version and version.match(/^1.9/)
+                info = self.method(method_name).source_location
+                if !info.nil?
+                  file = info[0]
+                  line = info[1] 
+                end
+            else
+                info = Kernel.caller[0].split(':')
+                file = info.first
+                line = info.last
+            end
+
+            #profiling via ruby-prof, is it possible to get return value of profiled code?
+            code = "def _oboe_profiled_#{method_name}(*args, &block)
+                        def pps(*args)
+                            old_out = $stdout
+                            begin
+                                s = StringIO.new
+                                $stdout = s
+                                pp(*args)
+                            ensure
+                                $stdout = old_out
+                            end
+                            s.string
+                        end
+
+                        # file and line number are fetched in Context.log
+                        # because we have access to the correct backtrace there
+                        entry_kvs = {'Language'     => 'ruby',
+                                     'ProfileName'  => '#{profile_name}',
+                                     'FunctionName' => '#{method_name}',
+                                     'Class'        => self.class.to_s.rpartition('::').last,
+                                     'Module'       => self.class.to_s.rpartition('::').first,
+                                     'File'         => '#{file}',
+                                     'LineNumber'    => '#{line}' 
+                                    }
+
+                        if #{store_args}
+                            entry_kvs['Args'] = pps *args
+                        end
+
+                        Oboe::Context.log(nil, 'profile_entry', entry_kvs)
+
+                        ret = _oboe_orig_#{method_name}(*args, &block)
+
+                        exit_kvs =  {'Language'     => 'ruby',
+                                     'ProfileName'  => '#{profile_name}'
+                                    }
+                        
+                        if #{store_return}
+                            exit_kvs['ReturnValue'] = pps ret
+                        end
+
+                        Oboe::Context.log(nil, 'profile_exit', exit_kvs)
+
+                        ret
+                    end"
+            class_eval code, __FILE__, __LINE__
+            alias_method "_oboe_orig_#{method_name}", method_name
+            alias_method method_name, "_oboe_profiled_#{method_name}"
+        end
+    end
+end

data/lib/oboe.rb

@@ -1,10 +1,17 @@
 # Copyright (c) 2012 by Tracelytics, Inc.
 # All rights reserved.
-          
+
 begin
-  require 'oboe_metal.so'
   require 'rbconfig'
-  require 'oboe_metal'
+  if RUBY_PLATFORM == 'java'
+    require '/usr/local/tracelytics/tracelyticsagent.jar'
+    require 'joboe_metal'
+  else
+    require 'oboe_metal.so'
+    require 'oboe_metal'
+  end
+  require 'rbconfig'
+  require 'method_profiling'
   require 'oboe/config'
   require 'oboe/loading'
 

data/lib/oboe/api.rb

@@ -8,13 +8,6 @@ module Oboe
       extend Oboe::API::Tracing
       extend Oboe::API::LayerInit
     end
-
-    def self.extend_with_noop
-      extend Oboe::API::LoggingNoop
-      extend Oboe::API::TracingNoop
-      extend Oboe::API::LayerInitNoop
-    end
-    
     extend Oboe::API::Util
   end
 end

data/lib/oboe/api/layerinit.rb

@@ -7,9 +7,10 @@ module Oboe
       #
       def report_init(layer)
         platform_info                  = { '__Init' => 1 }
-        platform_info['RubyVersion']   = RUBY_VERSION
-        platform_info['RailsVersion']  = ::Rails.version if defined?(Rails)
-        platform_info['OboeVersion']   = Gem.loaded_specs['oboe'].try(:version).to_s
+        platform_info['RubyPlatform']     = RUBY_PLATFORM
+        platform_info['RubyVersion']      = RUBY_VERSION
+        platform_info['RailsVersion']     = ::Rails.version if defined?(Rails)
+        platform_info['OboeVersion']      = Gem.loaded_specs['oboe'].try(:version).to_s
 
         force_trace do
           start_trace(layer, nil, platform_info) { }
@@ -24,14 +25,5 @@ module Oboe
         Oboe::Config[:tracing_mode] = saved_mode
       end
     end
-
-    module LayerInitNoop
-      def report_init(layer)
-      end
-
-      def force_trace
-        yield
-      end
-    end
   end
 end

data/lib/oboe/api/logging.rb

@@ -116,31 +116,8 @@ module Oboe
         opts.each do |k, v|
           event.addInfo(k.to_s, v.to_s) if valid_key? k
         end if !opts.nil? and opts.any?
-  
-        Oboe.reporter.sendReport(event)
-      end
-    end
-
-    module LoggingNoop
-      def log(layer, label, opts={})
-      end
-
-      def log_exception(layer, exn)
-      end
-
-      def log_start(layer, xtrace, opts={})
-      end
-
-      def log_end(layer, opts={})
-      end
-
-      def log_entry(layer, opts={})
-      end
-
-      def log_exit(layer, opts={})
-      end
-
-      def log_event(layer, label, event, opts={})
+ 
+        Oboe::Reporter.sendReport(event)
       end
     end
   end 

data/lib/oboe/api/tracing.rb

@@ -118,7 +118,7 @@ module Oboe
         log_start(layer, xtrace, opts)
         exit_evt = Oboe::Context.createEvent
         begin
-          target['X-Trace'] = exit_evt.metadataString() if Oboe::Config.tracing?
+          target['X-Trace'] = Oboe::Event.metadataString(exit_evt) if Oboe::Config.tracing?
           yield
         rescue Exception => e
           log_exception(layer, e)
@@ -130,19 +130,5 @@ module Oboe
         end
       end
     end
-
-    module TracingNoop
-      def trace(layer, opts={})
-        yield
-      end
-
-      def start_trace(layer, xtrace, opts={})
-        [yield, xtrace]
-      end
-
-      def start_trace_with_target(layer, xtrace, target, opts={})
-        yield
-      end
-    end
   end
 end

data/lib/oboe/api/util.rb

@@ -4,7 +4,7 @@
 module Oboe
   module API
     module Util
-      BACKTRACE_CUTOFF = 100
+      BACKTRACE_CUTOFF = 200
 
       # Internal: Check whether the provided key is reserved or not. Reserved
       # keys are either keys that are handled by liboboe calls or the oboe gem.
@@ -24,13 +24,20 @@ module Oboe
       #
       # Returns a string with each frame of the backtrace separated by '\r\n'.
       def backtrace(ignore=1)
-        frames = Kernel.caller
-        frames_len = frames.size
-        if frames_len - ignore > BACKTRACE_CUTOFF
-          frames[ignore, BACKTRACE_CUTOFF + ignore].unshift("...")
+        trim_backtrace(Kernel.caller).join("\r\n");
+      end
+
+      def trim_backtrace(backtrace)
+        return backtrace unless backtrace.is_a?(Array)
+
+        length = backtrace.size
+        if length > BACKTRACE_CUTOFF
+          # Trim backtraces by getting the first 180 and last 20 lines
+          trimmed = backtrace[0, 180] + ['...[snip]...'] + backtrace[length - 20, 20]
         else
-          frames.drop(ignore)
-        end.join("\r\n")
+          trimmed = backtrace
+        end
+        trimmed
       end
     end
   end

data/lib/oboe/loading.rb

@@ -57,7 +57,7 @@ module Oboe
       begin
         Oboe::API.extend_with_tracing
       rescue LoadError => e
-        Oboe::API.extend_with_noop
+        puts "[oboe/error] Couldn't load oboe api."
       end
       
       require 'oboe/config'

data/lib/oboe/version.rb

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

data/lib/oboe_metal.rb

@@ -2,6 +2,12 @@
 # All rights reserved.
 
 module Oboe_metal
+  class Event
+    def self.metadataString(evt)
+      evt.metadataString()
+    end
+  end
+
   class Context
     def self.log(layer, label, options = {}, with_backtrace = true)
       evt = Oboe::Context.createEvent()
@@ -12,9 +18,9 @@ module Oboe_metal
         evt.addInfo(k.to_s, v.to_s)
       end
 
-      evt.addInfo("Backtrace", Kernel.caller.join("\r\n")) if with_backtrace
+      evt.addInfo("Backtrace", Oboe::API.backtrace) if with_backtrace
 
-      Oboe.reporter.sendReport(evt)
+      Oboe::Reporter.sendReport(evt)
     end
 
     def self.layer_op=(op)
@@ -33,86 +39,14 @@ module Oboe_metal
       end
     end
   end
-end
-
-
-module OboeMethodProfiling
-    def self.included klass
-        klass.extend ClassMethods
-    end
-
-    module ClassMethods
-        def profile_method(method_name, profile_name, store_args=false, store_return=false, profile=false)
-            #this only gets file and line where profiling is turned on, presumably
-            #right after the function definition. ruby 1.9 has nice introspection (Method.source_location)
-            #but its appears no such luck for ruby 1.8
-            version = RbConfig::CONFIG['ruby_version']
-            file = nil
-            line = nil
-            if version and version.match(/^1.9/)
-                info = self.method(method_name).source_location
-                if !info.nil?
-                  file = info[0]
-                  line = info[1] 
-                end
-            else
-                info = Kernel.caller[0].split(':')
-                file = info.first
-                line = info.last
-            end
-
-            #profiling via ruby-prof, is it possible to get return value of profiled code?
-            code = "def _oboe_profiled_#{method_name}(*args, &block)
-                        def pps(*args)
-                            old_out = $stdout
-                            begin
-                                s = StringIO.new
-                                $stdout = s
-                                pp(*args)
-                            ensure
-                                $stdout = old_out
-                            end
-                            s.string
-                        end
-
-                        # file and line number are fetched in Context.log
-                        # because we have access to the correct backtrace there
-                        entry_kvs = {'Language'     => 'ruby',
-                                     'ProfileName'  => '#{profile_name}',
-                                     'FunctionName' => '#{method_name}',
-                                     'Class'        => self.class.to_s.rpartition('::').last,
-                                     'Module'       => self.class.to_s.rpartition('::').first,
-                                     'File'         => '#{file}',
-                                     'LineNumber'    => '#{line}' 
-                                    }
-
-                        if #{store_args}
-                            entry_kvs['Args'] = pps *args
-                        end
-
-                        Oboe::Context.log(nil, 'profile_entry', entry_kvs)
-
-                        ret = _oboe_orig_#{method_name}(*args, &block)
-
-                        exit_kvs =  {'Language'     => 'ruby',
-                                     'ProfileName'  => '#{profile_name}'
-                                    }
-                        
-                        if #{store_return}
-                            exit_kvs['ReturnValue'] = pps ret
-                        end
-
-                        Oboe::Context.log(nil, 'profile_exit', exit_kvs)
-
-                        ret
-                    end"
-            class_eval code, __FILE__, __LINE__
-            alias_method "_oboe_orig_#{method_name}", method_name
-            alias_method method_name, "_oboe_profiled_#{method_name}"
-        end
+  
+  module Reporter
+    def self.sendReport(evt)
+      Oboe.reporter.sendReport(evt)
     end
+  end
 end
-  
+
 module Oboe
   include Oboe_metal
 
@@ -159,9 +93,9 @@ module Oboe
     if !@reporter
       @reporter = Oboe::UdpReporter.new(Oboe::Config[:reporter_host])
     end
-
     return @reporter
   end
 end
 
-Oboe_metal::Context.init()
+Oboe_metal::Context.init() 
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oboe
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies: []
-description: The oboe gem provides Tracelytics instrumentation for Ruby and Ruby frameworkes.
+description: The oboe gem provides AppNeta instrumentation for Ruby and Ruby frameworks.
 email: contact@tracelytics.com
 executables: []
 extensions:
@@ -20,6 +20,7 @@ extra_rdoc_files:
 - LICENSE
 files:
 - lib/oboe_metal.rb
+- lib/joboe_metal.rb
 - lib/oboe.rb
 - lib/oboe/loading.rb
 - lib/oboe/api.rb
@@ -42,6 +43,7 @@ files:
 - lib/oboe/frameworks/rails/inst/cassandra.rb
 - lib/oboe/frameworks/rails/inst/memcached.rb
 - lib/oboe/frameworks/rails/rails.rb
+- lib/method_profiling.rb
 - lib/oboe_fu.rb
 - lib/rails/generators/oboe/install_generator.rb
 - lib/rails/generators/oboe/templates/oboe_initializer.rb