oboe 2.7.2.fuchs2 → 2.7.2.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5fddd1f71997ecae38b7f1888f90c6c59ff69a3c
+  data.tar.gz: 4e54002f173056d3058f1f3c48d59369ed1482c5
+SHA512:
+  metadata.gz: d043f5e6b8604946a71aaa2d10ec05f48f24390c10935614f4a33c3771a0fa7fb73e193f8ad2f87eb4802de5c113200bcf4783ea1af4f1f0f1cb8a5620e0faa9
+  data.tar.gz: a14372dc589567fe7f3781f7f51d0ea64dbd0b5dd06ef3408f22c41118cca44ff2c26464baedc6b85183f6279e761cec55e9abb333308686ded122a910e7d53a

data/lib/oboe.rb

@@ -7,7 +7,6 @@ begin
   require 'oboe/logger'
   require 'oboe/util'
   require 'oboe/xtrace'
-  require 'oboe/support'
 
   # If OboeHeroku is already defined then we are in a PaaS environment
   # with an alternate metal (see the oboe-heroku gem)
@@ -19,8 +18,8 @@ begin
         require '/usr/local/tracelytics/tracelyticsagent.jar'
         require 'joboe_metal'
       else
-        require "oboe_metal.so"
-        require "oboe_metal.rb"
+        require 'oboe_metal.so'
+        require 'oboe_metal'
       end
     rescue LoadError
       Oboe.loaded = false
@@ -52,6 +51,6 @@ begin
   # it will load all of the Ruby instrumentation
   require 'oboe/ruby'
 rescue => e
-  $stderr.puts "[oboe/error] Problem loading: #{e.inspect}"
+  $stderr.puts '[oboe/error] Problem loading: #{e.inspect}'
   $stderr.puts e.backtrace
 end

data/lib/oboe/api/layerinit.rb

@@ -17,7 +17,70 @@ module Oboe
         # Don't send __Init if the c-extension hasn't loaded
         return unless Oboe.loaded
 
-        platform_info = Oboe::Util.build_report
+        platform_info = { '__Init' => 1 }
+
+        begin
+          platform_info['Force']                   = true
+          platform_info['Ruby.Platform.Version']   = RUBY_PLATFORM
+          platform_info['Ruby.Version']            = RUBY_VERSION
+          platform_info['Ruby.Oboe.Version']       = ::Oboe::Version::STRING
+          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 instrumented libraries
+          platform_info['Ruby.Cassandra.Version'] = "Cassandra-#{::Cassandra.VERSION}" if defined?(::Cassandra)
+          platform_info['Ruby.Dalli.Version']     = "Dalli-#{::Dalli::VERSION}"        if defined?(::Dalli)
+          platform_info['Ruby.MemCache.Version']  = "MemCache-#{::MemCache::VERSION}"  if defined?(::MemCache)
+          platform_info['Ruby.Moped.Version']     = "Moped-#{::Moped::VERSION}"        if defined?(::Moped)
+          platform_info['Ruby.Redis.Version']     = "Redis-#{::Redis::VERSION}"        if defined?(::Redis)
+          platform_info['Ruby.Resque.Version']    = "Resque-#{::Resque::VERSION}"      if defined?(::Resque)
+
+          # Special case since the Mongo 1.x driver doesn't embed the version number in the gem directly
+          if ::Gem.loaded_specs.key?('mongo')
+            platform_info['Ruby.Mongo.Version']     = "Mongo-#{::Gem.loaded_specs['mongo'].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}"
+          elsif defined?(::WEBrick)
+            platform_info['Ruby.AppContainer.Version'] = "WEBrick-#{::WEBrick::VERSION}"
+          else
+            platform_info['Ruby.AppContainer.Version'] = File.basename($PROGRAM_NAME)
+          end
+
+        rescue StandardError, ScriptError => e
+          # Also rescue ScriptError (aka SyntaxError) in case one of the expected
+          # version defines don't exist
+
+          platform_info['Error'] = "Error in layerinit: #{e.message}"
+
+          Oboe.logger.debug "Error in layerinit: #{e.message}"
+          Oboe.logger.debug e.backtrace
+        end
+
         start_trace(layer, nil, platform_info.merge('Force' => true)) {}
       end
 

data/lib/oboe/base.rb

@@ -35,12 +35,8 @@ module OboeBase
   attr_accessor :sample_rate
   thread_local :layer_op
 
-  def self.included(cls)
-    cls.loaded = true
-  end
-
-  def self.extended(cls)
-    cls.loaded = true
+  def self.included(_)
+    self.loaded = true
   end
 
   def tracing_layer_op?(operation)
@@ -99,7 +95,7 @@ module OboeBase
   end
 
   def heroku?
-    ENV.key?('TRACEVIEW_URL')
+    false
   end
 
   ##

data/lib/oboe/util.rb

@@ -120,82 +120,6 @@ module Oboe
           x.to_s
         end
       end
-
-      ##
-      #  build_report
-      #
-      # Internal: Build a hash of KVs that reports on the status of the
-      # running environment.
-      def build_report
-        platform_info = { '__Init' => 1 }
-
-        begin
-          platform_info['Force']                   = true
-          platform_info['Ruby.Platform.Version']   = RUBY_PLATFORM
-          platform_info['Ruby.Version']            = RUBY_VERSION
-          platform_info['Ruby.Oboe.Version']       = ::Oboe::Version::STRING
-          platform_info['RubyHeroku.Oboe.Version'] = ::OboeHeroku::Version::STRING if defined?(::OboeHeroku)
-
-          # Report the framework in use
-          if defined?(::RailsLts)
-            platform_info['Ruby.RailsLts.Version'] = "RailsLts-#{::RailsLts::VERSION}"
-          elsif defined?(::Rails)
-            platform_info['Ruby.Rails.Version']    = "Rails-#{::Rails.version}"
-          end
-          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 instrumented libraries
-          platform_info['Ruby.Cassandra.Version'] = "Cassandra-#{::Cassandra.VERSION}" if defined?(::Cassandra)
-          platform_info['Ruby.Dalli.Version']     = "Dalli-#{::Dalli::VERSION}"        if defined?(::Dalli)
-          platform_info['Ruby.MemCache.Version']  = "MemCache-#{::MemCache::VERSION}"  if defined?(::MemCache)
-          platform_info['Ruby.Moped.Version']     = "Moped-#{::Moped::VERSION}"        if defined?(::Moped)
-          platform_info['Ruby.Redis.Version']     = "Redis-#{::Redis::VERSION}"        if defined?(::Redis)
-          platform_info['Ruby.Resque.Version']    = "Resque-#{::Resque::VERSION}"      if defined?(::Resque)
-
-          # Special case since the Mongo 1.x driver doesn't embed the version number in the gem directly
-          if ::Gem.loaded_specs.key?('mongo')
-            platform_info['Ruby.Mongo.Version']     = "Mongo-#{::Gem.loaded_specs['mongo'].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}"
-          elsif defined?(::WEBrick)
-            platform_info['Ruby.AppContainer.Version'] = "WEBrick-#{::WEBrick::VERSION}"
-          else
-            platform_info['Ruby.AppContainer.Version'] = File.basename($PROGRAM_NAME)
-          end
-
-        rescue StandardError, ScriptError => e
-          # Also rescue ScriptError (aka SyntaxError) in case one of the expected
-          # version defines don't exist
-
-          platform_info['Error'] = "Error in build_report: #{e.message}"
-
-          Oboe.logger.debug "Error in build_report: #{e.message}"
-          Oboe.logger.debug e.backtrace
-        end
-        platform_info
-      end
     end
   end
 end

data/lib/oboe/version.rb

@@ -9,7 +9,7 @@ module Oboe
     MAJOR = 2
     MINOR = 7
     PATCH = 2
-    BUILD = "fuchs2"
+    BUILD = 2
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

metadata

@@ -1,66 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oboe
-version: !ruby/object:Gem::Version 
-  hash: 199720067
-  prerelease: 6
-  segments: 
-  - 2
-  - 7
-  - 2
-  - fuchs
-  - 2
-  version: 2.7.2.fuchs2
+version: !ruby/object:Gem::Version
+  version: 2.7.2.2
 platform: ruby
-authors: 
+authors:
 - Peter Giacomo Lombardo
 - Spiros Eliopoulos
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-10-13 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-09-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-description: The oboe gem provides TraceView instrumentation for MRI Ruby, JRuby and related frameworks.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: The oboe gem provides TraceView instrumentation for MRI Ruby, JRuby and
+  related frameworks.
 email: traceviewsupport@appneta.com
 executables: []
-
-extensions: 
+extensions:
 - ext/oboe_metal/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
-files: 
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+files:
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -126,7 +116,6 @@ files:
 - lib/oboe/logger.rb
 - lib/oboe/method_profiling.rb
 - lib/oboe/ruby.rb
-- lib/oboe/support.rb
 - lib/oboe/thread_local.rb
 - lib/oboe/util.rb
 - lib/oboe/version.rb
@@ -165,45 +154,31 @@ files:
 - test/support/config_test.rb
 - test/support/liboboe_settings_test.rb
 - test/support/xtrace_test.rb
-has_rdoc: true
 homepage: http://www.appneta.com/products/traceview/
-licenses: 
+licenses:
 - AppNeta Open License, Version 1.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 59
-      segments: 
-      - 1
-      - 8
-      - 6
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: AppNeta TraceView performance instrumentation gem for Ruby
-test_files: 
+test_files:
 - test/frameworks/grape_test.rb
 - test/frameworks/padrino_test.rb
 - test/frameworks/sinatra_test.rb
@@ -233,3 +208,4 @@ test_files:
 - test/support/liboboe_settings_test.rb
 - test/support/config_test.rb
 - test/support/xtrace_test.rb
+has_rdoc: 

data/lib/oboe/support.rb

@@ -1,94 +0,0 @@
-# Copyright (c) 2014 AppNeta, Inc.
-# All rights reserved.
-
-module Oboe
-  ##
-  # This module is used to debug problematic setups and/or environments.
-  # Depending on the environment, output may be to stdout or the framework
-  # log file (e.g. log/production.log)
-
-  ##
-  # yesno
-  #
-  # Utility method to translate value/nil to "yes"/"no" strings
-  def self.yesno(x)
-    x ? "yes" : "no"
-  end
-
-  def self.support_report
-    Oboe.logger.warn "********************************************************"
-    Oboe.logger.warn "* BEGIN TraceView Support Report"
-    Oboe.logger.warn "*   Please email the output of this report to traceviewsupport@appneta.com"
-    Oboe.logger.warn "********************************************************"
-    Oboe.logger.warn "Ruby: #{RUBY_DESCRIPTION}"
-    Oboe.logger.warn "$0: #{$0}"
-    Oboe.logger.warn "$1: #{$1}" unless $1.nil?
-    Oboe.logger.warn "$2: #{$2}" unless $2.nil?
-    Oboe.logger.warn "$3: #{$3}" unless $3.nil?
-    Oboe.logger.warn "$4: #{$4}" unless $4.nil?
-    Oboe.logger.warn "Oboe.loaded == #{Oboe.loaded}"
-
-    using_jruby = defined?(JRUBY_VERSION)
-    Oboe.logger.warn "Using JRuby?: #{yesno(using_jruby)}"
-    if using_jruby
-      Oboe.logger.warn "Joboe Agent Status: #{Java::ComTracelyticsAgent::Agent.getStatus}"
-    end
-
-    on_heroku = Oboe.heroku?
-    Oboe.logger.warn "On Heroku?: #{yesno(on_heroku)}"
-    if on_heroku
-      Oboe.logger.warn "TRACEVIEW_URL: #{ENV['TRACEVIEW_URL']}"
-    end
-
-    Oboe.logger.warn "Oboe::Ruby defined?: #{yesno(defined?(Oboe::Ruby))}"
-    Oboe.logger.warn "Oboe.reporter: #{Oboe.reporter}"
-
-    Oboe.logger.warn "********************************************************"
-    Oboe.logger.warn "* Frameworks"
-    Oboe.logger.warn "********************************************************"
-
-    using_rails = defined?(::Rails)
-    Oboe.logger.warn "Using Rails?: #{yesno(using_rails)}"
-    if using_rails
-      Oboe.logger.warn "Oboe::Rails loaded?: #{yesno(defined?(::Oboe::Rails))}"
-    end
-
-    using_sinatra = defined?(::Sinatra)
-    Oboe.logger.warn "Using Sinatra?: #{yesno(using_sinatra)}"
-
-    using_padrino = defined?(::Padrino)
-    Oboe.logger.warn "Using Padrino?: #{yesno(using_padrino)}"
-
-    using_grape = defined?(::Grape)
-    Oboe.logger.warn "Using Grape?: #{yesno(using_grape)}"
-
-    Oboe.logger.warn "********************************************************"
-    Oboe.logger.warn "* TraceView Libraries"
-    Oboe.logger.warn "********************************************************"
-    files = Dir.glob('/usr/lib/liboboe*')
-    if files.empty?
-      Oboe.logger.warn "Error: No liboboe libs!"
-    else
-      files.each { |f|
-        Oboe.logger.warn f
-      }
-    end
-
-    Oboe.logger.warn "********************************************************"
-    Oboe.logger.warn "* Raw __Init KVs"
-    Oboe.logger.warn "********************************************************"
-    platform_info = Oboe::Util.build_report
-    platform_info.each { |k,v|
-      Oboe.logger.warn "#{k}: #{v}"
-    }
-    
-    Oboe.logger.warn "********************************************************"
-    Oboe.logger.warn "* END TraceView Support Report"
-    Oboe.logger.warn "*   Support Email: traceviewsupport@appneta.com"
-    Oboe.logger.warn "*   Support Portal: https://support.tv.appneta.com"
-    Oboe.logger.warn "*   Freenode IRC: #appneta"
-    Oboe.logger.warn "*   Github: https://github.com/appneta/oboe-ruby"
-    Oboe.logger.warn "********************************************************"
-    nil
-  end
-end