merge

Author: xuan-cao-swi

lib/oboe_metal.rb

@@ -39,7 +39,7 @@ def start
         options = SolarWindsAPM::OboeInitOptions.instance.array_for_oboe # creates an array with the options in the right order
         SolarWindsAPM.reporter = Oboe_metal::Reporter.new(*options)
         SolarWindsAPM.loaded = true
-        report_init if (options[22]).zero? # report init at beginning if no after fork enabled
+        report_init if options[22].zero? # report init at beginning if no after fork enabled
       rescue StandardError => e
         warn e.message
         SolarWindsAPM.loaded = false

lib/solarwinds_apm/api/tracing.rb

@@ -27,43 +27,20 @@ module Tracing
       # === Argument:
       #
       # * +wait_milliseconds+ - (int, default 3000) the maximum time to wait in milliseconds
-      # * +integer_response+  - (boolean, default false) determine whether return status code of reporter or not
       #
       # === Example:
       #
       #   unless SolarWindsAPM::API.solarwinds_ready?(10_000)
       #     Logger.info "SolarWindsAPM not ready after 10 seconds, no metrics will be sent"
       #   end
       #
-      #   # with status code print out
-      #   status = SolarWindsAPM::API.solarwinds_ready?(10_000, integer_response: true)
-      #   unless status == 1
-      #     Logger.info "SolarWindsAPM not ready after 10 seconds, no metrics will be sent. Error code "#{status}"
-      #   end
-      #
       # === Returns:
-      # * Boolean (if integer_response: false)
-      # * Integer (if integer_response: true)
+      # * Boolean
       #
-      def solarwinds_ready?(wait_milliseconds = 3000, integer_response: false)
-        if SolarWindsAPM::OTelConfig[:metrics_processor].nil?
-          # OTelConfig not initialize, use sampler solarwinds_ready from http sampler
-          sampler_solarwinds_ready?(wait_milliseconds)
-        else
-          oboe_solarwinds_ready?(wait_milliseconds, integer_response: integer_response)
-        end
-      end
-
-      def oboe_solarwinds_ready?(wait_milliseconds = 3000, integer_response: false)
-        return false unless SolarWindsAPM.loaded
-
-        is_ready = SolarWindsAPM::Context.isReady(wait_milliseconds)
-        integer_response ? is_ready : is_ready == 1
-      end
-
-      def sampler_solarwinds_ready?(wait_milliseconds = 3000)
+      def solarwinds_ready?(wait_milliseconds = 3000)
         root_sampler = ::OpenTelemetry.tracer_provider.sampler.instance_variable_get(:@root)
         is_ready = root_sampler.wait_until_ready(wait_milliseconds / 1000)
+        puts "is_ready: #{is_ready}"
         !!is_ready
       end
     end

lib/solarwinds_apm/opentelemetry/solarwinds_sampler.rb

@@ -222,7 +222,7 @@ def create_xtraceoptions_response_value(liboboe_decision, parent_span_context, x
           if xtraceoptions.trigger_trace
             # If a traceparent header was provided then oboe does not generate the message
             tracestring = Utils.traceparent_from_context(parent_span_context) if parent_span_context.valid? && parent_span_context.remote?
-            trigger_msg = tracestring && (liboboe_decision['decision_type']).zero? ? XTRACEOPTIONS_RESP_TRIGGER_IGNORED : liboboe_decision['status_msg']
+            trigger_msg = tracestring && liboboe_decision['decision_type'].zero? ? XTRACEOPTIONS_RESP_TRIGGER_IGNORED : liboboe_decision['status_msg']
             SolarWindsAPM.logger.debug do
               "[#{self.class}/#{__method__}] tracestring: #{tracestring}; trigger_msg: #{trigger_msg}"
             end

lib/solarwinds_apm/sampling/sampler.rb

@@ -35,12 +35,18 @@ def wait_until_ready(timeout = 10)
       thread = Thread.new { settings_ready }
       thread.join(timeout) || (thread.kill
                                false)
+      @ready
     end
 
-    def settings_ready
+    def settings_ready(timeout = 10)
+      deadline = Time.now
       loop do
         break unless @settings.empty?
+
+        sleep 0.1
+        break if (Time.now - deadline).round(0) >= timeout
       end
+      @ready = true unless @settings[:signature_key].nil?
     end
 
     def resolve_tracing_mode(config)

test/api/tracing_ready_test.rb

@@ -6,41 +6,50 @@
 require 'minitest_helper'
 require 'minitest/mock'
 require './lib/solarwinds_apm/api'
+require './lib/solarwinds_apm/sampling'
+require 'sampling_test_helper'
 
 describe 'Test solarwinds_ready API call' do
-  it 'default_test_solarwinds_ready' do
-    SolarWindsAPM::Context.stub(:isReady, 1) do
-      _(SolarWindsAPM::API.solarwinds_ready?).must_equal true
-    end
-  end
-
-  it 'solarwinds_ready_with_5000_wait_time' do
-    SolarWindsAPM::Context.stub(:isReady, 1) do
-      _(SolarWindsAPM::API.solarwinds_ready?(5000)).must_equal true
-    end
+  let(:tracer) { OpenTelemetry.tracer_provider.tracer('test') }
+  before do
+    ENV['OTEL_TRACES_EXPORTER'] = 'none'
+    OpenTelemetry::SDK.configure
+
+    @memory_exporter = OpenTelemetry::SDK::Trace::Export::InMemorySpanExporter.new
+    OpenTelemetry.tracer_provider.add_span_processor(OpenTelemetry::SDK::Trace::Export::SimpleSpanProcessor.new(@memory_exporter))
+
+    @config = {
+      collector: 'https://apm.collector.st-ssp.solarwinds.com:443',
+      service: 'test-ruby',
+      headers: "Bearer #{ENV.fetch('APM_RUBY_TEST_STAGING_KEY', nil)}",
+      tracing_mode: true,
+      trigger_trace_enabled: true
+    }
   end
 
-  it 'solarwinds_ready_with_5000_wait_time_and_int_response' do
-    SolarWindsAPM::Context.stub(:isReady, 1) do
-      _(SolarWindsAPM::API.solarwinds_ready?(5000, integer_response: true)).must_equal 1
-    end
+  after do
+    OpenTelemetry::TestHelpers.reset_opentelemetry
+    @memory_exporter.reset
   end
 
-  it 'solarwinds_ready_with_default_wait_time_and_int_response' do
-    SolarWindsAPM::Context.stub(:isReady, 1) do
-      _(SolarWindsAPM::API.solarwinds_ready?(integer_response: true)).must_equal 1
-    end
+  it 'default_test_solarwinds_ready' do
+    new_config = @config.dup
+    sampler = SolarWindsAPM::HttpSampler.new(new_config)
+    replace_sampler(sampler)
+    _(SolarWindsAPM::API.solarwinds_ready?).must_equal true
   end
 
-  it 'solarwinds_ready_with_default_wait_time_and_int_response_as_4' do
-    SolarWindsAPM::Context.stub(:isReady, 4) do
-      _(SolarWindsAPM::API.solarwinds_ready?(integer_response: true)).must_equal 4
-    end
+  it 'solarwinds_ready_with_5000_wait_time' do
+    new_config = @config.dup
+    sampler = SolarWindsAPM::HttpSampler.new(new_config)
+    replace_sampler(sampler)
+    _(SolarWindsAPM::API.solarwinds_ready?(5000)).must_equal true
   end
 
-  it 'solarwinds_ready_with_default_wait_time_and_int_response_as_false' do
-    SolarWindsAPM::Context.stub(:isReady, 1) do
-      _(SolarWindsAPM::API.solarwinds_ready?(integer_response: false)).must_equal true
-    end
+  it 'solarwinds_ready_with_invalid_collector' do
+    new_config = @config.merge(collector: URI('https://collector.invalid'))
+    sampler = SolarWindsAPM::HttpSampler.new(new_config)
+    replace_sampler(sampler)
+    _(SolarWindsAPM::API.solarwinds_ready?(100_000)).must_equal false
   end
 end

test/sampling/http_sampler_test.rb

@@ -3,7 +3,6 @@
 # Copyright (c) 2025 SolarWinds, LLC.
 # All rights reserved.
 
-# BUNDLE_GEMFILE=gemfiles/unit.gemfile bundle exec ruby -I test test/sampling/http_sampler_test.rb
 require 'minitest_helper'
 require './lib/solarwinds_apm/sampling'
 require 'sampling_test_helper'