Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #28 from alinpopa/remove_riak

Remove riak-client and ripple references.

Remove reference to riak-client and ripple as they're moved to a separate project: https://github.com/alinpopa/newrelic-riak
  • Loading branch information...
commit 7238d49b4704b9aa4676054d1195a776c222ac94 2 parents 84a906d + 9e97c0e
Sam Goldstein samg authored
14 README.md
View
@@ -165,20 +165,6 @@ Redis instrumentation has been removed from rpm_contrib.
Please use Evan Phoenix's `newrelic-redis` gem instead.
https://github.com/evanphx/newrelic-redis
-### Riak
-
-RiakClient is instrumented. Its opereations are recorded under Database in the
-the response time graph.
-
-To disable Riak instrumentation, set 'disable_riak_client' to true in your newrelic.yml file.
-
-### Ripple
-
-Ripple is instrumented. Its opereations are recorded under Database in the
-the response time graph.
-
-To disable Riak instrumentation, set 'disable_ripple' to true in your newrelic.yml file.
-
### Sinatra view instrumentation
This adds instrumentation to the `render` methods in Sinatra::Base
48 lib/rpm_contrib/instrumentation/riak_client.rb
View
@@ -1,48 +0,0 @@
-DependencyDetection.defer do
- @name = :riak_client
-
- depends_on do
- defined?(::Riak) and not NewRelic::Control.instance['disable_riak_client']
- end
-
- executes do
- NewRelic::Agent.logger.debug 'Installing Riak client instrumentation'
- end
-
- executes do
- backend_tracers = proc do
- add_method_tracer :ping, 'Database/Riak/ping'
-
- add_method_tracer :list_buckets, 'Database/Riak/list_buckets'
- add_method_tracer :get_bucket_props, 'Database/Riak/get_bucket_props'
- add_method_tracer :set_bucket_props, 'Database/Riak/set_bucket_props'
-
- add_method_tracer :mapred, 'Database/Riak/mapred'
-
- add_method_tracer :list_keys, 'Database/Riak/list_keys'
- add_method_tracer :fetch_object, 'Database/Riak/fetch_object'
- add_method_tracer :reload_object, 'Database/Riak/reload_object'
- add_method_tracer :store_object, 'Database/Riak/store_object'
- add_method_tracer :delete_object, 'Database/Riak/delete_object'
- end
-
- ::Riak::Client::BeefcakeProtobuffsBackend.class_eval &backend_tracers
- ::Riak::Client::BeefcakeProtobuffsBackend.class_eval do
- add_method_tracer :server_info, 'Database/Riak/server_info'
- add_method_tracer :get_client_id, 'Database/Riak/get_client_id'
- add_method_tracer :set_client_id, 'Database/Riak/set_client_id'
- end
- ::Riak::Client::HTTPBackend.class_eval &backend_tracers
- ::Riak::Client::HTTPBackend.class_eval do
- add_method_tracer :stats, 'Database/Riak/stats'
- add_method_tracer :link_walk, 'Database/Riak/link_walk'
- add_method_tracer :get_index, 'Database/Riak/get_index'
- add_method_tracer :search, 'Database/Riak/search'
- add_method_tracer :update_search_index, 'Database/Riak/update_search_index'
- end
-
- ::Riak::RObject.class_eval do
- add_method_tracer :serialize, 'Database/Riak/serialize'
- end
- end
-end
39 lib/rpm_contrib/instrumentation/ripple.rb
View
@@ -1,39 +0,0 @@
-DependencyDetection.defer do
- @name = :ripple
-
- depends_on do
- defined?(::Ripple) and not
- NewRelic::Control.instance['disable_ripple']
- end
-
- executes do
- NewRelic::Agent.logger.debug 'Installing Ripple instrumentation'
- end
-
- executes do
- (defined?(::Ripple::Callbacks::InstanceMethods) ?
- ::Ripple::Callbacks::InstanceMethods : ::Ripple::Callbacks).class_eval do
- add_method_tracer :valid?, 'Database/Riak/Ripple/valid?'
- end
-
- ::Ripple::Document::Persistence::ClassMethods.class_eval do
- add_method_tracer :create, 'Database/Riak/Ripple/create'
- add_method_tracer :destroy_all, 'Database/Riak/Ripple/destroy_all'
- end
-
-
- (defined?(::Ripple::Document::Persistence::InstanceMethods) ?
- ::Ripple::Document::Persistence::InstanceMethods : ::Ripple::Document::Persistence).class_eval do
- add_method_tracer :really_save, 'Database/Riak/Ripple/really_save'
- add_method_tracer :reload, 'Database/Riak/Ripple/reload'
- add_method_tracer :destroy!, 'Database/Riak/Ripple/destroy'
- add_method_tracer :update_attribute, 'Database/Riak/Ripple/update_attribute'
- add_method_tracer :update_attributes, 'Database/Riak/Ripple/update_attributes'
- end
-
- ::Ripple::Document::Finders::ClassMethods.class_eval do
- add_method_tracer :find, 'Database/Riak/Ripple/find'
- add_method_tracer :list, 'Database/Riak/Ripple/list'
- end
- end
-end
2  rpm_contrib.gemspec
View
@@ -42,8 +42,6 @@ Gem::Specification.new do |s|
"lib/rpm_contrib/instrumentation/paperclip.rb",
"lib/rpm_contrib/instrumentation/picky.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",
Please sign in to comment.
Something went wrong with that request. Please try again.