diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb
index 8c0c86f3..e5f18631 100644
--- a/lib/travis/api/app.rb
+++ b/lib/travis/api/app.rb
@@ -1,4 +1,3 @@
-require 'skylight'
 require 'travis'
 require 'travis/model'
 require 'travis/support/amqp'
@@ -20,6 +19,7 @@ require 'metriks/reporter/logger'
 require 'metriks/librato_metrics_reporter'
 require 'travis/support/log_subscriber/active_record_metrics'
 require 'fileutils'
+require 'travis/api/instruments'
 require 'travis/api/v2/http'
 require 'travis/api/app/stack_instrumentation'
 
diff --git a/lib/travis/api/instruments.rb b/lib/travis/api/instruments.rb
new file mode 100644
index 00000000..a6973f8d
--- /dev/null
+++ b/lib/travis/api/instruments.rb
@@ -0,0 +1,6 @@
+require 'skylight'
+
+Travis.services.send(:services).each_value do |service|
+  service.send(:include, Skylight::Helpers)
+  service.send(:instrument_method, :run)
+end
\ No newline at end of file