lib/instana/frameworks/rails.rb in instana-1.193.3.pre1 vs lib/instana/frameworks/rails.rb in instana-1.193.3

@@ -1,40 +1,28 @@
-require "instana/rack"
+if ::Rails::VERSION::MAJOR < 3
+  ::Rails.configuration.after_initialize do
+    # In Rails, let's use the Rails logger
+    ::Instana.logger = ::Rails.logger if ::Rails.logger
 
-if defined?(::Rails)
-  if ::Rails::VERSION::MAJOR < 3
-    ::Rails.configuration.after_initialize do
-      # In Rails, let's use the Rails logger
-      ::Instana.logger = ::Rails.logger if ::Rails.logger
-
-      if ::Instana.config[:tracing][:enabled]
-        ::Instana.logger.debug "Instrumenting Rack"
-        ::Rails.configuration.middleware.insert 0, ::Instana::Rack
-      else
-        ::Instana.logger.info "Rack: Tracing disabled via config.  Not enabling middleware."
-      end
+    if ::Instana.config[:tracing][:enabled]
+      ::Instana.logger.debug "Instrumenting Rack"
+      ::Rails.configuration.middleware.insert 0, ::Instana::Rack
+    else
+      ::Instana.logger.info "Rack: Tracing disabled via config.  Not enabling middleware."
     end
-  else
-    module ::Instana
-      class Railtie < ::Rails::Railtie
-        initializer 'instana.rack' do |app|
-          # In Rails, let's use the Rails logger
-          ::Instana.logger = ::Rails.logger if ::Rails.logger
+  end
+else
+  module ::Instana
+    class Railtie < ::Rails::Railtie
+      initializer 'instana.rack' do |app|
+        # In Rails, let's use the Rails logger
+        ::Instana.logger = ::Rails.logger if ::Rails.logger
 
-          if ::Instana.config[:tracing][:enabled]
-            ::Instana.logger.debug "Instrumenting Rack"
-            app.config.middleware.insert 0, ::Instana::Rack
-          else
-            ::Instana.logger.info "Rack: Tracing disabled via config.  Not enabling middleware."
-          end
-        end
-
         if ::Instana.config[:tracing][:enabled]
-          config.after_initialize do
-            require "instana/frameworks/instrumentation/active_record"
-            require "instana/frameworks/instrumentation/action_controller"
-            require "instana/frameworks/instrumentation/action_view"
-          end
+          ::Instana.logger.debug "Instrumenting Rack"
+          app.config.middleware.insert 0, ::Instana::Rack
+        else
+          ::Instana.logger.info "Rack: Tracing disabled via config.  Not enabling middleware."
         end
       end
     end
   end
 end