lib/instana/util.rb in instana-1.8.3 vs lib/instana/util.rb in instana-1.9.0.daftrabbit

- old
+ new

@@ -158,19 +158,22 @@ # Best effort to determine a name for the instrumented application # on the dashboard. # def get_app_name if ENV.key?('INSTANA_SERVICE_NAME') - name = ENV['INSTANA_SERVICE_NAME'] + return ENV['INSTANA_SERVICE_NAME'] + end - elsif defined?(::RailsLts) || defined?(::Rails) - name = Rails.application.class.to_s.split('::')[0] - else - name = File.basename($0) + if defined?(::Resque) && ($0 =~ /resque-#{Resque::Version}/) + return "Resque Worker" end - return name + if defined?(::RailsLts) || defined?(::Rails) + return Rails.application.class.to_s.split('::')[0] + end + + return File.basename($0) rescue Exception => e Instana.logger.info "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" Instana.logger.debug e.backtrace.join("\r\n") end