RubyGems - wireframe-rpm_contrib - Versions diffs - 1.0.12.7 → 2.1.6.1 - Mend

wireframe-rpm_contrib 1.0.12.7 → 2.1.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (44) hide show

data/CHANGELOG +69 -3
data/Gemfile +13 -0
data/README.md +137 -14
data/Rakefile +5 -3
data/lib/rpm_contrib.rb +17 -24
data/lib/rpm_contrib/agent_compatibility.rb +11 -0
data/lib/rpm_contrib/detection.rb +5 -0
data/lib/rpm_contrib/detection/camping.rb +1 -1
data/lib/rpm_contrib/instrumentation.rb +16 -0
data/lib/rpm_contrib/instrumentation/active_messaging.rb +22 -0
data/lib/rpm_contrib/instrumentation/aws.rb +68 -0
data/lib/rpm_contrib/instrumentation/camping.rb +7 -10
data/lib/rpm_contrib/instrumentation/cassandra.rb +26 -19
data/lib/rpm_contrib/instrumentation/crack.rb +41 -0
data/lib/rpm_contrib/instrumentation/curb.rb +52 -0
data/lib/rpm_contrib/instrumentation/elastic_search.rb +26 -0
data/lib/rpm_contrib/instrumentation/kyototycoon.rb +28 -0
data/lib/rpm_contrib/instrumentation/mongo.rb +54 -0
data/lib/rpm_contrib/instrumentation/mongoid.rb +12 -44
data/lib/rpm_contrib/instrumentation/paperclip.rb +25 -18
data/lib/rpm_contrib/instrumentation/picky.rb +41 -0
data/lib/rpm_contrib/instrumentation/redis.rb +29 -20
data/lib/rpm_contrib/instrumentation/resque.rb +78 -42
data/lib/rpm_contrib/instrumentation/riak_client.rb +48 -0
data/lib/rpm_contrib/instrumentation/ripple.rb +37 -0
data/lib/rpm_contrib/instrumentation/sinatra.rb +30 -0
data/lib/rpm_contrib/instrumentation/thinking_sphinx.rb +22 -0
data/lib/rpm_contrib/instrumentation/typhoeus.rb +33 -0
data/lib/rpm_contrib/instrumentation/ultrasphinx.rb +22 -0
data/lib/rpm_contrib/instrumentation/workling.rb +27 -0
data/lib/rpm_contrib/instrumentation/yajl.rb +41 -0
data/lib/rpm_contrib/language_support.rb +31 -0
data/lib/rpm_contrib/samplers.rb +17 -0
data/test/helper.rb +1 -1
data/test/schema.rb +1 -1
data/test/test_curb.rb +69 -0
data/test/test_picky.rb +55 -0
data/test/test_redis.rb +2 -2
data/test/test_resque.rb +74 -0
data/test/{test_mongoid.rb → test_workling.rb} +6 -14
metadata +74 -64
data/lib/rpm_contrib/detection/resque.rb +0 -15
data/lib/rpm_contrib/instrumentation/aws/s3.rb +0 -56
data/lib/rpm_contrib/instrumentation/mongo_mapper.rb +0 -44

data/lib/rpm_contrib/instrumentation/yajl.rb ADDED

@@ -0,0 +1,41 @@
+DependencyDetection.defer do
+  @name = :yajl_parser
+  depends_on do
+    defined?(::Yajl::Parser) && !NewRelic::Control.instance['disable_yajl_instrumentation']
+  end
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Yajl::Parser instrumentation'
+  end
+  executes do
+    ::Yajl::Parser.class_eval do
+      class << self
+        include ::NewRelic::Agent::MethodTracer
+        add_method_tracer :parse, 'Parser/Yajl/parse'
+      end
+    end
+  end
+end
+DependencyDetection.defer do
+  @name = :yajl_encoder
+  depends_on do
+    defined?(::Yajl::Encoder) && !NewRelic::Control.instance['disable_yajl_instrumentation']
+  end
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Yajl::Encoder instrumentation'
+  end
+  executes do
+    ::Yajl::Encoder.class_eval do
+      class << self
+        include ::NewRelic::Agent::MethodTracer
+        add_method_tracer :encode, 'Encoder/Yajl/encode'
+      end
+    end
+  end
+end

data/lib/rpm_contrib/language_support.rb ADDED

@@ -0,0 +1,31 @@
+module RPMContrib::LanguageSupport
+  extend self
+  @@forkable = nil
+  def can_fork?
+    # this is expensive to check, so we should only check once
+    return @@forkable if @@forkable != nil
+    if Process.respond_to?(:fork)
+      # if this is not 1.9.2 or higher, we have to make sure
+      @@forkable = ::RUBY_VERSION < '1.9.2' ? test_forkability : true
+    else
+      @@forkable = false
+    end
+    @@forkable
+  end
+  private
+  def test_forkability
+    child = Process.fork { exit! }
+    # calling wait here doesn't seem like it should necessary, but it seems to
+    # resolve some weird edge cases with resque forking.
+    Process.wait child
+    true
+  rescue NotImplementedError
+    false
+  end
+end

data/lib/rpm_contrib/samplers.rb ADDED

@@ -0,0 +1,17 @@
+module RpmContrib
+  # Samplers are subclasses of NewRelic::Agent::Sampler which periodically collect metric data in a
+  # background thread.  Sampler classes belong in the sampler subdirectory and must be loaded before
+  # the agent starts.
+  module Samplers
+  end
+end
+pattern = File.expand_path "../samplers/**/*.rb",  __FILE__
+Dir.glob pattern do |file|
+  begin
+    require file.to_s
+  rescue Exception => e
+    NewRelic::Agent.logger.error "Skipping instrumentation file '#{file}': #{e}"
+    NewRelic::Agent.logger.debug e.backtrace.join("\n")
+  end
+end

data/test/helper.rb CHANGED

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'test/unit'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-#$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require File.expand_path("../../lib/rpm_contrib.rb", __FILE__)

data/test/schema.rb CHANGED

@@ -4,7 +4,7 @@
 begin
   require 'sqlite3'
   require 'active_record'
   ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
   ActiveRecord::Migration.verbose = false

data/test/test_curb.rb ADDED

@@ -0,0 +1,69 @@
+require "#{File.dirname(__FILE__)}/helper"
+begin
+require 'curb'
+rescue LoadError
+end
+class NewRelic::Agent::NetInstrumentationTest < Test::Unit::TestCase
+  include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+  def setup
+    NewRelic::Agent.manual_start
+    @engine = NewRelic::Agent.instance.stats_engine
+    @engine.clear_stats
+  end
+  def test_get
+    curl = Curl::Easy.new('http://www.google.com/index.html')
+    curl.perform
+    assert_match /<head>/, curl.body_str
+    assert_equal %w[External/www.google.com/Curl::Easy External/Curl::Multi
+                    External/allOther External/www.google.com/all].sort,
+       @engine.metrics.sort
+  end
+  def test_multi
+    multi = Curl::Multi.new
+    curl1 = Curl::Easy.new('http://www.google.com/index.html')
+    multi.add curl1
+    curl2 = Curl::Easy.new('http://www.yahoo.com/')
+    multi.add curl2
+    multi.perform
+    assert_match /<head>/, curl1.body_str
+    assert_match /<head>/, curl2.body_str
+    assert_equal %w[External/Curl::Multi External/allOther].sort,
+       @engine.metrics.sort
+  end
+  def test_background
+    perform_action_with_newrelic_trace("task", :category => :task) do
+      curl = Curl::Easy.new('http://www.google.com/index.html')
+      curl.perform
+      assert_match /<head>/, curl.body_str
+    end
+    assert_equal %w[External/Curl::Multi
+          External/Curl::Multi:OtherTransaction/Background/NewRelic::Agent::NetInstrumentationTest/task
+          External/www.google.com/Curl::Easy External/allOther External/www.google.com/all
+          External/www.google.com/Curl::Easy:OtherTransaction/Background/NewRelic::Agent::NetInstrumentationTest/task].sort,
+       @engine.metrics.select{|m| m =~ /^External/}.sort
+  end
+  def test_transactional
+    perform_action_with_newrelic_trace("task") do
+      curl = Curl::Easy.new('http://www.google.com/index.html')
+      curl.perform
+      assert_match /<head>/, curl.body_str
+    end
+    assert_equal %w[External/Curl::Multi
+          External/Curl::Multi:Controller/NewRelic::Agent::NetInstrumentationTest/task
+          External/www.google.com/Curl::Easy External/allWeb External/www.google.com/all
+          External/www.google.com/Curl::Easy:Controller/NewRelic::Agent::NetInstrumentationTest/task].sort,
+       @engine.metrics.select{|m| m =~ /^External/}.sort
+  end
+  def test_ignore
+    NewRelic::Agent.disable_all_tracing do
+      curl = Curl::Easy.new('http://www.google.com/index.html')
+      curl.http_post('data')
+    end
+    assert_equal 0, @engine.metrics.size
+  end
+end if defined? ::Curl::Easy

data/test/test_picky.rb ADDED

@@ -0,0 +1,55 @@
+require 'picky'
+require "#{File.dirname(__FILE__)}/helper"
+class NewRelic::Agent::PickyIntrumentationTest < Test::Unit::TestCase
+  def tokens_for *tokens
+    tokens.map{|t|
+      token = 'whatever'
+      token.extend Module.new{
+        define_method(:'partial?'){ t[:partial] }
+        define_method(:'similar?'){ t[:similar] }
+        define_method(:'qualifiers'){ t[:qualifiers] }
+      }
+      token
+    }
+  end
+  def test_obfuscate_tokens
+    tokens = tokens_for({})
+    assert_equal 'xxx', Picky::NewRelic.obfuscate_tokens(tokens)
+    tokens = tokens_for({:similar => true})
+    assert_equal 'xxx~', Picky::NewRelic.obfuscate_tokens(tokens)
+    tokens = tokens_for({:partial => true})
+    assert_equal 'xxx*', Picky::NewRelic.obfuscate_tokens(tokens)
+    tokens = tokens_for({:qualifiers => [:haha]})
+    assert_equal 'haha:xxx', Picky::NewRelic.obfuscate_tokens(tokens)
+    tokens = tokens_for( {:partial => true}, {:similar => true} )
+    assert_equal 'xxx* xxx~', Picky::NewRelic.obfuscate_tokens(tokens)
+    tokens = tokens_for( {:similar => true}, {:partial => true} )
+    assert_equal 'xxx* xxx~', Picky::NewRelic.obfuscate_tokens(tokens)
+    tokens = tokens_for( {:partial => true}, {:partial => true} )
+    assert_equal 'xxx* xxx*', Picky::NewRelic.obfuscate_tokens(tokens)
+    tokens = tokens_for(
+      {:similar => true, :qualifiers => [:bla]},
+      {:partial => true, :qualifiers => [:bla, :blub]}
+    )
+    assert_equal 'bla,blub:xxx* bla:xxx~', Picky::NewRelic.obfuscate_tokens(tokens)
+    tokens = tokens_for(
+      {:similar => true, :qualifiers => [:bla]},
+      {:partial => true, :qualifiers => [:blub, :bla]}
+    )
+    assert_equal 'bla,blub:xxx* bla:xxx~', Picky::NewRelic.obfuscate_tokens(tokens)
+  end
+end

data/test/test_redis.rb CHANGED

@@ -8,7 +8,7 @@ end
 require "#{File.dirname(__FILE__)}/../lib/rpm_contrib/instrumentation/redis"
 if defined?(::Redis)
   class RedisTest < Test::Unit::TestCase
@@ -27,7 +27,7 @@ if defined?(::Redis)
     # Fake test
     def test_fail
     end
   end

data/test/test_resque.rb ADDED

@@ -0,0 +1,74 @@
+require 'resque'
+require 'mocha'
+require File.expand_path(File.dirname(__FILE__) + "/helper")
+require File.expand_path(File.dirname(__FILE__) + "/../lib/rpm_contrib")
+class ResqueTest < Test::Unit::TestCase
+  class ExtendoJorb < ::Resque::Job
+    def self.perform
+      true
+    end
+  end
+  class GoodJorb
+    def self.perform
+      true
+    end
+  end
+  class BadJorb
+    def self.perform
+      raise "I'm doing a bad jorb"
+    end
+  end
+  def setup
+    @worker = Resque::Worker.new(:test)
+    NewRelic::Agent.manual_start
+    @engine = NewRelic::Agent.instance.stats_engine
+  end
+  def teardown
+    @engine.clear_stats
+  end
+  def test_should_instrument_job_extending_from_resque_job
+    @worker.perform(Resque::Job.new(:test,
+                                    'class' => 'ResqueTest::ExtendoJorb'))
+    metrics = [ 'OtherTransaction/all', 'OtherTransaction/ResqueJob/all',
+                'OtherTransaction/ResqueJob/ResqueTest::ExtendoJorb/perform' ]
+    metrics.each do |metric|
+      assert(@engine.metrics.include?(metric),
+             "#{@engine.metrics.inspect} missing #{metric}")
+    end
+    assert !@engine.metrics.include?('Errors/all')
+  end
+  def test_should_instrument_poro_job
+    @worker.perform(Resque::Job.new(:test, 'class' => 'ResqueTest::GoodJorb'))
+    metrics = [ 'OtherTransaction/all', 'OtherTransaction/ResqueJob/all',
+                'OtherTransaction/ResqueJob/ResqueTest::GoodJorb/perform' ]
+    metrics.each do |metric|
+      assert(@engine.metrics.include?(metric),
+             "#{@engine.metrics.inspect} missing #{metric}")
+    end
+    assert !@engine.metrics.include?('Errors/all')
+  end
+  def test_should_collect_job_errors
+    begin
+      @worker.perform(Resque::Job.new(:test, 'class' => 'ResqueTest::BadJorb'))
+    rescue
+    end
+    metrics = [ 'OtherTransaction/all', 'OtherTransaction/ResqueJob/all',
+                'OtherTransaction/ResqueJob/ResqueTest::BadJorb/perform',
+                'Errors/all' ]
+    metrics.each do |metric|
+      assert(@engine.metrics.include?(metric),
+             "#{@engine.metrics.inspect} missing #{metric}")
+    end
+  end
+end

data/test/{test_mongoid.rb → test_workling.rb} RENAMED

@@ -1,24 +1,16 @@
 require "#{File.dirname(__FILE__)}/helper"
 begin
-  require 'mongoid'
+  require 'redis'
+  require 'ruby-debug'
 rescue LoadError
 end
-require "#{File.dirname(__FILE__)}/../lib/rpm_contrib/instrumentation/mongoid"
+require "#{File.dirname(__FILE__)}/../lib/rpm_contrib/instrumentation/workling"
-if defined?(::Mongoid)
-  Mongoid.configure do |config|
-    config.master = Mongo::Connection.new.db('animals')
-  end
-  class Dog
-    include Mongoid::Document
+if defined?(::Workling)
-    field :name
-  end
-  class MongoidTest < Test::Unit::TestCase
+  class WorklingTest < Test::Unit::TestCase
     # Called before every test method runs. Can be used
     # to set up fixture information.
@@ -35,7 +27,7 @@ if defined?(::Mongoid)
     # Fake test
     def test_fail
-      Dog.create!(:name=>'rover')
     end
   end

metadata CHANGED

@@ -1,116 +1,126 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: wireframe-rpm_contrib
-version: !ruby/object:Gem::Version
-  hash: 97
-  prerelease: false
-  segments:
-  - 1
-  - 0
-  - 12
-  - 7
-  version: 1.0.12.7
+version: !ruby/object:Gem::Version
+  version: 2.1.6.1
+  prerelease:
 platform: ruby
-authors:
+authors:
 - Bill Kayser
+- Jon Guymon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-10-04 00:00:00 -05:00
-default_executable:
-dependencies:
-- !ruby/object:Gem::Dependency
+date: 2012-03-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: newrelic_rpm
+  requirement: &2164674940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.1
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement
+  version_requirements: *2164674940
+- !ruby/object:Gem::Dependency
+  name: newrelic_rpm
+  requirement: &2164674200 !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        hash: 57
-        segments:
-        - 2
-        - 13
-        - 1
-        version: 2.13.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.1
   type: :runtime
-  version_requirements: *id001
-description: |
-  Community contributed instrumentation for various frameworks based on
+  prerelease: false
+  version_requirements: *2164674200
+description: ! 'Community contributed instrumentation for various frameworks based
+  on
   the New Relic Ruby monitoring gem newrelic_rpm.
+'
 email: support@newrelic.com
 executables: []
 extensions: []
-extra_rdoc_files:
+extra_rdoc_files:
 - CHANGELOG
 - LICENSE
 - README.md
-files:
+files:
 - CHANGELOG
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/new_relic/control/camping.rb
 - lib/rpm_contrib.rb
+- lib/rpm_contrib/agent_compatibility.rb
+- lib/rpm_contrib/detection.rb
 - lib/rpm_contrib/detection/camping.rb
-- lib/rpm_contrib/detection/resque.rb
-- lib/rpm_contrib/instrumentation/aws/s3.rb
+- lib/rpm_contrib/instrumentation.rb
+- lib/rpm_contrib/instrumentation/active_messaging.rb
+- lib/rpm_contrib/instrumentation/aws.rb
 - lib/rpm_contrib/instrumentation/camping.rb
 - lib/rpm_contrib/instrumentation/cassandra.rb
-- lib/rpm_contrib/instrumentation/mongo_mapper.rb
+- lib/rpm_contrib/instrumentation/crack.rb
+- lib/rpm_contrib/instrumentation/curb.rb
+- lib/rpm_contrib/instrumentation/elastic_search.rb
+- lib/rpm_contrib/instrumentation/kyototycoon.rb
+- lib/rpm_contrib/instrumentation/mongo.rb
 - lib/rpm_contrib/instrumentation/mongoid.rb
 - lib/rpm_contrib/instrumentation/paperclip.rb
+- lib/rpm_contrib/instrumentation/picky.rb
 - lib/rpm_contrib/instrumentation/redis.rb
 - lib/rpm_contrib/instrumentation/resque.rb
+- lib/rpm_contrib/instrumentation/riak_client.rb
+- lib/rpm_contrib/instrumentation/ripple.rb
+- lib/rpm_contrib/instrumentation/sinatra.rb
+- lib/rpm_contrib/instrumentation/thinking_sphinx.rb
+- lib/rpm_contrib/instrumentation/typhoeus.rb
+- lib/rpm_contrib/instrumentation/ultrasphinx.rb
+- lib/rpm_contrib/instrumentation/workling.rb
+- lib/rpm_contrib/instrumentation/yajl.rb
+- lib/rpm_contrib/language_support.rb
+- lib/rpm_contrib/samplers.rb
 - test/helper.rb
 - test/schema.rb
-- test/test_mongoid.rb
+- test/test_curb.rb
+- test/test_picky.rb
 - test/test_redis.rb
-has_rdoc: true
+- test/test_resque.rb
+- test/test_workling.rb
 homepage: http://github.com/newrelic/rpm_contrib
 licenses: []
 post_install_message:
-rdoc_options:
-- --charset=UTF-8
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Contributed Instrumentation for New Relic RPM
 - -m
 - README.md
-require_paths:
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      hash: 3
-      segments:
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: 173223078226701245
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      hash: 3
-      segments:
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key:
 specification_version: 3
 summary: Contributed Instrumentation for New Relic RPM
-test_files:
-- test/helper.rb
-- test/schema.rb
-- test/test_mongoid.rb
-- test/test_redis.rb
+test_files: []