use faster time method

Author: grosser

Gemfile

@@ -14,8 +14,8 @@ group :localdev do
 end
 
 group :test do
-  gem "timecop"
   gem 'tins', '~> 1.6.0'
+  gem 'mocha'
   if RbConfig::CONFIG['ruby_version'].start_with?("1.9")
     gem 'json', '< 2'
     gem 'public_suffix', '< 1.5'

lib/datadog/statsd.rb

@@ -218,10 +218,11 @@ def timing(stat, ms, opts={})
     #   $statsd.time('account.activate') { @account.activate! }
     def time(stat, opts={})
       opts = {:sample_rate => opts} if opts.is_a? Numeric
-      start = Time.now
+      start = (PROCESS_TIME_SUPPORTED ? Process.clock_gettime(Process::CLOCK_MONOTONIC) : Time.now.to_f)
       return yield
     ensure
-      time_since(stat, start, opts)
+      finished = (PROCESS_TIME_SUPPORTED ? Process.clock_gettime(Process::CLOCK_MONOTONIC) : Time.now.to_f)
+      timing(stat, ((finished - start) * 1000).round, opts)
     end
     # Sends a value to be tracked as a set to the statsd server.
     #
@@ -237,7 +238,6 @@ def set(stat, value, opts={})
       send_stats stat, value, SET_TYPE, opts
     end
 
-
     # This method allows you to send custom service check statuses.
     #
     # @param [String] name Service check name
@@ -356,9 +356,10 @@ def close()
     DOT = ".".freeze
     DOUBLE_COLON = "::".freeze
     UNDERSCORE = "_".freeze
+    PROCESS_TIME_SUPPORTED = (RUBY_VERSION >= "2.1.0")
 
     private_constant :NEW_LINE, :ESC_NEW_LINE, :COMMA, :BLANK, :PIPE, :DOT,
-      :DOUBLE_COLON, :UNDERSCORE
+      :DOUBLE_COLON, :UNDERSCORE, :PROCESS_TIME_SUPPORTED
 
     def escape_event_content(msg)
       msg.gsub NEW_LINE, ESC_NEW_LINE
@@ -383,10 +384,6 @@ def escape_service_check_message(msg)
       escape_event_content(msg).gsub('m:'.freeze, 'm\:'.freeze)
     end
 
-    def time_since(stat, start, opts)
-      timing(stat, ((Time.now - start) * 1000).round, opts)
-    end
-
     def join_array_to_str(str, array, joiner)
       array.each_with_index do |item, i|
         str << joiner unless i == 0

spec/helper.rb

@@ -1,10 +1,8 @@
-require 'rubygems'
 require 'bundler/setup'
 require 'minitest/autorun'
 require 'faker'
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 
 require 'simplecov'
 SimpleCov.start

spec/statsd_spec.rb

@@ -1,7 +1,7 @@
-require 'helper'
+require_relative 'helper'
 require 'socket'
 require 'stringio'
-require 'timecop'
+require 'mocha/mini_test'
 
 describe Datadog::Statsd do
   class Datadog::Statsd
@@ -265,32 +265,27 @@ class Datadog::Statsd
   describe "#time" do
     describe "With actual time testing" do
       before do
-        # Freezing time to prevent random test failures
-        Timecop.freeze Time.now
-      end
-
-      after do
-        Timecop.return
+        stub_time 0 # Freezing time to prevent random test failures
       end
 
       it "should format the message according to the statsd spec" do
         @statsd.time('foobar') do
-          Timecop.freeze(Time.now + 1)
+          stub_time 1
         end
         @statsd.socket.recv.must_equal ['foobar:1000|ms']
       end
 
       it "should still time if block is failing" do
         @statsd.time('foobar') do
-          Timecop.freeze(Time.now + 1)
+          stub_time 1
           raise StandardError, 'This is failing'
         end rescue
         @statsd.socket.recv.must_equal ['foobar:1000|ms']
       end
 
       def helper_time_return
         @statsd.time('foobar') do
-          Timecop.freeze(Time.now + 1)
+          stub_time 1
           return
         end
       end
@@ -315,8 +310,9 @@ def helper_time_return
     describe "with a sample rate" do
       before { class << @statsd; def rand; 0; end; end } # ensure delivery
       it "should format the message according to the statsd spec" do
+        stub_time 0
         @statsd.time('foobar', :sample_rate=>0.5) do
-          Timecop.freeze(Time.now + 1)
+          stub_time 1
         end
         @statsd.socket.recv.must_equal ['foobar:1000|ms|@0.5']
       end
@@ -325,8 +321,9 @@ def helper_time_return
     describe "with a sample rate like statsd-ruby" do
       before { class << @statsd; def rand; 0; end; end } # ensure delivery
       it "should format the message according to the statsd spec" do
+        stub_time 0
         @statsd.time('foobar', 0.5) do
-          Timecop.freeze(Time.now + 1)
+          stub_time 1
         end
         @statsd.socket.recv.must_equal ['foobar:1000|ms|@0.5']
       end
@@ -863,6 +860,15 @@ def send(*)
       @statsd.close
     end
   end
+
+  def stub_time(shift)
+    t = 12345.0 + shift
+    if RUBY_VERSION >= "2.1.0"
+      Process.stubs(:clock_gettime).returns(t)
+    else
+      Time.stubs(:now).returns(Time.at(t))
+    end
+  end
 end
 
 describe Datadog::Statsd do