result.rb in newrelic_rpm-3.6.7.152

- old
+ new

@@ -1,9 +1,11 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
+require 'time'
+
 module Performance
   class Result
     attr_reader :test_name, :measurements, :tags, :timer, :artifacts
     attr_accessor :exception
 
@@ -50,27 +52,36 @@
 
     def measurements_hash
       @measurements.merge(:elapsed => elapsed)
     end
 
+    def format_timestamp(t)
+      t.utc.iso8601
+    end
+
     def to_h
-      {
+      h = {
         "suite"     => suite_name,
         "name"      => @test_name,
         "measurements" => measurements_hash,
-        "tags"         => @tags,
-        "exception"    => @exception,
-        "artifacts"    => @artifacts
+        "tags"         => @tags
       }
+      h['exception'] = @exception if @exception
+      h['artifacts'] = @artifacts if @artifacts && !@artifacts.empty?
+      h['started_at'] = format_timestamp(@timer.start_timestamp) if @timer.start_timestamp
+      h['finished_at'] = format_timestamp(@timer.stop_timestamp) if @timer.stop_timestamp
+      h
     end
 
     def self.from_hash(hash)
       elapsed = hash['measurements'].delete('elapsed')
       result = self.new(hash['suite'], hash['name'])
       result.measurements.merge! hash['measurements']
       result.tags.merge! hash['tags']
       result.exception = hash['exception']
       result.elapsed = elapsed
+      result.timer.start_timestamp = Time.iso8601(hash['started_at']) if hash['started_at']
+      result.timer.stop_timestamp = Time.iso8601(hash['finished_at']) if hash['finished_at']
       result
     end
 
     def inspect
       "<Performance::Result #{identifier}: #{elapsed} s, results=#{@results.inspect}>"