rpm_contrib 2.1.6 → 2.1.7

data/CHANGELOG

@@ -1,4 +1,15 @@
+* Version 2.1.7
+
+Community contributed instrumentation
+- ThinkingSphinx instrumentation improvement (Martin Sarsale)
+- Picky search engine instrumentation (Niko Dittmann)
+Community Contributed Bug Fixes
+- Fix instrumentation injection for ActiveMessaging (W. Andrew Loe III)
+Other
+- Improvements to resque instrumentation detection of if its in a forking ruby implementation
+
 * Version 2.1.6
+
   Community contributed instrumentation
   - ThinkingSphinx instrumentation (W. Andrew Loe III)
   - Riak instrumentation (Bryce Kerley)
@@ -6,7 +17,8 @@
   Community Contributed Bug Fixes
   - MongoDB instrumentation (Kenn Ejima)
   - Yajl instrumentation (Chris Griego)
-  Renamed ActiveMQ instrumentation to ActiveMessaging (W. Andrew Loe III)
+  - UltraSphinx instrumentation (Jonathan Rudenberg)
+  - Renamed ActiveMQ instrumentation to ActiveMessaging (W. Andrew Loe III)
 
 * Version 2.1.5
 

data/README.md

@@ -100,6 +100,12 @@ No special configuration required for Paperclip visibility.
 
 You can disable it by setting `disable_paperclip` to true in your newrelic.yml file.
 
+### Picky
+
+The gem will instrument the [Picky semantic search engine](http://florianhanke.com/picky/) so it should be visible in transaction traces and the web transactions page.
+
+You can disable it with `disable_picky` in your newrelic.yml file.
+
 ### MongoDB
 
 Our instrumentation works on the underlying 'Mongo' library.  
@@ -266,7 +272,8 @@ we'll be happy to help you work through it.
   files will be loaded when the RPM agent is initialized.
 * Add samplers to `lib/rpm_contrib/samplers`.  These classes are
   installed automatically when the RPM agent is initialized.
-* Add tests.  
+* Add tests.
+* Update README.md
 * Commit, do not mess with the Rakefile, version, or history.  (if you
   want to have your own version, that is fine but bump version in a
   commit by itself I can ignore when I pull)

data/lib/rpm_contrib/instrumentation/active_messaging.rb

@@ -1,24 +1,22 @@
-# == ActiveMessaging Instrumentation ==
-# Robert R. Meyer
-# Blue-Dog-Archolite @ GitHub
+# ActiveMessaging Instrumentation
 
 DependencyDetection.defer do
   @name = :active_messaging
-  
+
   depends_on do
     defined?(::ActiveMessaging::Processor) && !NewRelic::Control.instance['disable_active_messaging'] &&
       !NewRelic::Control.instance['disable_active_mq']
   end
-  
+
   executes do
     NewRelic::Agent.logger.debug 'Installing ActiveMessaging instrumentation'
   end
 
   executes do
     ::ActiveMessaging::Processor.class_eval do
-      class << self
-        add_method_tracer :on_message, 'ActiveMessaging/OnMessage'
-      end
+      include NewRelic::Agent::MethodTracer
+
+      add_method_tracer :on_message, 'ActiveMessaging/OnMessage'
     end
   end
 end

data/lib/rpm_contrib/instrumentation/picky.rb

@@ -0,0 +1,41 @@
+if defined?(::Picky)
+
+  class Picky::NewRelic
+    def self.obfuscate_tokens tokens
+      tokens.map { |t|
+        o = 'xxx'
+        o += '~' if t.similar?
+        o += '*' if t.partial?
+        o = t.qualifiers.sort.join(',') + ':' + o if t.qualifiers && t.qualifiers.respond_to?(:join)
+        o
+      }.sort.join(' ')
+    end
+  end
+
+end
+
+DependencyDetection.defer do
+  @name = :picky
+
+  depends_on do
+    defined?(::Picky::Search) && !NewRelic::Control.instance['disable_picky']
+  end
+
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Picky instrumentation'
+  end
+
+  executes do
+    ::Picky::Search.class_eval do
+      include NewRelic::Agent::MethodTracer
+
+      def execute_with_newrelic_trace *args
+        metrics = "Custom/Picky/search: #{Picky::NewRelic.obfuscate_tokens args[0]}"
+        self.class.trace_execution_scoped(metrics){ execute_without_newrelic_trace(*args) }
+      end
+
+      alias_method :execute_without_newrelic_trace, :execute
+      alias_method :execute, :execute_with_newrelic_trace
+    end
+  end
+end

data/lib/rpm_contrib/instrumentation/resque.rb

@@ -1,5 +1,8 @@
 require 'rpm_contrib/language_support'
 
+# call this now so it is memoized before potentially forking worker processes
+RPMContrib::LanguageSupport.can_fork?
+
 module Resque
   module Plugins
     module NewRelicInstrumentation

data/lib/rpm_contrib/instrumentation/thinking_sphinx.rb

@@ -14,6 +14,7 @@ DependencyDetection.defer do
       include NewRelic::Agent::MethodTracer
 
       add_method_tracer :initialize
+      add_method_tracer :populate
       add_method_tracer :results
     end
   end

data/lib/rpm_contrib/language_support.rb

@@ -20,7 +20,10 @@ module RPMContrib::LanguageSupport
   private
 
   def test_forkability
-    Process.fork { exit! }
+    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

data/test/test_picky.rb

@@ -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

metadata

@@ -1,53 +1,69 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rpm_contrib
-version: !ruby/object:Gem::Version
-  version: 2.1.6
+version: !ruby/object:Gem::Version 
+  hash: 5
   prerelease: 
+  segments: 
+  - 2
+  - 1
+  - 7
+  version: 2.1.7
 platform: ruby
-authors:
+authors: 
 - Bill Kayser
 - Jon Guymon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-08 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: newrelic_rpm
-  requirement: &70329403038300 !ruby/object:Gem::Requirement
+
+date: 2011-12-22 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 3
+        - 1
+        - 1
         version: 3.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *70329403038300
-- !ruby/object:Gem::Dependency
   name: newrelic_rpm
-  requirement: &70329403022960 !ruby/object:Gem::Requirement
+  prerelease: false
+  type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 3
+        - 1
+        - 1
         version: 3.1.1
-  type: :runtime
+  name: newrelic_rpm
   prerelease: false
-  version_requirements: *70329403022960
-description: ! 'Community contributed instrumentation for various frameworks based
-  on
-
+  type: :runtime
+  requirement: *id002
+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
@@ -69,6 +85,7 @@ files:
 - lib/rpm_contrib/instrumentation/kyototycoon.rb
 - lib/rpm_contrib/instrumentation/mongo.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
@@ -84,40 +101,47 @@ files:
 - test/helper.rb
 - test/schema.rb
 - test/test_curb.rb
+- test/test_picky.rb
 - test/test_redis.rb
 - test/test_resque.rb
 - test/test_workling.rb
 homepage: http://github.com/newrelic/rpm_contrib
 licenses: []
+
 post_install_message: 
-rdoc_options:
+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
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -3341867622411034151
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Contributed Instrumentation for New Relic RPM
 test_files: []
+