lib/elasticsearch/rails/instrumentation/publishers.rb in elasticsearch-rails-0.1.5 vs lib/elasticsearch/rails/instrumentation/publishers.rb in elasticsearch-rails-0.1.6

@@ -7,25 +7,31 @@
         #
         # @see SearchRequest#execute_with_instrumentation!
         # @see http://api.rubyonrails.org/classes/ActiveSupport/Notifications.html
         #
         module SearchRequest
-          extend ActiveSupport::Concern
 
-          included do
-            alias_method_chain :execute!, :instrumentation
-          end
+          def self.included(base)
+            base.class_eval do
+              alias_method :execute_without_instrumentation!, :execute!
 
-          # Wrap `Search#execute!` and perform instrumentation
-          #
-          def execute_with_instrumentation!
-            ActiveSupport::Notifications.instrument "search.elasticsearch",
-              name:   'Search',
-              klass:  (self.klass.is_a?(Elasticsearch::Model::Proxy::ClassMethodsProxy) ? self.klass.target.to_s : self.klass.to_s),
-              search: self.definition do
-              execute_without_instrumentation!
+              def execute!
+                execute_with_instrumentation!
+              end
+
+              # Wrap `Search#execute!` and perform instrumentation
+              #
+              def execute_with_instrumentation!
+                ActiveSupport::Notifications.instrument "search.elasticsearch",
+                  name:   'Search',
+                  klass:  (self.klass.is_a?(Elasticsearch::Model::Proxy::ClassMethodsProxy) ? self.klass.target.to_s : self.klass.to_s),
+                  search: self.definition do
+                  execute_without_instrumentation!
+                end
+              end
             end
           end
+
         end
       end
     end
   end
 end