From 842e340b0e5cd06c1f75fef1bce2ed1c12c07414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferenc=20G=C3=A9czi?= Date: Tue, 19 Mar 2024 12:00:00 +0000 Subject: [PATCH] fix: Only use application_name if @application is set MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ferenc Géczi --- lib/instana/util.rb | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/instana/util.rb b/lib/instana/util.rb index 721a806e..5ce58ee4 100644 --- a/lib/instana/util.rb +++ b/lib/instana/util.rb @@ -86,10 +86,17 @@ def get_app_name end end - if defined?(::RailsLts) && ::Rails.respond_to?(:application_name) - return ::RailsLts.application_name - elsif defined?(::Rails) && ::Rails.respond_to?(:application_name) - return ::Rails.application_name + rails_module = if defined?(::RailsLts) + then ::RailsLts + elsif defined?(::Rails) + then ::Rails + end + + if rails_module && + rails_module.respond_to?(:application_name) && + rails_module.instance_variables.include?(:@application) && + rails_module.application + return rails_module.application_name end if $0.to_s.empty?