rpm_contrib 2.1.11 → 2.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c89ae55085151aeaeab9dd46ffc94cc91ea43274
+  data.tar.gz: edfd7921ae4b256e4470db825609d9f0d8d87346
+SHA512:
+  metadata.gz: 45eacf31f79ddbd00adbe58e9b2580bd880d0451eaae81445d07cc7bc2d2f5dc64fbe0c22125ff249fbb078fe714079bfebff8b966ca8ac6fbd72e4315b60a0b
+  data.tar.gz: 2a642b389af45f6878c1d3a18da9e480032d2898b8ef345de657a5aee7f01376483b3100cacb61430437f2bbce0c7a5364f821a1d22c762996f3306af78291e8

data/CHANGELOG

@@ -1,3 +1,7 @@
+* Version 2.2.0
+  - Final version of rpm_contrib, with post-install deprecation message
+  - Use Addressable::URI from Curb instrumentation (Amir Yalon)
+
 * Version 2.1.11
   - Removed Resque instrumentation in favor of instrumentation in main agent https://github.com/newrelic/rpm (version 3.4.0)
 

data/README.md

@@ -17,6 +17,11 @@ If you're interested in maintaining instrumentation for a specific
 library/framework, please let us know.  We'd love to work with you and promote
 your project.  -The New Relic Ruby Agent Team
 
+## extends_newrelic_rpm
+We've started tracking gems that extend the New Relic Ruby agent via a git
+repository at http://github.com/newrelic/extends_newrelic_rpm. Check that out for
+a longer list of projects if you don't find what you need listed directly here.
+
 ## New Relic Ruby Agent Plugins (Seperate Projects)
 
 Here is a list of instrumentation projects for various Ruby libraries:
@@ -28,6 +33,16 @@ Please use Evan Phoenix's `newrelic-redis` gem instead.
 
 https://github.com/evanphx/newrelic-redis
 
+#### Mongoid 3 / Moped
+
+Instrumentation for Mongoid 3 / Moped:
+
+https://github.com/stevebartholomew/newrelic_moped
+
+#### Mongoid 2 / Mongo:
+
+https://github.com/raphaelcm/newrelic_mongo
+
 #### Faraday
 
 Instrumentation for the HTTP client library Faraday is available at:
@@ -46,6 +61,24 @@ Workling instrumenatation can be found at:
 
 https://github.com/aurorafeint/newrelic-workling
 
+#### Sequel
+
+`newrelic_rpm` version 3.6.2 supports Sequel directly.
+Older agent versions can use the Sequel gem found at:
+
+https://github.com/realestate-com-au/newrelic-sequel
+
+#### Excon
+
+Instrumentation for the Excon gem can be found at:
+
+https://github.com/helle/newrelic-excon
+
+#### Typhoeus
+
+Instrumentation for the Typhoeus gem can be found at:
+
+https://github.com/sportngin/newrelic-typhoeus
 
 ## Getting Started
 

data/lib/rpm_contrib.rb

@@ -14,7 +14,7 @@ require 'rpm_contrib/samplers'
 
 if defined? Rails
   # Rails 3.x+
-  if Rails.respond_to?(:version) && Rails.version =~ /^3/
+  if Rails.respond_to?(:version) && Rails.version.to_s =~ /^(3|4)/
     module NewRelic
       class Railtie < Rails::Railtie
         initializer("rpm_contrib.start_plugin"){ NewRelic::Control.instance.init_plugin }
@@ -27,10 +27,9 @@ if defined? Rails
     raise "The rpm_contrib gem supports Rails 2.2+ only."
   end
 else
-  # If not running Rails, it is important that you load the contrib gem as late 
-  # as possible so the agent initializes after everything else.  Either that 
+  # If not running Rails, it is important that you load the contrib gem as late
+  # as possible so the agent initializes after everything else.  Either that
   # or make the following call yourself at the end of your startup sequence
   # (it is idempotent).
-  NewRelic::Control.instance.init_plugin 
+  NewRelic::Control.instance.init_plugin
 end
-

data/lib/rpm_contrib/instrumentation/aws.rb

@@ -3,7 +3,7 @@ DependencyDetection.defer do
   @name = :aws
   
   depends_on do
-    defined?(::AWS::S3) && !NewRelic::Control.instance['disable_aws-s3']
+    defined?(::AWS::S3::Connection) && !NewRelic::Control.instance['disable_aws-s3']
   end
   
   executes do

data/lib/rpm_contrib/instrumentation/curb.rb

@@ -11,8 +11,9 @@ DependencyDetection.defer do
   
   executes do
     ::Curl::Easy.class_eval do
+      URI_CLASS = defined?(::Addressable) ? ::Addressable::URI : URI
       def host
-        URI.parse(self.url).host
+        self.url.respond_to?(:host) ? self.url.host : URI_CLASS.parse(self.url).host
       end
 
       # TODO: http, http_delete, http_get, http_post, http_head, http_put

data/lib/rpm_contrib/instrumentation/mongo.rb

@@ -15,6 +15,7 @@ DependencyDetection.defer do
       include NewRelic::Agent::MethodTracer
 
       def instrument_with_newrelic_trace(name, payload = {}, &blk)
+        payload = {} if payload.nil?
         collection = payload[:collection]
         if collection == '$cmd'
           f = payload[:selector].first

data/lib/rpm_contrib/instrumentation/mongoid.rb

@@ -2,7 +2,7 @@ DependencyDetection.defer do
   @name = :mongoid
 
   depends_on do
-    defined?(::Mongoid) and not NewRelic::Control.instance['disable_mongoid']
+    defined?(::Mongoid) && Mongoid::VERSION.to_i == 2 && !NewRelic::Control.instance['disable_mongoid']
   end
 
   executes do

metadata

@@ -1,69 +1,41 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rpm_contrib
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
-  segments: 
-  - 2
-  - 1
-  - 11
-  version: 2.1.11
+version: !ruby/object:Gem::Version
+  version: 2.2.0
 platform: ruby
-authors: 
+authors:
 - Bill Kayser
 - Jon Guymon
+- Jason Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: newrelic_rpm
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 1
-        - 1
+      - !ruby/object:Gem::Version
         version: 3.1.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: newrelic_rpm
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 1
-        - 1
+      - !ruby/object:Gem::Version
         version: 3.1.1
-  type: :runtime
-  version_requirements: *id002
 description: |
-  Community contributed instrumentation for various frameworks based on
-  the New Relic Ruby monitoring gem newrelic_rpm.
-
+  Deprecated community contributed instrumentation for various frameworks based on New Relic's 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
@@ -100,41 +72,37 @@ files:
 - test/test_picky.rb
 homepage: http://github.com/newrelic/rpm_contrib
 licenses: []
-
-post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
+metadata: {}
+post_install_message: |
+  *********************************************************************
+  WARNING: rpm_contrib is deprecated. New Relic recommends moving to
+  gems listed at https://github.com/newrelic/extends_newrelic_rpm for
+  further instrumentation. :thanks:
+  *********************************************************************
+rdoc_options:
+- "--line-numbers"
+- "--inline-source"
+- "--title"
 - Contributed Instrumentation for New Relic RPM
-- -m
+- "-m"
 - README.md
-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: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 3
 summary: Contributed Instrumentation for New Relic RPM
 test_files: []
-
+has_rdoc: