instana 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5365232626cec032868d014b49d9546ad3666054
-  data.tar.gz: dd74cbb686e5ae9f1af30c0a5089fd9ef4ba5ffb
+  metadata.gz: 13bb5e402c5c26c740336cf7e2d8befcad0e51a3
+  data.tar.gz: bc4f70fd52e2b10f9201fb8b8d76a6f50810de68
 SHA512:
-  metadata.gz: 8b4d5259417d9adedf6d8d50448a8c13ab85487c79d131e588c35cbc9ded33b11899830f2c4c78208789d72c61f2a51f383a4b07a812ba8b365642c293d84130
-  data.tar.gz: 27ae34fecb6fa90360bc06ebfdb90df85e83bda16c1af39dc6e6985a1ced9f391c47799f9bb75c8d8359ace921b0f5c116bc5798c611b0723b60de2137c5d802
+  metadata.gz: 3a6aae1e10996b86988aa78c742cfd301b57d7afca23ef8d0361b2d6312b858517b7756d1254ff4f3e3ac6f308c3f4f8d2c7bd3c79257fe5d63d7e6985bb39fc
+  data.tar.gz: bf262a7804ab27694c86996be1c48b413775a4c9b18211d0930ed1fd968eab9cd35be2f91ee61b8e1b40acc075714a2d6af8c51a70541ec0ed4ed15fea480945

data/.travis.yml

@@ -6,10 +6,10 @@ cache:
     - vendor/bundle
 
 rvm:
+  - 2.4.1
   - 2.3.3
   - 2.2.6
   - 2.1.9
-  - ruby-2.0.0-p648
 
 
 before_install:
@@ -38,11 +38,8 @@ matrix:
     # Rails 5.0+ requires Ruby 2.2.2 or higher
     - rvm: 2.1.9
       gemfile: gemfiles/rails50.gemfile
-    - rvm: ruby-2.0.0-p648
-      gemfile: gemfiles/rails50.gemfile
-    - rvm: ruby-2.0.0-p648
-      gemfile: gemfiles/rails42.gemfile
-    - rvm: ruby-2.0.0-p648
+    # Rails 3.2 doesn't work on Ruby 2.4.1
+    - rvm: 2.4.1
       gemfile: gemfiles/rails32.gemfile
 
 notifications:

data/Rakefile

@@ -31,7 +31,8 @@ Rake::TestTask.new(:test) do |t|
   else
     t.test_files = FileList['test/agent/*_test.rb'] +
                    FileList['test/tracing/*_test.rb'] +
-                   FileList['test/profiling/*_test.rb']
+                   FileList['test/profiling/*_test.rb'] +
+                   FileList['test/benchmarks/bench_*.rb']
   end
 end
 

data/benchmarks/opentracing.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+require "bundler"
+Bundler.require(:default)
+
+require "benchmark"
+
+Benchmark.bm do |x|
+  x.report("start_span, finish:             ") {
+    50_000.times {
+      ::Instana.tracer.start_span(:blah).finish
+    }
+  }
+
+  x.report("start_span, set_tag(5x), finish:") {
+    50_000.times {
+      span = ::Instana.tracer.start_span(:blah)
+      span.set_tag(:blah, 1)
+      span.set_tag(:dog, 1)
+      span.set_tag(:moon, "ok")
+      span.set_tag(:ape, 1)
+      span.set_tag(:blah, 1)
+      span.finish
+    }
+  }
+
+end

data/benchmarks/time_processing.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+require "bundler"
+Bundler.require(:default)
+
+require "benchmark"
+
+# Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
+
+Benchmark.bm do |x|
+  x.report("Time.now:     ") { 1_000_000.times { (Time.now.to_f * 1000).floor } }
+  x.report("get_clocktime:") { 1_000_000.times { Process.clock_gettime(Process::CLOCK_REALTIME, :millisecond) } }
+end

data/gemfiles/rails32.gemfile

@@ -33,7 +33,6 @@ end
 gem 'rails', '3.2.22.5'
 gem 'pg'
 gem 'mysql2', '~> 0.3.10'
-gem 'mysql'
 
 # Gems used only for assets and not required
 # in production environments by default.

data/gemfiles/rails42.gemfile

@@ -30,7 +30,7 @@ group :development do
   end
 end
 
-gem 'rails', '4.2.7.1'
+gem 'rails', '4.2.9'
 gem 'sqlite3'
 gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
@@ -43,7 +43,6 @@ gem 'jbuilder', '~> 2.0'
 gem 'sdoc', '~> 0.4.0', group: :doc
 gem "pg"
 gem "mysql2"
-gem "mysql"
 
 # Include the Instana Ruby gem's base set of gems
 gemspec :path => File.expand_path(File.dirname(__FILE__) + '/../')

data/instana.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.test_files    = Dir.glob("{test}/**/*.rb")
 
-  spec.required_ruby_version = '>= 2.0'
+  spec.required_ruby_version = '>= 2.1'
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/instana/tracer.rb

@@ -135,7 +135,7 @@ module Instana
     # @param name [String] the name of the span to end
     # @param kvs [Hash] list of key values to be reported in the span
     #
-    def log_end(name, kvs = {}, end_time = Time.now)
+    def log_end(name, kvs = {}, end_time = ::Instana::Util.now_in_ms)
       return unless tracing?
 
       if ::Instana.debug? || ::Instana.test?
@@ -146,14 +146,16 @@ module Instana
 
       self.current_trace.finish(kvs, end_time)
 
-      if !self.current_trace.has_async? ||
-          (self.current_trace.has_async? && self.current_trace.complete?)
-        Instana.processor.add(self.current_trace)
-      else
-        # This trace still has outstanding/uncompleted asynchronous spans.
-        # Put it in the staging queue until the async span closes out or
-        # 5 minutes has passed.  Whichever comes first.
-        Instana.processor.stage(self.current_trace)
+      if ::Instana.agent.ready?
+        if !self.current_trace.has_async? ||
+            (self.current_trace.has_async? && self.current_trace.complete?)
+          Instana.processor.add(self.current_trace)
+        else
+          # This trace still has outstanding/uncompleted asynchronous spans.
+          # Put it in the staging queue until the async span closes out or
+          # 5 minutes has passed.  Whichever comes first.
+          Instana.processor.stage(self.current_trace)
+        end
       end
       self.current_trace = nil
     end
@@ -261,8 +263,8 @@ module Instana
     #
     # @return [Span]
     #
-    def start_span(operation_name, child_of: nil, start_time: Time.now, tags: nil)
-      return unless ::Instana.agent.ready?
+    def start_span(operation_name, child_of: nil, start_time: ::Instana::Util.now_in_ms, tags: nil)
+      # return unless ::Instana.agent.ready?
 
       if tracing?
         span = self.current_trace.new_span(operation_name, tags, start_time, child_of)

data/lib/instana/tracing/span.rb

@@ -10,7 +10,7 @@ module Instana
     attr_accessor :parent
     attr_accessor :baggage
 
-    def initialize(name, trace_id, parent_id: nil, start_time: Time.now)
+    def initialize(name, trace_id, parent_id: nil, start_time: ::Instana::Util.now_in_ms)
       @data = {}
       @data[:t] = trace_id                    # Trace ID
       @data[:s] = ::Instana::Util.generate_id # Span ID
@@ -22,7 +22,11 @@ module Instana
       @data[:f] = { :e => ::Instana.agent.report_pid,
                     :h => ::Instana.agent.agent_uuid }
       # Start time
-      @data[:ts] = ::Instana::Util.time_to_ms(start_time)
+      if start_time.is_a?(Time)
+        @data[:ts] = ::Instana::Util.time_to_ms(start_time)
+      else
+        @data[:ts] = start_time
+      end
 
       @baggage = {}
 
@@ -119,12 +123,13 @@ module Instana
     # @param end_time [Time] custom end time, if not now
     # @return [Span]
     #
-    def close(end_time = Time.now)
-      unless end_time.is_a?(Time)
-        ::Instana.logger.debug "span.close: Passed #{end_time.class} instead of Time class"
+    def close(end_time = ::Instana::Util.now_in_ms)
+
+      if end_time.is_a?(Time)
+        end_time = ::Instana::Util.time_to_ms(end_time)
       end
 
-      @data[:d] = (::Instana::Util.time_to_ms(end_time) - @data[:ts])
+      @data[:d] = end_time - @data[:ts]
       self
     end
 
@@ -349,11 +354,7 @@ module Instana
     #
     # @param end_time [Time] custom end time, if not now
     #
-    def finish(end_time = Time.now)
-      unless end_time.is_a?(Time)
-        ::Instana.logger.debug "span.finish: Passed #{end_time.class} instead of Time class"
-      end
-
+    def finish(end_time = ::Instana::Util.now_in_ms)
       if ::Instana.tracer.current_span.id != id
         ::Instana.logger.debug "Closing a span that isn't active. This will result in a broken trace: #{self.inspect}"
       end

data/lib/instana/tracing/trace.rb

@@ -17,7 +17,7 @@ module Instana
     #     :span_id the ID of the parent span (must be an unsigned hex-string)
     #     :level specifies data collection level (optional)
     #
-    def initialize(name, kvs = nil, incoming_context = {}, start_time = Time.now)
+    def initialize(name, kvs = nil, incoming_context = {}, start_time = ::Instana::Util.now_in_ms)
       # The collection of spans that make
       # up this trace.
       @spans = Set.new
@@ -56,7 +56,7 @@ module Instana
     # @param name [String] the name of the span to start
     # @param kvs [Hash] list of key values to be reported in the span
     #
-    def new_span(name, kvs = nil, start_time = Time.now, child_of = nil)
+    def new_span(name, kvs = nil, start_time = ::Instana::Util.now_in_ms, child_of = nil)
       return unless @current_span
 
       if child_of && child_of.is_a?(::Instana::Span)
@@ -104,21 +104,12 @@ module Instana
     #
     # @param kvs [Hash] list of key values to be reported in the span
     #
-    def end_span(kvs = {}, end_time = Time.now)
+    def end_span(kvs = {}, end_time = ::Instana::Util.now_in_ms)
       @current_span.close(end_time)
       add_info(kvs) if kvs && !kvs.empty?
       @current_span = @current_span.parent unless @current_span.is_root?
     end
-
-    # Closes out the final span in this trace and runs any finalizer
-    # steps required.
-    # This should be called only when on the root span to end the trace.
-    #
-    # @param kvs [Hash] list of key values to be reported in the span
-    #
-    def finish(kvs = {}, end_time = Time.now)
-      end_span(kvs, end_time)
-    end
+    alias finish end_span
 
     ###########################################################################
     # Asynchronous Methods

data/lib/instana/util.rb

@@ -158,19 +158,21 @@ module Instana
         process
       end
 
-      # Get the current time in milliseconds
+      # Get the current time in milliseconds from the epoch
       #
       # @return [Integer] the current time in milliseconds
       #
-      def ts_now
-        (Time.now.to_f * 1000).floor
+      def now_in_ms
+        Process.clock_gettime(Process::CLOCK_REALTIME, :millisecond)
       end
+      # Prior method name support.  To be deprecated when appropriate.
+      alias ts_now now_in_ms
 
       # Convert a Time value to milliseconds
       #
       # @param time [Time]
       #
-      def time_to_ms(time = Time.now)
+      def time_to_ms(time)
         (time.to_f * 1000).floor
       end
 

data/lib/instana/version.rb

@@ -1,4 +1,4 @@
 module Instana
-  VERSION = "1.7.3"
+  VERSION = "1.7.4"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/test/benchmarks/bench_opentracing.rb

@@ -5,6 +5,7 @@ class BenchOpenTracing < Minitest::Benchmark
     assert_performance_constant do |input|
       10_000.times do
         span = ::Instana.tracer.start_span(:blah)
+        span.set_tag(:zero, 0)
         span.finish
       end
     end

data/test/test_helper.rb

@@ -9,6 +9,7 @@ require "minitest/autorun"
 require "minitest/reporters"
 require "minitest/debugger" if ENV['DEBUG']
 require 'webmock/minitest'
+require "minitest/benchmark"
 
 require "instana/test"
 ::Instana::Test.setup_environment

data/test/tracing/custom_test.rb

@@ -22,6 +22,11 @@ class CustomTracingTest < Minitest::Test
     first_span = t.spans.first
     assert_equal :sdk, first_span[:n]
 
+    assert first_span[:ts].is_a?(Integer)
+    assert first_span[:ts] > 0
+    assert first_span[:d].is_a?(Integer)
+    assert first_span[:d].between?(0, 5)
+
     assert first_span.key?(:data)
     assert first_span[:data].key?(:sdk)
     assert first_span[:data][:sdk].key?(:custom)
@@ -64,6 +69,11 @@ class CustomTracingTest < Minitest::Test
 
     first_span, second_span = t.spans.to_a
 
+    assert first_span[:ts].is_a?(Integer)
+    assert first_span[:ts] > 0
+    assert first_span[:d].is_a?(Integer)
+    assert first_span[:d].between?(0, 5)
+
     assert_equal :rack, first_span[:n]
     assert first_span.key?(:data)
     assert first_span[:data].key?(:on_trace_start)
@@ -117,6 +127,11 @@ class CustomTracingTest < Minitest::Test
 
     first_span, second_span = t.spans.to_a
 
+    assert first_span[:ts].is_a?(Integer)
+    assert first_span[:ts] > 0
+    assert first_span[:d].is_a?(Integer)
+    assert first_span[:d].between?(0, 5)
+
     assert_equal :rack, first_span[:n]
     assert first_span.key?(:data)
     assert first_span[:data].key?(:on_trace_start)
@@ -124,6 +139,11 @@ class CustomTracingTest < Minitest::Test
     assert first_span[:data].key?(:on_trace_end)
     assert_equal 1, first_span[:data][:on_trace_end]
 
+    assert second_span[:ts].is_a?(Integer)
+    assert second_span[:ts] > 0
+    assert second_span[:d].is_a?(Integer)
+    assert second_span[:d].between?(0, 5)
+
     assert_equal :sdk, second_span[:n]
     assert second_span.key?(:data)
     assert second_span[:data].key?(:sdk)

data/test/tracing/opentracing_test.rb

@@ -90,6 +90,10 @@ class OpenTracerTest < Minitest::Test
     first_span, second_span, third_span = trace.spans.to_a
 
     assert_equal :rack, first_span.name
+    assert first_span[:ts].is_a?(Integer)
+    assert first_span[:ts] > 0
+    assert first_span[:d].is_a?(Integer)
+    assert first_span[:d].between?(0, 5)
     assert first_span.key?(:data)
     assert first_span[:data].key?(:http)
     assert_equal "GET", first_span[:data][:http][:method]
@@ -160,6 +164,33 @@ class OpenTracerTest < Minitest::Test
     span.finish
   end
 
+  def test_start_span_with_custom_start_time
+    clear_all!
+    now = Time.now
+    now_in_ms = ::Instana::Util.time_to_ms(now)
+
+    span = OpenTracing.start_span('my_app_entry', :start_time => now)
+
+    assert span.is_a?(::Instana::Span)
+    assert_equal :my_app_entry, OpenTracing.current_trace.current_span.name
+
+    span.set_tag(:tag_integer, 1234)
+    span.set_tag(:tag_boolean, true)
+    span.set_tag(:tag_array, [1,2,3,4])
+    span.set_tag(:tag_string, "1234")
+
+    assert_equal 1234, span.tags(:tag_integer)
+    assert_equal true, span.tags(:tag_boolean)
+    assert_equal [1,2,3,4], span.tags(:tag_array)
+    assert_equal "1234", span.tags(:tag_string)
+    span.finish
+
+    assert span[:ts].is_a?(Integer)
+    assert_equal now_in_ms, span[:ts]
+    assert span[:d].is_a?(Integer)
+    assert span[:d].between?(0, 5)
+  end
+
   def test_span_kind_translation
     clear_all!
     span = OpenTracing.start_span('my_app_entry')

data/test/tracing/tracer_test.rb

@@ -27,7 +27,7 @@ class TracerTest < Minitest::Test
 
     ::Instana.tracer.start_or_continue_trace(:rack, {:one => 1}) do
       assert_equal true, ::Instana.tracer.tracing?
-      sleep 0.3
+      sleep 0.1
     end
 
     traces = ::Instana.processor.queued_traces
@@ -39,6 +39,9 @@ class TracerTest < Minitest::Test
     first_span = t.spans.first
     assert_equal :rack, first_span[:n]
     assert_equal :ruby, first_span[:ta]
+    assert first_span[:ts].is_a?(Integer)
+    assert first_span[:d].is_a?(Integer)
+    assert first_span[:d].between?(100, 130)
     assert first_span.key?(:data)
     assert_equal 1, first_span[:data][:one]
     assert first_span.key?(:f)
@@ -47,7 +50,7 @@ class TracerTest < Minitest::Test
     assert_equal ::Instana.agent.agent_uuid, first_span[:f][:h]
   end
 
-  def test_errors_are_properly_propogated
+  def test_errors_are_properly_propagated
     clear_all!
     exception_raised = false
     begin
@@ -69,6 +72,10 @@ class TracerTest < Minitest::Test
     first_span = t.spans.first
     assert_equal :rack, first_span[:n]
     assert_equal :ruby, first_span[:ta]
+    assert first_span[:ts].is_a?(Integer)
+    assert first_span[:ts] > 0
+    assert first_span[:d].is_a?(Integer)
+    assert first_span[:d].between?(0, 5)
     assert first_span.key?(:data)
     assert_equal 1, first_span[:data][:one]
     assert first_span.key?(:f)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -172,6 +172,8 @@ files:
 - benchmarks/Gemfile
 - benchmarks/Gemfile.lock
 - benchmarks/id_generation.rb
+- benchmarks/opentracing.rb
+- benchmarks/time_processing.rb
 - bin/console
 - bin/setup
 - examples/tracing.rb
@@ -282,7 +284,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -290,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Ruby sensor for Instana