instana 1.199.2 → 1.200.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59560cefe64546d0f6b072839e04cc21d5abe77087111a66acd48b16433bd6b3
-  data.tar.gz: f56219f6107b11353e51bac144119d698baa3e4d5859929cd59a47627761cb02
+  metadata.gz: 97f4147730556687389966d4b2403b5f12087b2479926bb671683ff6056b2f10
+  data.tar.gz: 64259bb574f226a81834402180083c4f04303a4d7db1cb6573645357dbb7b3aa
 SHA512:
-  metadata.gz: b3c9cc9ab3175e4f47cf722c91a8c40189fe27fd21fd4c71fbcbf1d82c65af205c3afb9636add9418ba2c52a3adf05940c948819700491c9a51d719b40566781
-  data.tar.gz: 0daca1718f70837be8504ab239a034432c50cf46a1380bfcf46b40059638a31455b8904c2b5019b7f880787acbe0462ada2457f135f451a680fa2253b68a0ce0
+  metadata.gz: 74fdc725df175bf8dce646c438851298515f1a73caa57b7de679295c8f05eb2abef81629b183ef231358c919646ca7d85fc63d5103e91a74916e4b1fb0ab5493
+  data.tar.gz: 9010fe9c2cdd2108bc2a7540bd1704981aaa81370c02847c83af8b177a4303a8ac23c1a990cab8fff141c32bc5a7621fda0c397e19338c4f50e166eece316dc6

data/.circleci/config.yml

@@ -155,7 +155,19 @@ commands:
           name: Run Tests
           command: |
             bundle exec rubocop
-
+  publish_gem:
+    steps:
+      - run:
+          name: Setup Access
+          command: |
+            mkdir -p ~/.gem
+            echo -e "---\r\n:rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials
+            chmod 0600 /home/circleci/.gem/credentials
+      - run: 
+          name: Publish Gem
+          command: |
+            bundle exec rake release[origin]
+            
 jobs:
   test_core:
     parameters:
@@ -189,8 +201,22 @@ jobs:
       - checkout
       - setup
       - run_rubocop
+  publish:
+    executor: ruby_27
+    steps:
+      - checkout
+      - setup
+      - publish_gem
 
 workflows:
+  publish:
+    jobs:
+      - publish:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^v.*/
   core:
     jobs:
       - lint

data/lib/instana.rb

@@ -1,10 +1,7 @@
 # (c) Copyright IBM Corp. 2021
 # (c) Copyright Instana Inc. 2016
 
-require 'concurrent'
-require 'sys-proctable'
-
-require "instana/setup"
+require 'instana/setup'
 
 # Boot the instana agent background thread.  If you wish to have greater
 # control on the where and which thread this is run in, instead use
@@ -15,4 +12,5 @@ require "instana/setup"
 # the thread of your choice.
 #
 
+::Instana::Activator.start
 ::Instana.agent.spawn_background_thread

data/lib/instana/activators/resque_worker.rb

@@ -16,11 +16,10 @@ module Instana
         ::Resque::Worker.prepend(::Instana::Instrumentation::ResqueWorker)
         ::Resque::Job.prepend(::Instana::Instrumentation::ResqueJob)
 
-        ::Resque.before_fork do |_job|
-          ::Instana.agent.before_resque_fork
-        end
-        ::Resque.after_fork do |_job|
-          ::Instana.agent.after_resque_fork
+        if ::Instana.config[:'resque-worker'][:'setup-fork']
+          ::Resque.after_fork do |_job|
+            ::Instana.agent.after_fork
+          end
         end
 
         # Set this so we assure that any remaining collected traces are reported at_exit

data/lib/instana/backend/host_agent.rb

@@ -5,12 +5,13 @@ module Instana
   module Backend
     # @since 1.197.0
     class HostAgent
-      attr_reader :future
+      attr_reader :future, :client
 
       def initialize(discovery: Concurrent::Atom.new(nil), logger: ::Instana.logger)
         @discovery = discovery
         @logger = logger
         @future = nil
+        @client = nil
       end
 
       def setup; end
@@ -19,19 +20,24 @@ module Instana
         return if ENV.key?('INSTANA_TEST')
 
         @future = Concurrent::Promises.future do
-          client = until_not_nil { HostAgentLookup.new.call }
-          @discovery.delete_observers
-          @discovery
-            .with_observer(HostAgentActivationObserver.new(client, @discovery))
-            .with_observer(HostAgentReportingObserver.new(client, @discovery))
-
-          @discovery.swap { nil }
-          client
+          announce
         end
       end
 
       alias start spawn_background_thread
-      alias after_fork spawn_background_thread
+
+      def announce
+        @client = until_not_nil { HostAgentLookup.new.call }
+        @discovery.delete_observers
+        @discovery
+          .with_observer(HostAgentActivationObserver.new(@client, @discovery))
+          .with_observer(HostAgentReportingObserver.new(@client, @discovery))
+
+        @discovery.swap { nil }
+        @client
+      end
+
+      alias after_fork announce
 
       # @return [Boolean] true if the agent able to send spans to the backend
       def ready?

data/lib/instana/backend/host_agent_activation_observer.rb

@@ -12,7 +12,7 @@ module Instana
 
       # @param [RequestClient] client used to make requests to the backend
       # @param [Concurrent::Atom] discovery object used to store discovery response in
-      def initialize(client, discovery, wait_time: 1, logger: ::Instana.logger, max_wait_tries: 60, proc_table: Sys::ProcTable, socket_proc: default_socket_proc) # rubocop:disable Metrics/ParameterLists
+      def initialize(client, discovery, wait_time: 30, logger: ::Instana.logger, max_wait_tries: 60, proc_table: Sys::ProcTable, socket_proc: default_socket_proc) # rubocop:disable Metrics/ParameterLists
         @client = client
         @discovery = discovery
         @wait_time = wait_time
@@ -82,7 +82,7 @@ module Instana
       def try_forever_with_backoff
         yield
       rescue DiscoveryError, Net::OpenTimeout => e
-        @logger.warn(e)
+        @logger.debug(e)
         sleep(@wait_time)
         retry
       rescue StandardError => e

data/lib/instana/backend/serverless_agent.rb

@@ -32,6 +32,9 @@ module Instana
         @timer.execute
       end
 
+      alias start spawn_background_thread
+      alias after_fork spawn_background_thread
+
       # @return [Boolean] true if the agent able to send spans to the backend
       def ready?
         true

data/lib/instana/config.rb

@@ -53,6 +53,8 @@ module Instana
       # W3 Trace Context Support
       @config[:w3_trace_correlation] = ENV['INSTANA_DISABLE_W3C_TRACE_CORRELATION'].nil?
 
+      @config[:post_fork_proc] = proc { ::Instana.agent.spawn_background_thread }
+
       @config[:action_controller]  = { :enabled => true }
       @config[:action_view]        = { :enabled => true }
       @config[:active_record]      = { :enabled => true }
@@ -63,7 +65,7 @@ module Instana
       @config[:nethttp]            = { :enabled => true }
       @config[:redis]              = { :enabled => true }
       @config[:'resque-client']    = { :enabled => true }
-      @config[:'resque-worker']    = { :enabled => true }
+      @config[:'resque-worker']    = { :enabled => true, :'setup-fork' => true }
       @config[:'rest-client']      = { :enabled => true }
       @config[:'sidekiq-client']   = { :enabled => true }
       @config[:'sidekiq-worker']   = { :enabled => true }

data/lib/instana/setup.rb

@@ -1,6 +1,9 @@
 # (c) Copyright IBM Corp. 2021
 # (c) Copyright Instana Inc. 2016
 
+require 'concurrent'
+require 'sys-proctable'
+
 require 'instana/logger_delegator'
 
 require "instana/base"
@@ -37,7 +40,6 @@ require 'instana/backend/agent'
 
 ::Instana.setup
 ::Instana.agent.setup
-::Instana::Activator.start
 
 # Require supported OpenTracing interfaces
 require "opentracing"

data/lib/instana/tracing/processor.rb

@@ -5,6 +5,9 @@ require 'thread'
 
 module Instana
   class Processor
+    extend Forwardable
+    def_delegators :@queue, :empty?
+
     def initialize(logger: ::Instana.logger)
       # The main queue before being reported to the
       # host agent.  Spans in this queue are complete
@@ -15,7 +18,7 @@ module Instana
       # agent at once.
       @batch_size = 3000
       @logger = logger
-      @pid = $PROCESS_ID
+      @pid = Process.pid
     end
 
     # Adds a span to the span queue
@@ -23,10 +26,10 @@ module Instana
     # @param [Trace] - the trace to be added to the queue
     def add_span(span)
       # :nocov:
-      if @pid != $PROCESS_ID
-        @logger.info("Proces `#{@pid}` has forked into #{$PROCESS_ID}. Resetting discovery.")
-        ::Instana.agent.spawn_background_thread
-        @pid = $PROCESS_ID
+      if @pid != Process.pid
+        @logger.info("Proces `#{@pid}` has forked into #{Process.pid}. Running post fork hook.")
+        ::Instana.config[:post_fork_proc].call
+        @pid = Process.pid
       end
       # :nocov:
 

data/lib/instana/version.rb

@@ -2,6 +2,6 @@
 # (c) Copyright Instana Inc. 2016
 
 module Instana
-  VERSION = "1.199.2"
+  VERSION = "1.200.0.pre1"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/test/backend/host_agent_test.rb

@@ -44,4 +44,14 @@ class HostAgentTest < Minitest::Test
     subject = Instana::Backend::HostAgent.new(discovery: discovery)
     assert_equal 1, subject.source[:e]
   end
+
+  def test_start
+    subject = Instana::Backend::HostAgent.new
+    assert subject.respond_to? :start
+  end
+
+  def test_after_fork
+    subject = Instana::Backend::HostAgent.new
+    assert subject.respond_to? :after_fork
+  end
 end

data/test/backend/serverless_agent_test.rb

@@ -70,4 +70,14 @@ class ServerlesAgentTest < Minitest::Test
 
     subject.timer.block.call
   end
+
+  def test_start
+    subject = Instana::Backend::ServerlessAgent.new([], timer_class: MockTimer, backend_uri: 'http://10.10.10.10:9292/', logger: Logger.new('/dev/null'))
+    assert subject.respond_to? :start
+  end
+
+  def test_after_fork
+    subject = Instana::Backend::ServerlessAgent.new([], timer_class: MockTimer, backend_uri: 'http://10.10.10.10:9292/', logger: Logger.new('/dev/null'))
+    assert subject.respond_to? :after_fork
+  end
 end

data/test/secrets_test.rb

@@ -98,8 +98,6 @@ class SecretsTest < Minitest::Test
 
   def assert_redacted(str, keys, raw_str: false)
     params = raw_str ? CGI.parse(str) : CGI.parse(URI(str).query)
-    pp params
-
     assert_equal keys, params.select { |_, v| v == %w(<redacted>) }.keys, 'to be redacted'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.199.2
+  version: 1.200.0.pre1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,14 +143,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- benchmarks/10k-rack-traces.rb
-- benchmarks/Gemfile
-- benchmarks/Gemfile.lock
-- benchmarks/id_generation.rb
-- benchmarks/opentracing.rb
-- benchmarks/rack_vanilla_vs_traced.rb
-- benchmarks/stackprof_rack_tracing.rb
-- benchmarks/time_processing.rb
 - bin/console
 - bin/setup
 - docker-compose.yml
@@ -365,84 +357,84 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana
 test_files:
-- test/config_test.rb
-- test/serverless_test.rb
 - test/activator_test.rb
-- test/tracing/span_context_test.rb
-- test/tracing/span_test.rb
-- test/tracing/id_management_test.rb
-- test/tracing/tracer_test.rb
-- test/tracing/custom_test.rb
-- test/tracing/opentracing_test.rb
-- test/tracing/tracer_async_test.rb
-- test/tracing/processor_test.rb
-- test/snapshot/docker_container_test.rb
-- test/snapshot/fargate_process_test.rb
-- test/snapshot/deltable_test.rb
-- test/snapshot/fargate_task_test.rb
-- test/snapshot/ruby_process_test.rb
-- test/snapshot/google_cloud_run_process_test.rb
-- test/snapshot/lambda_function_test.rb
-- test/snapshot/fargate_container_test.rb
-- test/snapshot/google_cloud_run_instance_test.rb
-- test/backend/host_agent_activation_observer_test.rb
-- test/backend/host_agent_reporting_observer_test.rb
+- test/backend/agent_test.rb
 - test/backend/gc_snapshot_test.rb
+- test/backend/host_agent_activation_observer_test.rb
 - test/backend/host_agent_lookup_test.rb
-- test/backend/serverless_agent_test.rb
-- test/backend/process_info_test.rb
-- test/backend/agent_test.rb
+- test/backend/host_agent_reporting_observer_test.rb
 - test/backend/host_agent_test.rb
+- test/backend/process_info_test.rb
 - test/backend/request_client_test.rb
-- test/secrets_test.rb
+- test/backend/serverless_agent_test.rb
+- test/benchmarks/bench_id_generation.rb
+- test/benchmarks/bench_opentracing.rb
+- test/config_test.rb
+- test/frameworks/cuba_test.rb
+- test/frameworks/roda_test.rb
+- test/frameworks/sinatra_test.rb
+- test/instana_test.rb
+- test/instrumentation/aws_test.rb
+- test/instrumentation/dalli_test.rb
+- test/instrumentation/excon_test.rb
 - test/instrumentation/graphql_test.rb
-- test/instrumentation/sidekiq-client_test.rb
-- test/instrumentation/rails_action_controller_test.rb
-- test/instrumentation/rest_client_test.rb
+- test/instrumentation/grpc_test.rb
 - test/instrumentation/net_http_test.rb
-- test/instrumentation/resque_test.rb
-- test/instrumentation/sidekiq-worker_test.rb
-- test/instrumentation/rails_action_view_test.rb
-- test/instrumentation/rack_test.rb
 - test/instrumentation/rack_instrumented_request_test.rb
-- test/instrumentation/shoryuken_test.rb
+- test/instrumentation/rack_test.rb
+- test/instrumentation/rails_action_cable_test.rb
+- test/instrumentation/rails_action_controller_test.rb
+- test/instrumentation/rails_action_view_test.rb
 - test/instrumentation/rails_active_record_test.rb
 - test/instrumentation/redis_test.rb
-- test/instrumentation/dalli_test.rb
-- test/instrumentation/rails_action_cable_test.rb
-- test/instrumentation/excon_test.rb
-- test/instrumentation/grpc_test.rb
-- test/instrumentation/aws_test.rb
-- test/util_test.rb
-- test/support/helpers.rb
-- test/support/mock_timer.rb
-- test/support/apps/sidekiq/boot.rb
-- test/support/apps/sidekiq/jobs/sidekiq_job_2.rb
-- test/support/apps/sidekiq/jobs/sidekiq_job_1.rb
-- test/support/apps/sidekiq/worker.rb
+- test/instrumentation/resque_test.rb
+- test/instrumentation/rest_client_test.rb
+- test/instrumentation/shoryuken_test.rb
+- test/instrumentation/sidekiq-client_test.rb
+- test/instrumentation/sidekiq-worker_test.rb
+- test/secrets_test.rb
+- test/serverless_test.rb
+- test/snapshot/deltable_test.rb
+- test/snapshot/docker_container_test.rb
+- test/snapshot/fargate_container_test.rb
+- test/snapshot/fargate_process_test.rb
+- test/snapshot/fargate_task_test.rb
+- test/snapshot/google_cloud_run_instance_test.rb
+- test/snapshot/google_cloud_run_process_test.rb
+- test/snapshot/lambda_function_test.rb
+- test/snapshot/ruby_process_test.rb
+- test/support/apps/active_record/active_record.rb
 - test/support/apps/grpc/boot.rb
 - test/support/apps/grpc/grpc_server.rb
-- test/support/apps/active_record/active_record.rb
-- test/support/apps/resque/boot.rb
-- test/support/apps/resque/jobs/resque_error_job.rb
-- test/support/apps/resque/jobs/resque_fast_job.rb
 - test/support/apps/http_endpoint/boot.rb
+- test/support/apps/rails/boot.rb
 - test/support/apps/rails/models/block.rb
 - test/support/apps/rails/models/block6.rb
-- test/support/apps/rails/boot.rb
-- test/benchmarks/bench_opentracing.rb
-- test/benchmarks/bench_id_generation.rb
+- test/support/apps/resque/boot.rb
+- test/support/apps/resque/jobs/resque_error_job.rb
+- test/support/apps/resque/jobs/resque_fast_job.rb
+- test/support/apps/sidekiq/boot.rb
+- test/support/apps/sidekiq/jobs/sidekiq_job_1.rb
+- test/support/apps/sidekiq/jobs/sidekiq_job_2.rb
+- test/support/apps/sidekiq/worker.rb
+- test/support/helpers.rb
+- test/support/mock_timer.rb
 - test/test_helper.rb
-- test/frameworks/cuba_test.rb
-- test/frameworks/roda_test.rb
-- test/frameworks/sinatra_test.rb
-- test/instana_test.rb
+- test/tracing/custom_test.rb
+- test/tracing/id_management_test.rb
+- test/tracing/opentracing_test.rb
+- test/tracing/processor_test.rb
+- test/tracing/span_context_test.rb
+- test/tracing/span_test.rb
+- test/tracing/tracer_async_test.rb
+- test/tracing/tracer_test.rb
+- test/util_test.rb

data/benchmarks/10k-rack-traces.rb

@@ -1,95 +0,0 @@
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2017
-
-require "bundler"
-
-require 'rack'
-require 'rack/builder'
-require 'rack/handler/puma'
-require 'net/http'
-require "cgi"
-Bundler.require(:default)
-require "instana/rack"
-require 'ruby-prof'
-
-Thread.new do
-  app = Rack::Builder.new {
-    map "/" do
-      run Proc.new {
-        [200, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"scene!\"]"]]
-      }
-    end
-    map "/error" do
-      run Proc.new {
-        [500, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"error!\"]"]]
-      }
-    end
-  }
-
-  Rack::Handler::Puma.run(app, {:Host => '127.0.0.1', :Port => 7011})
-end
-
-Thread.new do
-  app = Rack::Builder.new {
-    use ::Instana::Rack
-    map "/" do
-      run Proc.new {
-        [200, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"scene!\"]"]]
-      }
-    end
-    map "/error" do
-      run Proc.new {
-        [500, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"error!\"]"]]
-      }
-    end
-  }
-
-  Rack::Handler::Puma.run(app, {:Host => '127.0.0.1', :Port => 7012})
-end
-
-puts ""
-puts "Vanilla Rack server started in background thread on localhost:7011"
-puts "Instrumented Rack server started in background thread on localhost:7012"
-puts ""
-puts "Waiting on successful announce to host agent..."
-puts ""
-
-#RubyProf.measure_mode = RubyProf::WALL_TIME
-#RubyProf.measure_mode = RubyProf::PROCESS_TIME
-RubyProf.measure_mode = RubyProf::ALLOCATIONS
-#RubyProf.measure_mode = RubyProf::MEMORY
-
-while !::Instana.agent.ready? do
-  sleep 2
-end
-
-puts "Starting 10k Traces..."
-
-# uri = URI.parse("http://127.0.0.1:7011/")
-# ::Net::HTTP.start(uri.host, uri.port) do |hc|
-#   x.report("vanilla") {
-#     10_000.times {
-#       req = Net::HTTP::Get.new(uri.request_uri)
-#       hc.request(req)
-#     }
-#   }
-# end
-
-uri = URI.parse("http://127.0.0.1:7012/")
-result = RubyProf.profile do
-  1.times {
-    ::Instana.tracer.start_or_continue_trace(:job, {:kind => :entry}) do
-      ::Net::HTTP.start(uri.host, uri.port) do |hc|
-        ::Instana.tracer.start_or_continue_trace(:rack_call) do
-          req = Net::HTTP::Get.new(uri.request_uri)
-          hc.request(req)
-        end
-      end
-    end
-  }
-end
-
-puts "Done - displaying results..."
-
-printer = RubyProf::FlatPrinter.new(result)
-printer.print(STDOUT, {})

data/benchmarks/Gemfile

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2017
-
-source "https://rubygems.org"
-
-git_source(:github) {|repo_name| "https://github.com/instana/#{repo_name}" }
-
-gem "instana", :path => "~/Projects/instana/ruby-sensor"
-

data/benchmarks/Gemfile.lock

@@ -1,38 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    instana (1.9.6)
-      ffi (>= 1.0.11)
-      get_process_mem (>= 0.2.1)
-      oj (>= 3.0.11)
-      sys-proctable (>= 0.9.2)
-      timers (>= 4.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ffi (1.11.1)
-    get_process_mem (0.2.4)
-      ffi (~> 1.0)
-    nio4r (2.4.0)
-    oj (3.8.1)
-    puma (4.1.0)
-      nio4r (~> 2.0)
-    rack (2.0.7)
-    ruby-prof (1.0.0)
-    sys-proctable (1.2.2)
-      ffi
-    timers (4.3.0)
-
-PLATFORMS
-  ruby
-  x86_64-darwin-18
-
-DEPENDENCIES
-  instana!
-  puma
-  rack
-  ruby-prof
-
-BUNDLED WITH
-   2.0.2

data/benchmarks/id_generation.rb

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2017
-
-require "bundler"
-Bundler.require(:default)
-
-require "benchmark"
-
-ID_RANGE = -2**63..2**63-1
-
-Benchmark.bm do |x|
-  x.report("generate_id raw    ")   { 1_000_000.times { rand(-2**63..2**63-1) } }
-  x.report("with fixed range   ")   { 1_000_000.times { rand(ID_RANGE) } }
-end

data/benchmarks/opentracing.rb

@@ -1,30 +0,0 @@
-#!/usr/bin/env ruby
-
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2017
-
-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/rack_vanilla_vs_traced.rb

@@ -1,88 +0,0 @@
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2017
-
-require "bundler"
-
-require 'rack'
-require 'rack/builder'
-require 'rack/handler/puma'
-require 'net/http'
-require "benchmark"
-require "cgi"
-Bundler.require(:default)
-require "instana/rack"
-
-Thread.new do
-  app = Rack::Builder.new {
-    map "/" do
-      run Proc.new {
-        [200, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"scene!\"]"]]
-      }
-    end
-    map "/error" do
-      run Proc.new {
-        [500, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"error!\"]"]]
-      }
-    end
-  }
-
-  Rack::Handler::Puma.run(app, {:Host => '127.0.0.1', :Port => 7011})
-end
-
-Thread.new do
-  app = Rack::Builder.new {
-    use ::Instana::Rack
-    map "/" do
-      run Proc.new {
-        [200, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"scene!\"]"]]
-      }
-    end
-    map "/error" do
-      run Proc.new {
-        [500, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"error!\"]"]]
-      }
-    end
-  }
-
-  Rack::Handler::Puma.run(app, {:Host => '127.0.0.1', :Port => 7012})
-end
-
-puts ""
-puts "Vanilla Rack server started in background thread on localhost:7011"
-puts "Instrumented Rack server started in background thread on localhost:7012"
-puts ""
-puts "Waiting on successful announce to host agent..."
-puts ""
-
-while !::Instana.agent.ready? do
-  sleep 2
-end
-
-puts "Starting benchmarks"
-Benchmark.bm do |x|
-
-  uri = URI.parse("http://127.0.0.1:7011/")
-  ::Net::HTTP.start(uri.host, uri.port) do |hc|
-    x.report("vanilla") {
-      1_000.times {
-        req = Net::HTTP::Get.new(uri.request_uri)
-        hc.request(req)
-      }
-    }
-  end
-
-  uri = URI.parse("http://127.0.0.1:7012/")
-  ::Net::HTTP.start(uri.host, uri.port) do |hc|
-    x.report("traced ") {
-      1_000.times {
-        ::Instana.tracer.start_or_continue_trace(:rack_call) do
-          req = Net::HTTP::Get.new(uri.request_uri)
-          hc.request(req)
-        end
-      }
-    }
-  end
-end
-
-
-sleep 10

data/benchmarks/stackprof_rack_tracing.rb

@@ -1,80 +0,0 @@
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2017
-
-require "bundler"
-require "stackprof"
-require 'rack'
-require 'rack/builder'
-require 'rack/handler/puma'
-require 'net/http'
-require "benchmark"
-require "cgi"
-Bundler.require(:default)
-require "instana/rack"
-
-Thread.new do
-  app = Rack::Builder.new {
-    map "/" do
-      run Proc.new {
-        [200, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"scene!\"]"]]
-      }
-    end
-    map "/error" do
-      run Proc.new {
-        [500, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"error!\"]"]]
-      }
-    end
-  }
-
-  Rack::Handler::Puma.run(app, {:Host => '127.0.0.1', :Port => 7011})
-end
-
-Thread.new do
-  app = Rack::Builder.new {
-    use ::Instana::Rack
-    map "/" do
-      run Proc.new {
-        [200, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"scene!\"]"]]
-      }
-    end
-    map "/error" do
-      run Proc.new {
-        [500, {"Content-Type" => "application/json"}, ["[\"Stan\",\"is\",\"on\",\"the\",\"error!\"]"]]
-      }
-    end
-  }
-
-  Rack::Handler::Puma.run(app, {:Host => '127.0.0.1', :Port => 7012})
-end
-
-sleep(2)
-puts "Rack server started in background thread on localhost:7011"
-puts "Sleeping for 10 to allow announce"
-sleep(10)
-
-puts "Starting profile"
-uri = URI.parse("http://127.0.0.1:7011/")
-StackProf.run(mode: :wall, out: 'tmp/stackprof-rack-vanilla.dump') do
-  ::Net::HTTP.start(uri.host, uri.port) do |hc|
-    5_000.times {
-      ::Instana.tracer.start_or_continue_trace(:rack_call) do
-        req = Net::HTTP::Get.new(uri.request_uri)
-        hc.request(req)
-      end
-    }
-  end
-end
-puts "stackprof tmp/stackprof-rack-vanilla.dump --text"
-
-uri = URI.parse("http://127.0.0.1:7012/")
-StackProf.run(mode: :wall, out: 'tmp/stackprof-rack-instrumented.dump') do
-  ::Net::HTTP.start(uri.host, uri.port) do |hc|
-    5_000.times {
-      ::Instana.tracer.start_or_continue_trace(:rack_call) do
-        req = Net::HTTP::Get.new(uri.request_uri)
-        hc.request(req)
-      end
-    }
-  end
-end
-puts "stackprof tmp/stackprof-rack-instrumented.dump --text"

data/benchmarks/time_processing.rb

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2017
-
-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