Navigation Menu

Skip to content
This repository has been archived by the owner on Apr 1, 2020. It is now read-only.

Commit

Permalink
RUBY-669 moved Resque instrumentation to newrelic_rpm
Browse files Browse the repository at this point in the history
  • Loading branch information
gnarg committed May 25, 2012
1 parent 35521ff commit dde214b
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 158 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG
@@ -1,3 +1,6 @@
* Version 2.1.11
- Removed Resque instrumentation in favor of instrumentation in main agent https://github.com/newrelic/rpm (version 3.4.0)

* Version 2.1.10
- Removed Workling instrumentation in favor of https://github.com/aurorafeint/newrelic-workling

Expand Down
8 changes: 0 additions & 8 deletions README.md
Expand Up @@ -156,14 +156,6 @@ Our instrumentation works on the underlying 'Mongo' library.

You can disable it by setting 'disable_mongodb' to true in your newrelic.yml file.

### Resque

To instrument jobs you no longer need to have your Job class inherit from Resque::Job or include
the Resque::Plugins::NewRelicInstrumentation module. The module definition was left in for
backward compatibility.

To disable resque, set 'disable_resque' to true in your newrelic.yml file.

### Redis

Redis instrumentation has been removed from rpm_contrib.
Expand Down
71 changes: 0 additions & 71 deletions lib/rpm_contrib/instrumentation/resque.rb

This file was deleted.

8 changes: 3 additions & 5 deletions rpm_contrib.gemspec
Expand Up @@ -5,11 +5,11 @@

Gem::Specification.new do |s|
s.name = "rpm_contrib"
s.version = "2.1.10"
s.version = "2.1.11"

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Bill Kayser", "Jon Guymon"]
s.date = "2012-05-17"
s.date = "2012-05-25"
s.description = "Community contributed instrumentation for various frameworks based on\nthe New Relic Ruby monitoring gem newrelic_rpm.\n"
s.email = "support@newrelic.com"
s.extra_rdoc_files = [
Expand Down Expand Up @@ -41,7 +41,6 @@ Gem::Specification.new do |s|
"lib/rpm_contrib/instrumentation/mongoid.rb",
"lib/rpm_contrib/instrumentation/paperclip.rb",
"lib/rpm_contrib/instrumentation/picky.rb",
"lib/rpm_contrib/instrumentation/resque.rb",
"lib/rpm_contrib/instrumentation/sinatra.rb",
"lib/rpm_contrib/instrumentation/thinking_sphinx.rb",
"lib/rpm_contrib/instrumentation/typhoeus.rb",
Expand All @@ -52,8 +51,7 @@ Gem::Specification.new do |s|
"test/helper.rb",
"test/schema.rb",
"test/test_curb.rb",
"test/test_picky.rb",
"test/test_resque.rb"
"test/test_picky.rb"
]
s.homepage = "http://github.com/newrelic/rpm_contrib"
s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Contributed Instrumentation for New Relic RPM", "-m", "README.md"]
Expand Down
74 changes: 0 additions & 74 deletions test/test_resque.rb

This file was deleted.

4 comments on commit dde214b

@jlecour
Copy link
Contributor

@jlecour jlecour commented on dde214b Jun 4, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi,

You have removed the Resque support from the "stable" version of this gem, saying that it is now in the main RPM gem but as of now, it's only on the dev branch (that will become version 3.4.0) which is not published yet.

Does it mean that there is no Resque instrumentation in RPM if we have the latest version of the two gems ?

Thanks

@samg
Copy link
Contributor

@samg samg commented on dde214b Jun 4, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jlecour, we're planning to release version 3.4.0 in a couple weeks, which, as you mention, adds resque support to the newrelic_rpm gem.

In the meantime you have a few options.

You can run 3.4.0.beta1 (http://rubygems.org/gems/newrelic_rpm/versions/3.4.0.beta1) which has the resque instrumentation included.

Alternatively, if you don't want to put a beta in production, I'd suggest running newrelic_rpm version 3.3.5 (the current GA) with the previous version of rpm_contrib (2.1.10). The only change made to rpm_contrib between 2.1.10 and 2.1.11 is to remove the resque instrumentation (and update the README).

Hopefully that will work for you. Sorry for the hassle.

@jlecour
Copy link
Contributor

@jlecour jlecour commented on dde214b Jun 4, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @samg

That's exactly what I've done ; specify the rpm_contrib version to 2.1.10 until newrelic_rpm 3.4 is released.

Thanks

@jagthedrummer
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the mean time someone should update the Resque docs on NewRelic. I wasted a lot of time trying to get things working before coming across this comment thread attached to a commit in the git repo. It's not really where I'd expect to have to go for up to date installation info.

Please sign in to comment.