instana 1.195.4 → 1.197.0.pre1

data/lib/instana/eum/eum.js.erb

@@ -1,17 +0,0 @@
-<script>
-    (function(c,e,f,k,g,h,b,a,d){c[g]||(c[g]=h,b=c[h]=function(){
-    b.q.push(arguments)},b.q=[],b.l=1*new Date,a=e.createElement(f),a.async=1,
-    a.src=k,a.setAttribute("crossorigin", "anonymous"),d=e.getElementsByTagName(f)[0],
-    d.parentNode.insertBefore(a,d))})(window,document,"script",
-    "//eum.instana.io/eum.min.js","InstanaEumObject","ineum");
-
-    ineum('reportingUrl', 'https://eum-saas.instana.io');
-    ineum('key', '<%=::Instana.config[:eum_api_key]%>');
-    ineum('traceId', '<%=::Instana.tracer.trace_id_header%>');
-
-    <% if !::Instana.config[:eum_baggage].empty? %>
-      <% ::Instana.config[:eum_baggage].each do |k, v| %>
-        ineum('meta', '<%=k%>', '<%=v%>');
-      <% end %>
-    <% end %>
-</script>

data/lib/instana/helpers.rb

@@ -1,47 +0,0 @@
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2016
-
-module Instana
-  module Helpers
-    EUM_SNIPPET= (File.read(File.dirname(__FILE__) + '/eum/eum.js.erb')).freeze
-    EUM_TEST_SNIPPET= (File.read(File.dirname(__FILE__) + '/eum/eum-test.js.erb')).freeze
-
-    class << self
-
-      # Returns a processed javascript snippet to be placed within the HEAD tag of an HTML page.
-      #
-      # DEPRECATED: This method will be removed in a future version.
-      #
-      def eum_snippet(api_key, kvs = {})
-        return nil if !::Instana.tracer.tracing?
-
-        ::Instana.config[:eum_api_key] = api_key
-        ::Instana.config[:eum_baggage] = kvs
-
-        ERB.new(EUM_SNIPPET).result
-      rescue => e
-        Instana.logger.info "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
-        Instana.logger.debug { e.backtrace.join("\r\n") }
-        return nil
-      end
-
-      # Returns a processed javascript snippet to be placed within the HEAD tag of an HTML page.
-      # This one is used for testing only
-      #
-      # DEPRECATED: This method will be removed in a future version.
-      #
-      def eum_test_snippet(api_key, kvs = {})
-        return nil if !::Instana.tracer.tracing?
-
-        ::Instana.config[:eum_api_key] = api_key
-        ::Instana.config[:eum_baggage] = kvs
-
-        ERB.new(EUM_TEST_SNIPPET).result
-      rescue => e
-        Instana.logger.info "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
-        Instana.logger.debug { e.backtrace.join("\r\n") }
-        return nil
-      end
-    end
-  end
-end

data/lib/instana/opentracing/tracer.rb

@@ -1,21 +0,0 @@
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2017
-
-module OpenTracing
-  class << self
-    # Text format for #inject and #extract
-    FORMAT_TEXT_MAP = 1
-
-    # Binary format for #inject and #extract
-    FORMAT_BINARY = 2
-
-    # Ruby Specific format to handle how Rack changes environment variables.
-    FORMAT_RACK = 3
-
-    attr_accessor :global_tracer
-
-    def method_missing(method_name, *args, &block)
-      @global_tracer.send(method_name, *args, &block)
-    end
-  end
-end

data/lib/instana/thread_local.rb

@@ -1,18 +0,0 @@
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2016
-
-module Instana
-  module ThreadLocal
-    def thread_local(name)
-      key = "__#{self}_#{name}__".intern
-
-      define_method(name) do
-        Thread.current[key]
-      end
-
-      define_method(name.to_s + '=') do |value|
-        Thread.current[key] = value
-      end
-    end
-  end
-end

data/lib/oj_check.rb

@@ -1,19 +0,0 @@
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2019
-
-begin
-  require 'oj'
-rescue LoadError => e
-  # OJ is not available in JRuby
-  module Instana
-    class Oj
-      def self.dump(*args)
-        args.first.to_json
-      end
-
-      def self.load(*args)
-        JSON.parse args.first
-      end
-    end
-  end
-end

data/test/agent/agent_test.rb

@@ -1,151 +0,0 @@
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2016
-
-require 'test_helper'
-require './lib/oj_check'
-
-class AgentTest < Minitest::Test
-
-  Oj = ::Instana::Oj unless defined?(Oj)
-
-  def teardown
-    WebMock.reset!
-    ::Instana.agent.instance_variable_set(:@discovered, nil)
-  end
-
-  def test_agent_host_detection
-    url = "http://#{::Instana.config[:agent_host]}:#{::Instana.config[:agent_port]}/"
-    stub_request(:get, url)
-    assert_equal true, ::Instana.agent.host_agent_available?
-  end
-
-  def test_successful_discovery
-    url = "http://#{::Instana.config[:agent_host]}:#{::Instana.config[:agent_port]}/"
-    docker_url = "http://#{::Instana.agent.instance_variable_get(:@default_gateway)}:#{::Instana.config[:agent_port]}/"
-    stub_request(:get, url)
-    stub_request(:get, docker_url)
-    discovered = ::Instana.agent.run_discovery
-
-    assert discovered.is_a?(Hash)
-    assert_equal "127.0.0.1", discovered[:agent_host]
-    assert_equal 42699, discovered[:agent_port]
-  end
-
-  def test_failed_discovery
-    url = "http://#{::Instana.config[:agent_host]}:#{::Instana.config[:agent_port]}/"
-    docker_url = "http://#{::Instana.agent.instance_variable_get(:@default_gateway)}:#{::Instana.config[:agent_port]}/"
-    stub_request(:get, url).to_raise(Errno::ECONNREFUSED)
-    stub_request(:get, docker_url).to_raise(Errno::ECONNREFUSED)
-
-    discovered = ::Instana.agent.run_discovery
-
-    assert_equal nil, discovered
-  end
-
-  def test_custom_configure_agent
-    original_host = ::Instana.config[:agent_host]
-    original_port = ::Instana.config[:agent_port]
-
-    # Set custom agent/port
-    ::Instana.config[:agent_host] = '172.0.12.100'
-    ::Instana.config[:agent_port] = 12829
-
-    url = "http://#{::Instana.config[:agent_host]}:#{::Instana.config[:agent_port]}/"
-    stub_request(:get, url)
-    discovered = ::Instana.agent.run_discovery
-
-    assert discovered.is_a?(Hash)
-    assert_equal "172.0.12.100", discovered[:agent_host]
-    assert_equal 12829, discovered[:agent_port]
-
-    ::Instana.config[:agent_host] = original_host
-    ::Instana.config[:agent_port] = original_port
-  end
-
-  def test_no_host_agent
-    localhost_url = "http://#{::Instana::Agent::LOCALHOST}:#{::Instana.config[:agent_port]}/"
-    stub_request(:get, localhost_url).to_raise(Errno::ECONNREFUSED)
-    docker_url = "http://#{::Instana.agent.instance_variable_get(:@default_gateway)}:#{::Instana.config[:agent_port]}/"
-    stub_request(:get, docker_url).to_timeout
-    assert_equal false, ::Instana.agent.host_agent_available?
-  end
-
-  def test_announce_sensor
-    # Fake discovery values
-    discovery = {}
-    discovery[:agent_host] = ::Instana.config[:agent_host]
-    discovery[:agent_port] = ::Instana.config[:agent_port]
-    ::Instana.agent.instance_variable_set(:@discovered, discovery)
-
-    url = "http://#{::Instana.config[:agent_host]}:#{::Instana.config[:agent_port]}/com.instana.plugin.ruby.discovery"
-    json = Oj.dump({ 'pid' => Process.pid, 'agentUuid' => 'abc' })
-    stub_request(:put, url).to_return(:body => json, :status => 200)
-
-    assert_equal true, ::Instana.agent.announce_sensor
-  end
-
-  def test_failed_announce_sensor
-    # Fake discovery values
-    discovery = {}
-    discovery[:agent_host] = ::Instana.config[:agent_host]
-    discovery[:agent_port] = ::Instana.config[:agent_port]
-    ::Instana.agent.instance_variable_set(:@discovered, discovery)
-
-    url = "http://#{::Instana.config[:agent_host]}:#{::Instana.config[:agent_port]}/com.instana.plugin.ruby.discovery"
-    stub_request(:put, url).to_raise(Errno::ECONNREFUSED)
-
-    assert_equal false, ::Instana.agent.announce_sensor
-  end
-
-  def test_metric_report
-    # Fake discovery values
-    discovery = {}
-    discovery[:agent_host] = ::Instana.config[:agent_host]
-    discovery[:agent_port] = ::Instana.config[:agent_port]
-    ::Instana.agent.instance_variable_set(:@discovered, discovery)
-
-    url = "http://#{::Instana.config[:agent_host]}:#{::Instana.config[:agent_port]}/com.instana.plugin.ruby.discovery"
-    json = Oj.dump({ 'pid' => Process.pid, 'agentUuid' => 'abc' })
-    stub_request(:put, url).to_return(:body => json, :status => 200)
-    ::Instana.agent.announce_sensor
-
-    url = "http://#{::Instana.config[:agent_host]}:#{::Instana.config[:agent_port]}/com.instana.plugin.ruby.#{Process.pid}"
-    stub_request(:post, url)
-
-    payload = { :test => 'true' }
-    assert_equal true, ::Instana.agent.report_metrics(payload)
-  end
-
-  def test_failed_metric_report
-    # Fake discovery values
-    discovery = {}
-    discovery[:agent_host] = ::Instana.config[:agent_host]
-    discovery[:agent_port] = ::Instana.config[:agent_port]
-    ::Instana.agent.instance_variable_set(:@discovered, discovery)
-
-    url = "http://#{::Instana.config[:agent_host]}:#{::Instana.config[:agent_port]}/com.instana.plugin.ruby.discovery"
-    json = { 'pid' => Process.pid, 'agentUuid' => 'abc' }.to_json
-    stub_request(:put, url).to_return(:body => json, :status => 200)
-
-    ::Instana.agent.announce_sensor
-
-    url = "http://#{::Instana.config[:agent_host]}:#{::Instana.config[:agent_port]}/com.instana.plugin.ruby.#{Process.pid}"
-    stub_request(:post, url).to_raise(Errno::ECONNREFUSED)
-
-    payload = { :test => 'true' }
-    assert_equal false, ::Instana.agent.report_metrics(payload)
-  end
-
-  def test_agent_timeout
-    # Fake discovery values
-    discovery = {}
-    discovery[:agent_host] = ::Instana.config[:agent_host]
-    discovery[:agent_port] = ::Instana.config[:agent_port]
-    ::Instana.agent.instance_variable_set(:@discovered, discovery)
-
-    localhost_url = "http://#{::Instana::Agent::LOCALHOST}:#{::Instana.config[:agent_port]}/com.instana.plugin.ruby.discovery"
-    stub_request(:any, localhost_url).to_timeout
-
-    assert_equal false, ::Instana.agent.announce_sensor
-  end
-end