instana 1.217.0 → 2.0.0

data/test/{tracing → trace}/tracer_test.rb

@@ -15,7 +15,7 @@ class TracerTest < Minitest::Test
     ::Instana.config[:tracing][:enabled] = false
     assert_equal false, ::Instana.tracer.tracing?
 
-    ::Instana.tracer.start_or_continue_trace(:rack, {:one => 1}) do
+    ::Instana.tracer.in_span(:rack, attributes: {:one => 1}) do
       assert_equal false, ::Instana.tracer.tracing?
     end
 
@@ -27,7 +27,7 @@ class TracerTest < Minitest::Test
 
     assert_equal false, ::Instana.tracer.tracing?
 
-    ::Instana.tracer.start_or_continue_trace(:rack, {:one => 1}) do
+    ::Instana.tracer.in_span(:rack, attributes: {:one => 1}) do
       assert_equal true, ::Instana.tracer.tracing?
       sleep 0.1
     end
@@ -53,7 +53,7 @@ class TracerTest < Minitest::Test
 
     ipv4 = '111.111.111.111'
 
-    ::Instana.tracer.start_or_continue_trace(:rack, {:ipaddr => ipv4}) do
+    ::Instana.tracer.in_span(:rack, attributes: {:ipaddr => ipv4}) do
       assert_equal true, ::Instana.tracer.tracing?
       sleep 0.1
     end
@@ -77,10 +77,10 @@ class TracerTest < Minitest::Test
     clear_all!
     exception_raised = false
     begin
-      ::Instana.tracer.start_or_continue_trace(:rack, {:one => 1}) do
-        raise Exception.new('Error in block - this should continue to propogate outside of tracing')
+      ::Instana.tracer.in_span(:rack, attributes: {:one => 1}) do
+        raise StandardError, 'Error in block - this should continue to propogate outside of tracing'
       end
-    rescue Exception
+    rescue StandardError
       exception_raised = true
     end
 
@@ -92,7 +92,7 @@ class TracerTest < Minitest::Test
     first_span = spans.first
     assert_equal :rack, first_span[:n]
     assert first_span[:ts].is_a?(Integer)
-    assert first_span[:ts] > 0
+    assert first_span[:ts].positive?
     assert first_span[:d].is_a?(Integer)
     assert first_span[:d].between?(0, 5)
     assert first_span.key?(:data)
@@ -105,9 +105,9 @@ class TracerTest < Minitest::Test
 
   def test_complex_trace_block
     clear_all!
-    ::Instana.tracer.start_or_continue_trace(:rack, {:one => 1}) do
+    ::Instana.tracer.in_span(:rack, attributes: {:one => 1}) do
       sleep 0.2
-      ::Instana.tracer.trace(:sub_block, {:sub_two => 2}) do
+      ::Instana.tracer.in_span(:sub_block, attributes: {:sub_two => 2}) do
         sleep 0.2
       end
     end
@@ -132,9 +132,9 @@ class TracerTest < Minitest::Test
 
   def test_custom_complex_trace_block
     clear_all!
-    ::Instana.tracer.start_or_continue_trace(:root_span, {:one => 1}) do
+    ::Instana.tracer.in_span(:root_span, attributes: {:one => 1}) do
       sleep 0.2
-      ::Instana.tracer.trace(:sub_span, {:sub_two => 2}) do
+      ::Instana.tracer.in_span(:sub_span, attributes: {:sub_two => 2}) do
         sleep 0.2
       end
     end
@@ -167,11 +167,12 @@ class TracerTest < Minitest::Test
 
     assert_equal false, ::Instana.tracer.tracing?
     # Start tracing
-    ::Instana.tracer.log_start_or_continue(:rack, {:one => 1})
+    span = ::Instana.tracer.start_span(:rack, attributes: {:one => 1})
     assert_equal true, ::Instana.tracer.tracing?
-    ::Instana.tracer.log_info({:info_logged => 1})
+    span.set_tags({:info_logged => 1})
     # End tracing
-    ::Instana.tracer.log_end(:rack, {:close_one => 1})
+    span.set_tags({:close_one => 1})
+    span.finish
     assert_equal false, ::Instana.tracer.tracing?
 
     spans = ::Instana.processor.queued_spans
@@ -184,20 +185,25 @@ class TracerTest < Minitest::Test
     assert_equal false, ::Instana.tracer.tracing?
 
     # Start tracing
-    ::Instana.tracer.log_start_or_continue(:rack, {:one => 1})
+    span = ::Instana.tracer.start_span(:rack, attributes: {:one => 1})
     assert_equal true, ::Instana.tracer.tracing?
-    ::Instana.tracer.log_info({:info_logged => 1})
+    span.set_tags({:info_logged => 1})
 
-    # Start tracing a sub span
-    ::Instana.tracer.log_entry(:sub_task)
+    # Start tracing a sub span with context propagation
+    span1 = ::Instana::Trace.with_span(span) do
+      ::Instana.tracer.start_span(:sub_task)
+    end
     assert_equal true, ::Instana.tracer.tracing?
-    ::Instana.tracer.log_info({:sub_task_info => 1})
+    span1.set_tags({:sub_task_info => 1})
     # Exit from the sub span
-    ::Instana.tracer.log_exit(:sub_task, {:sub_task_exit_info => 1})
+    span1.set_tags({:sub_task_exit_info => 1})
+
+    span1.finish
     assert_equal true, ::Instana.tracer.tracing?
 
     # End tracing
-    ::Instana.tracer.log_end(:rack, {:close_one => 1})
+    span.set_tags({:close_one => 1})
+    span.finish
     assert_equal false, ::Instana.tracer.tracing?
 
     spans = ::Instana.processor.queued_spans
@@ -227,12 +233,12 @@ class TracerTest < Minitest::Test
     clear_all!
     exception_raised = false
     begin
-      ::Instana.tracer.start_or_continue_trace(:test_trace, {:one => 1}) do
-        ::Instana.tracer.trace(:test_trace_two) do
-          raise Exception.new("Block exception test error")
+      ::Instana.tracer.in_span(:test_trace, attributes: {:one => 1}) do
+        ::Instana.tracer.in_span(:test_trace_two) do
+          raise StandardError, "Block exception test error"
         end
       end
-    rescue Exception
+    rescue StandardError
       exception_raised = true
     end
 
@@ -255,10 +261,14 @@ class TracerTest < Minitest::Test
 
   def test_low_level_error_logging
     clear_all!
-    ::Instana.tracer.log_start_or_continue(:test_trace, {:one => 1})
-    ::Instana.tracer.log_info({:info_logged => 1})
-    ::Instana.tracer.log_error(Exception.new("Low level tracing api error"))
-    ::Instana.tracer.log_end(:test_trace, {:close_one => 1})
+    span = ::Instana.tracer.start_span(:test_trace, attributes: {:one => 1})
+    span.set_tags({:info_logged => 1})
+    span.record_exception(Exception.new("Low level tracing api error"))
+    span.set_tags({:close_one => 1})
+    span.finish
+    # ::Instana.tracer.log_info({:info_logged => 1})
+    # ::Instana.tracer.log_error(Exception.new("Low level tracing api error"))
+    # ::Instana.tracer.log_end(:test_trace, {:close_one => 1})
 
     spans = ::Instana.processor.queued_spans
     assert_equal 1, spans.length
@@ -294,16 +304,17 @@ class TracerTest < Minitest::Test
     clear_all!
 
     refute ::Instana.tracer.tracing_span?(:rack)
-    ::Instana.tracer.log_start_or_continue(:rack)
+    ::Instana.tracer.start_span(:rack)
     assert ::Instana.tracer.tracing_span?(:rack)
   end
 
   def test_log_exit_warn_span_name
     logger = Minitest::Mock.new
     logger.expect(:warn, true, [String])
-    subject = Instana::Tracer.new(logger: logger)
 
-    subject.log_start_or_continue(:sample)
+    subject = Instana::Tracer.new(nil, nil, ::Instana::Trace::TracerProvider.new, logger)
+
+    subject.start_span(:sample)
     subject.log_exit(:roda)
 
     logger.verify
@@ -314,9 +325,9 @@ class TracerTest < Minitest::Test
 
     logger = Minitest::Mock.new
     logger.expect(:warn, true, [String])
-    subject = Instana::Tracer.new(logger: logger)
+    subject = Instana::Tracer.new(nil, nil, ::Instana::Trace::TracerProvider.new, logger)
 
-    subject.log_start_or_continue(:sample)
+    subject.start_span(:sample)
     subject.log_end(:roda)
 
     logger.verify
@@ -325,7 +336,7 @@ class TracerTest < Minitest::Test
   def test_log_entry_span
     clear_all!
 
-    subject = Instana::Tracer.new
+    subject = Instana::Tracer.new(nil, nil, ::Instana::Trace::TracerProvider.new)
     span = Instana::Span.new(:rack)
 
     subject.log_entry(:sample, {}, ::Instana::Util.now_in_ms, span)
@@ -336,8 +347,8 @@ class TracerTest < Minitest::Test
   def test_log_entry_span_context
     clear_all!
 
-    subject = Instana::Tracer.new
-    span_context = Instana::SpanContext.new('test', 'test')
+    subject = Instana::Tracer.new(nil, nil, nil)
+    span_context = Instana::SpanContext.new(trace_id: 'test', span_id: 'test')
 
     subject.log_entry(:sample, {}, ::Instana::Util.now_in_ms, span_context)
     assert subject.tracing?

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.217.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +79,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: irb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: base64
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +121,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +177,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-common
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +251,8 @@ files:
 - ".tekton/github-webhook-ingress.yaml"
 - ".tekton/pipeline.yaml"
 - ".tekton/pipelinerun.yaml"
+- ".tekton/prepuller-restart-service-account.yaml"
+- ".tekton/ruby-tracer-prepuller-cronjob.yaml"
 - ".tekton/ruby-tracer-prepuller.yaml"
 - ".tekton/run_unittests.sh"
 - ".tekton/scheduled-eventlistener.yaml"
@@ -199,7 +270,7 @@ files:
 - bin/setup
 - docker-compose.yml
 - download.sh
-- examples/opentracing.rb
+- examples/otel.rb
 - examples/tracing.rb
 - extras/license_header.rb
 - gemfiles/.bundle/config
@@ -334,9 +405,9 @@ files:
 - lib/instana/instrumentation/sidekiq-worker.rb
 - lib/instana/instrumented_logger.rb
 - lib/instana/logger_delegator.rb
-- lib/instana/open_tracing/carrier.rb
-- lib/instana/open_tracing/instana_tracer.rb
 - lib/instana/rack.rb
+- lib/instana/samplers/result.rb
+- lib/instana/samplers/samplers.rb
 - lib/instana/secrets.rb
 - lib/instana/serverless.rb
 - lib/instana/setup.rb
@@ -349,13 +420,17 @@ files:
 - lib/instana/snapshot/google_cloud_run_process.rb
 - lib/instana/snapshot/lambda_function.rb
 - lib/instana/snapshot/ruby_process.rb
-- lib/instana/tracer.rb
-- lib/instana/tracing/processor.rb
-- lib/instana/tracing/span.rb
-- lib/instana/tracing/span_context.rb
+- lib/instana/trace.rb
+- lib/instana/trace/export.rb
+- lib/instana/trace/processor.rb
+- lib/instana/trace/span.rb
+- lib/instana/trace/span_context.rb
+- lib/instana/trace/span_kind.rb
+- lib/instana/trace/span_limits.rb
+- lib/instana/trace/tracer.rb
+- lib/instana/trace/tracer_provider.rb
 - lib/instana/util.rb
 - lib/instana/version.rb
-- lib/opentracing.rb
 - log/.keep
 - sonar-project.properties
 - test/activator_test.rb
@@ -426,15 +501,15 @@ files:
 - test/support/helpers.rb
 - test/support/mock_timer.rb
 - test/test_helper.rb
-- test/tracing/custom_test.rb
-- test/tracing/id_management_test.rb
-- test/tracing/instrumented_logger_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/trace/custom_test.rb
+- test/trace/id_management_test.rb
+- test/trace/instrumented_logger_test.rb
+- test/trace/processor_test.rb
+- test/trace/span_context_test.rb
+- test/trace/span_test.rb
+- test/trace/tracer_async_test.rb
+- test/trace/tracer_provider_test.rb
+- test/trace/tracer_test.rb
 - test/util_test.rb
 homepage: https://www.instana.com/
 licenses:
@@ -444,7 +519,6 @@ metadata:
   documentation_uri: https://docs.instana.io/ecosystem/ruby/
   homepage_uri: https://www.instana.com/
   source_code_uri: https://github.com/instana/ruby-sensor
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -459,8 +533,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key: 
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana
 test_files:
@@ -532,13 +605,13 @@ test_files:
 - test/support/helpers.rb
 - test/support/mock_timer.rb
 - test/test_helper.rb
-- test/tracing/custom_test.rb
-- test/tracing/id_management_test.rb
-- test/tracing/instrumented_logger_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/trace/custom_test.rb
+- test/trace/id_management_test.rb
+- test/trace/instrumented_logger_test.rb
+- test/trace/processor_test.rb
+- test/trace/span_context_test.rb
+- test/trace/span_test.rb
+- test/trace/tracer_async_test.rb
+- test/trace/tracer_provider_test.rb
+- test/trace/tracer_test.rb
 - test/util_test.rb

data/examples/opentracing.rb

@@ -1,35 +0,0 @@
-# This file contains a basic OpenTracing example.
-#
-# Note:  The instana gem automatically sets the Instana tracer
-# to `OpenTracing.global_tracer`.  Once the gem is loaded, you can
-# immediately start making OpenTracing calls.
-#
-
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2018
-
-require "opentracing"
-
-entry_span = OpenTracing.start_span("HandMadeRackServer")
-
-entry_span.set_tag(:'http.method', :get)
-entry_span.set_tag(:'http.url', "/users")
-entry_span.set_tag(:'span.kind', "entry")
-
-intermediate_span = OpenTracing.start_span("myintermediate", :child_of => entry_span)
-intermediate_span.finish()
-
-db_span = OpenTracing.start_span('mydbspan', :child_of => entry_span)
-db_span.set_tag(:'db.instance', "users")
-db_span.set_tag(:'db.statement', "SELECT * FROM user_table")
-db_span.set_tag(:'db.type', "mysql")
-db_span.set_tag(:'db.user', "mysql_login")
-db_span.set_tag(:'span.kind', "exit")
-db_span.finish()
-
-intermediate_span = OpenTracing.start_span("myintermediate", :child_of => entry_span)
-intermediate_span.log("ALLOK", :message => "All seems ok")
-intermediate_span.finish()
-
-entry_span.set_tag(:'http.status_code', 200)
-entry_span.finish()

data/lib/instana/open_tracing/carrier.rb

@@ -1,7 +0,0 @@
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2017
-
-module OpenTracing
-  class Carrier < Hash
-  end
-end

data/lib/instana/open_tracing/instana_tracer.rb

@@ -1,99 +0,0 @@
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2021
-
-require 'delegate'
-# :nocov:
-module OpenTracing
-  class InstanaTracer < SimpleDelegator
-    Span = ::Instana::Span
-
-    # Start a new span
-    #
-    # @param operation_name [String] The name of the operation represented by the span
-    # @param child_of [Span] A span to be used as the ChildOf reference
-    # @param start_time [Time] the start time of the span
-    # @param tags [Hash] Starting tags for the span
-    #
-    # @return [Span]
-    #
-    def start_span(operation_name, child_of: nil, start_time: ::Instana::Util.now_in_ms, tags: nil)
-      new_span = if child_of && (child_of.is_a?(::Instana::Span) || child_of.is_a?(::Instana::SpanContext))
-                   Span.new(operation_name, parent_ctx: child_of, start_time: start_time)
-                 else
-                   Span.new(operation_name, start_time: start_time)
-                 end
-      new_span.set_tags(tags) if tags
-      new_span
-    end
-
-    # Start a new span which is the child of the current span
-    #
-    # @param operation_name [String] The name of the operation represented by the span
-    # @param child_of [Span] A span to be used as the ChildOf reference
-    # @param start_time [Time] the start time of the span
-    # @param tags [Hash] Starting tags for the span
-    #
-    # @return [Span]
-    #
-    def start_active_span(operation_name, child_of: active_span, start_time: ::Instana::Util.now_in_ms, tags: nil)
-      ::Instana.tracer.current_span = start_span(operation_name, child_of: child_of, start_time: start_time, tags: tags)
-      block_given? ? yield(::Instana.tracer.current_span) : ::Instana.tracer.current_span
-    end
-
-    # Returns the currently active span
-    #
-    # @return [Span]
-    #
-    def active_span
-      ::Instana.tracer.current_span
-    end
-
-    # Inject a span into the given carrier
-    #
-    # @param span_context [SpanContext]
-    # @param format [OpenTracing::FORMAT_TEXT_MAP, OpenTracing::FORMAT_BINARY, OpenTracing::FORMAT_RACK]
-    # @param carrier [Carrier]
-    #
-    def inject(span_context, format, carrier)
-      case format
-      when OpenTracing::FORMAT_TEXT_MAP, OpenTracing::FORMAT_BINARY
-        ::Instana.logger.debug 'Unsupported inject format'
-      when OpenTracing::FORMAT_RACK
-        carrier['X-Instana-T'] = ::Instana::Util.id_to_header(span_context.trace_id)
-        carrier['X-Instana-S'] = ::Instana::Util.id_to_header(span_context.span_id)
-      else
-        ::Instana.logger.debug 'Unknown inject format'
-      end
-    end
-
-    # Extract a span from a carrier
-    #
-    # @param format [OpenTracing::FORMAT_TEXT_MAP, OpenTracing::FORMAT_BINARY, OpenTracing::FORMAT_RACK]
-    # @param carrier [Carrier]
-    #
-    # @return [SpanContext]
-    #
-    def extract(format, carrier)
-      case format
-      when OpenTracing::FORMAT_TEXT_MAP, OpenTracing::FORMAT_BINARY
-        ::Instana.logger.debug 'Unsupported extract format'
-      when OpenTracing::FORMAT_RACK
-        ::Instana::SpanContext.new(::Instana::Util.header_to_id(carrier['HTTP_X_INSTANA_T']),
-                                   ::Instana::Util.header_to_id(carrier['HTTP_X_INSTANA_S']))
-      else
-        ::Instana.logger.debug 'Unknown inject format'
-        nil
-      end
-    end
-
-    def method_missing(method, *args, &block)
-      ::Instana.logger.warn { "You are invoking `#{m}` on Instana::Tracer via OpenTracing." }
-      super(method, *args, &block)
-    end
-
-    def respond_to_missing?(*)
-      super(method)
-    end
-  end
-end
-# :nocov: