appoptics_apm 4.8.0 → 4.9.0

data/lib/appoptics_apm.rb

@@ -49,6 +49,7 @@ begin
   if AppOpticsAPM.loaded
     require 'appoptics_apm/instrumentation'
     require 'appoptics_apm/support/transaction_metrics'
+    require 'appoptics_apm/support/x_trace_options'
 
     # Frameworks
     require 'appoptics_apm/frameworks/rails'

data/lib/appoptics_apm/config.rb

@@ -16,13 +16,16 @@ module AppOpticsAPM
     @@instrumentation = [:action_controller, :action_controller_api, :action_view,
                          :active_record, :bunnyclient, :bunnyconsumer, :cassandra, :curb,
                          :dalli, :delayed_jobclient, :delayed_jobworker,
-                         :em_http_request, :excon, :faraday, :grpc_client, :grpc_server, :grape,
+                         # :em_http_request,
+                         :excon, :faraday, :grpc_client, :grpc_server, :grape,
                          :httpclient, :nethttp, :memcached, :mongo, :moped, :padrino, :rack, :redis,
                          :resqueclient, :resqueworker, :rest_client,
                          :sequel, :sidekiqclient, :sidekiqworker, :sinatra, :typhoeus]
 
     # Subgrouping of instrumentation
-    @@http_clients = [:curb, :excon, :em_http_request, :faraday, :httpclient, :nethttp, :rest_client, :typhoeus]
+    @@http_clients = [:curb, :excon,
+                      # :em_http_request,
+                      :faraday, :httpclient, :nethttp, :rest_client, :typhoeus]
 
     ##
     # load_config_file
@@ -240,11 +243,15 @@ module AppOpticsAPM
         end
 
       elsif key == :tracing_mode
-      #   CAN'T DO THIS ANYMORE, ALL TRACING COMMUNICATION TO OBOE
+      #   CAN'T DO `set_tracing_mode` ANYMORE, ALL TRACING COMMUNICATION TO OBOE
       #   IS NOW HANDLED BY TransactionSettings
       #   AppOpticsAPM.set_tracing_mode(value.to_sym) if AppOpticsAPM.loaded
 
-      # Make sure that the mode is stored as a symbol
+        # Make sure that the mode is stored as a symbol
+        @@config[key.to_sym] = value.to_sym
+
+      elsif key == :trigger_tracing_mode
+        # Make sure that the mode is stored as a symbol
         @@config[key.to_sym] = value.to_sym
       end
     end

data/lib/appoptics_apm/frameworks/rails/inst/action_controller.rb

@@ -84,18 +84,18 @@ module AppOpticsAPM
 end
 
 # ActionController::Base
-if defined?(ActionController::Base) && AppOpticsAPM::Config[:action_controller][:enabled]
+if defined?(ActionController::Base) && AppOpticsAPM::Config[:action_controller][:enabled] && Rails::VERSION::MAJOR <= 6
   AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting actioncontroller' if AppOpticsAPM::Config[:verbose]
   require "appoptics_apm/frameworks/rails/inst/action_controller#{Rails::VERSION::MAJOR}"
   if Rails::VERSION::MAJOR >= 5
     ActionController::Base.send(:prepend, ::AppOpticsAPM::Inst::ActionController)
-  else
+  elsif Rails::VERSION::MAJOR < 5
     AppOpticsAPM::Util.send_include(::ActionController::Base, AppOpticsAPM::Inst::ActionController)
   end
 end
 
-# ActionController::API - Rails 5+ or via the rails-api gem
-if defined?(ActionController::API) && AppOpticsAPM::Config[:action_controller_api][:enabled]
+# ActionController::API - Rails 5 or via the rails-api gem
+if defined?(ActionController::API) && AppOpticsAPM::Config[:action_controller_api][:enabled]  && Rails::VERSION::MAJOR <= 6
   AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting actioncontroller api' if AppOpticsAPM::Config[:verbose]
   require "appoptics_apm/frameworks/rails/inst/action_controller_api"
   ActionController::API.send(:prepend, ::AppOpticsAPM::Inst::ActionControllerAPI)

data/lib/appoptics_apm/frameworks/rails/inst/action_controller6.rb

@@ -0,0 +1,50 @@
+# Copyright (c) 2016 SolarWinds, LLC.
+# All rights reserved.
+
+module AppOpticsAPM
+  module Inst
+    #
+    # ActionController
+    #
+    # This modules contains the instrumentation code specific
+    # to Rails v6
+    #
+    module ActionController
+      include AppOpticsAPM::Inst::RailsBase
+
+      def process_action(method_name, *args)
+        kvs = {
+            :Controller   => self.class.name,
+            :Action       => self.action_name,
+        }
+        request.env['appoptics_apm.controller'] = kvs[:Controller]
+        request.env['appoptics_apm.action'] = kvs[:Action]
+
+        return super(method_name, *args) unless AppOpticsAPM.tracing?
+        begin
+          kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:action_controller][:collect_backtraces]
+
+          AppOpticsAPM::API.log_entry('rails', kvs)
+          super(method_name, *args)
+
+        rescue Exception => e
+          AppOpticsAPM::API.log_exception('rails', e) if log_rails_error?(e)
+          raise
+        ensure
+          AppOpticsAPM::API.log_exit('rails')
+        end
+      end
+
+      #
+      # render
+      #
+      # Our render wrapper that calls 'trace', which will log if we are tracing
+      #
+      def render(*args, &blk)
+        trace('actionview') do
+          super(*args, &blk)
+        end
+      end
+    end
+  end
+end

data/lib/appoptics_apm/frameworks/rails/inst/action_view.rb

@@ -1,7 +1,7 @@
 # Copyright (c) 2016 SolarWinds, LLC.
 # All rights reserved.
 
-if defined?(ActionView::Base) && AppOpticsAPM::Config[:action_view][:enabled]
+if defined?(ActionView::Base) && AppOpticsAPM::Config[:action_view][:enabled]  && Rails::VERSION::MAJOR < 6
 
   ##
   # ActionView Instrumentation is version dependent.  ActionView 2.x is separate

data/lib/appoptics_apm/frameworks/rails/inst/active_record.rb

@@ -5,13 +5,13 @@ require 'appoptics_apm/frameworks/rails/inst/connection_adapters/mysql'
 require 'appoptics_apm/frameworks/rails/inst/connection_adapters/mysql2'
 require 'appoptics_apm/frameworks/rails/inst/connection_adapters/postgresql'
 
-if AppOpticsAPM::Config[:active_record][:enabled] && !defined?(JRUBY_VERSION)
+if AppOpticsAPM::Config[:active_record][:enabled] && !defined?(JRUBY_VERSION) && Rails::VERSION::MAJOR <= 6
   begin
     adapter = ActiveRecord::Base.connection_config[:adapter]
 
     if Rails::VERSION::MAJOR < 5
       require 'appoptics_apm/frameworks/rails/inst/connection_adapters/utils'
-    else
+    elsif Rails::VERSION::MAJOR >= 5
       require 'appoptics_apm/frameworks/rails/inst/connection_adapters/utils5x'
     end
 

data/lib/appoptics_apm/inst/logger_formatter.rb

@@ -23,13 +23,14 @@ module AppOpticsAPM
         if current_trace.log?
           case msg
           when ::String
-            msg.strip.empty? ? msg : insert_before_empty_lines(msg, current_trace.for_log)
+            msg = msg.strip.empty? ? msg : insert_before_empty_lines(msg, current_trace.for_log)
           when ::Exception
             # conversion to String copied from Logger::Formatter private method #msg2str
-            "#{msg.message} (#{msg.class}) #{current_trace.for_log}\n" <<
-              (msg.backtrace || []).join("\n")
+            msg = ("#{msg.message} (#{msg.class}) #{current_trace.for_log}\n" <<
+              (msg.backtrace || []).join("\n"))
           end
         end
+        msg
       end
 
       def insert_before_empty_lines(msg, for_log)

data/lib/appoptics_apm/inst/rack.rb

@@ -27,30 +27,30 @@ if AppOpticsAPM.loaded
       end
 
       def call(env)
-        incoming = AppOpticsAPM::Context.isValid
 
         # In the case of nested Ruby apps such as Grape inside of Rails
         # or Grape inside of Grape, each app has it's own instance
         # of rack middleware. We want to avoid tracing rack more than once
         return @app.call(env) if AppOpticsAPM.tracing? && AppOpticsAPM.layer == :rack
 
+        incoming = AppOpticsAPM::Context.isValid
         AppOpticsAPM.transaction_name = nil
 
         url = env['PATH_INFO']
+        options = AppOpticsAPM::XTraceOptions.new(env['HTTP_X_TRACE_OPTIONS'], env['HTTP_X_TRACE_OPTIONS_SIGNATURE'])
         xtrace = AppOpticsAPM::XTrace.valid?(env['HTTP_X_TRACE']) ? (env['HTTP_X_TRACE']) : nil
-
-        settings = AppOpticsAPM::TransactionSettings.new(url, xtrace)
-
-        # AppOpticsAPM.logger.warn "%%% FILTER: #{settings} %%%"
+        settings = AppOpticsAPM::TransactionSettings.new(url, xtrace, options)
 
         response =
           propagate_xtrace(env, settings, xtrace) do
-            sample(env, settings) do
+            sample(env, settings, options) do
               AppOpticsAPM::TransactionMetrics.metrics(env, settings) do
                 @app.call(env)
               end
             end
           end || [500, {}, nil]
+        options.add_response_header(response[1], settings)
+
         AppOpticsAPM::Context.clear unless incoming
         response
       rescue
@@ -66,7 +66,7 @@ if AppOpticsAPM.loaded
 
       private
 
-      def collect(env, settings)
+      def collect(env)
         req = ::Rack::Request.new(env)
         report_kvs = {}
 
@@ -84,8 +84,6 @@ if AppOpticsAPM.loaded
 
           report_kvs[:URL] = AppOpticsAPM::Config[:rack][:log_args] ? ::CGI.unescape(req.fullpath) : ::CGI.unescape(req.path)
           report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:rack][:collect_backtraces]
-          report_kvs[:SampleRate]        = settings.rate
-          report_kvs[:SampleSource]      = settings.source
 
           # Report any request queue'ing headers.  Report as 'Request-Start' or the summed Queue-Time
           report_kvs[:'Request-Start']     = env['HTTP_X_REQUEST_START']    if env.key?('HTTP_X_REQUEST_START')
@@ -126,11 +124,13 @@ if AppOpticsAPM.loaded
         [status, headers, response]
       end
 
-      def sample(env, settings)
+      def sample(env, settings, options)
         xtrace = env['HTTP_X_TRACE']
         if settings.do_sample
           begin
-            report_kvs = collect(env, settings)
+            report_kvs = collect(env)
+            settings.add_kvs(report_kvs)
+            options&.add_kvs(report_kvs, settings)
 
             AppOpticsAPM::API.log_start(:rack, xtrace, report_kvs, settings)
 

data/lib/appoptics_apm/oboe_init_options.rb

@@ -8,7 +8,7 @@ module AppOpticsAPM
   class OboeInitOptions
     include Singleton
 
-    attr_reader :reporter, :host, :service_name  # exposing these mainly for testing
+    attr_reader :reporter, :host, :service_name, :ec2_md_timeout  # exposing these mainly for testing
 
     # TODO decide if these globals are useful when testing
     # OBOE_HOSTNAME_ALIAS = 0
@@ -69,6 +69,8 @@ module AppOpticsAPM
       @token_bucket_rate = (ENV['APPOPTICS_TOKEN_BUCKET_RATE'] || -1).to_i
       # use single files in file reporter for each event
       @file_single = (ENV['APPOPTICS_REPORTER_FILE_SINGLE'].to_s.downcase == 'true') ? 1 : 0
+      # timeout for ec2 metadata
+      @ec2_md_timeout = read_and_validate_ec2_md_timeout
     end
 
     def re_init # for testing with changed ENV vars
@@ -94,7 +96,8 @@ module AppOpticsAPM
         @histogram_precision,
         @token_bucket_capacity,
         @token_bucket_rate,
-        @file_single
+        @file_single,
+        @ec2_md_timeout
       ]
     end
 
@@ -108,7 +111,8 @@ module AppOpticsAPM
 
       reporter = ENV['APPOPTICS_REPORTER'] || 'ssl'
       # override with 'file', e.g. when running tests
-      reporter = 'file' if ENV.key?('APPOPTICS_GEM_TEST')
+      # changed my mind => set the right reporter in the env when running tests !!!
+      # reporter = 'file' if ENV.key?('APPOPTICS_GEM_TEST')
 
       host = ''
       case reporter
@@ -121,6 +125,7 @@ module AppOpticsAPM
         # ____ AppOpticsAPM::Config[:reporter_host] and
         # ____ AppOpticsAPM::Config[:reporter_port] were moved here from
         # ____ oboe_metal.rb and are not documented anywhere
+        # ____ udp is for internal use only
       when 'null'
         host = ''
       end
@@ -148,7 +153,7 @@ module AppOpticsAPM
     end
 
     def validate_token(token)
-      if (token !~ /^[0-9a-fA-F]{64}|[0-9a-zA-Z_\-]{71}$/)
+      if (token !~ /^[0-9a-fA-F]{64}|[0-9a-zA-Z_-]{71}$/) && ENV['APPOPTICS_COLLECTOR'] != "sslcollector:12222"
         masked = "#{token[0..3]}...#{token[-4..-1]}"
         AppOpticsAPM.logger.error "[appoptics_apm/oboe_options] APPOPTICS_SERVICE_KEY problem. API Token in wrong format. Masked token: #{masked}"
         return false
@@ -158,6 +163,7 @@ module AppOpticsAPM
     end
 
     def validate_transform_service_name(service_name)
+      service_name = 'test_ssl_collector' if ENV['APPOPTICS_COLLECTOR'] == "sslcollector:12222"
       if service_name.empty?
         AppOpticsAPM.logger.error "[appoptics_apm/oboe_options] APPOPTICS_SERVICE_KEY problem. Service Name is missing"
         return false
@@ -175,6 +181,13 @@ module AppOpticsAPM
       @service_name = service_name # instance variable used in testing
       true
     end
+
+    def read_and_validate_ec2_md_timeout
+      timeout = (ENV['APPOPTICS_EC2_METADATA_TIMEOUT'] || AppOpticsAPM::Config[:ec2_metadata_timeout])
+      return 1000 unless timeout.is_a?(Integer) || timeout =~ /^\d+$/
+      timeout = timeout.to_i
+      return timeout.between?(0, 3000) ? timeout : 1000
+    end
   end
 end
 

data/lib/appoptics_apm/support/transaction_settings.rb

@@ -6,14 +6,9 @@ AO_TRACING_ENABLED = 1
 AO_TRACING_DISABLED = 0
 AO_TRACING_UNSET = -1
 
-AO_TRACING_DECISIONS_TRACING_DISABLED = -2
-AO_TRACING_DECISIONS_XTRACE_NOT_SAMPLED = -1
 AO_TRACING_DECISIONS_OK = 0
-AO_TRACING_DECISIONS_NULL_OUT = 1
-AO_TRACING_DECISIONS_NO_CONFIG = 2
-AO_TRACING_DECISIONS_REPORTER_NOT_READY = 3
-AO_TRACING_DECISIONS_NO_VALID_SETTINGS = 4
-AO_TRACING_DECISIONS_QUEUE_FULL = 5
+
+OBOE_SETTINGS_UNSET = -1
 
 module AppOpticsAPM
   ##
@@ -21,13 +16,15 @@ module AppOpticsAPM
   #
   class TransactionSettings
 
-    attr_accessor :do_metrics, :do_sample
-    attr_reader   :do_propagate, :rate, :source
+    attr_accessor :do_sample, :do_metrics
+    attr_reader   :auth_msg, :do_propagate, :status_msg, :type, :source, :rate, :xtrace
+                  #, :status
 
-    def initialize(url = nil, xtrace = '')
+    def initialize(url = '', xtrace = '', options = nil)
       @do_metrics = false
       @do_sample = false
       @do_propagate = true
+      @xtrace = xtrace || ''
       tracing_mode = AO_TRACING_ENABLED
 
       if AppOpticsAPM::Context.isValid
@@ -46,15 +43,23 @@ module AppOpticsAPM
         tracing_mode = AO_TRACING_DISABLED
       end
 
-      args = [xtrace || '']
+      args = [@xtrace]
       args << tracing_mode
-      args << AppOpticsAPM::Config[:sample_rate] if AppOpticsAPM::Config[:sample_rate]&. >= 0
+      args << (AppOpticsAPM::Config[:sample_rate] || OBOE_SETTINGS_UNSET)
+
+      if options && (options.options || options.signature)
+        args << (options.trigger_trace ? 1 : 0)
+        args << (trigger_tracing_mode_disabled? ? 0 : 1)
+        args << options.options
+        args << options.signature
+        args << options.timestamp
+      end
 
-      metrics, sample, @rate, @source, return_code = AppOpticsAPM::Context.getDecisions(*args)
+      metrics, sample, @rate, @source, @type, @auth, @status_msg, @auth_msg, @status =
+        AppOpticsAPM::Context.getDecisions(*args)
 
-      puts "return_code class: #{return_code.class}" unless return_code.is_a? Integer
-      if return_code > AO_TRACING_DECISIONS_OK
-        AppOpticsAPM.logger.warn "[appoptics-apm/sample] Problem getting the sampling decisions, code: #{return_code}"
+      if @status > AO_TRACING_DECISIONS_OK
+        AppOpticsAPM.logger.warn "[appoptics-apm/sample] Problem getting the sampling decisions: #{@status_msg} code: #{@status}"
       end
 
       @do_metrics = metrics > 0
@@ -65,6 +70,20 @@ module AppOpticsAPM
       "do_propagate: #{do_propagate}, do_sample: #{do_sample}, do_metrics: #{do_metrics} rate: #{rate}, source: #{source}"
     end
 
+    def add_kvs(kvs)
+      kvs[:SampleRate] = @rate
+      kvs[:SampleSource] = @source
+    end
+
+    def triggered_trace?
+      @type == 1
+    end
+
+    def auth_ok?
+      # @auth is undefined if initialize is called with an existing context
+      !@auth || @auth < 1
+    end
+
     private
 
     ##
@@ -104,6 +123,11 @@ module AppOpticsAPM
       false
     end
 
+    def trigger_tracing_mode_disabled?
+      AppOpticsAPM::Config[:trigger_tracing_mode] &&
+        AppOpticsAPM::Config[:trigger_tracing_mode] == :disabled
+    end
+
     ##
     # asset?
     #

data/lib/appoptics_apm/support/x_trace_options.rb

@@ -0,0 +1,110 @@
+# Copyright (c) 2019 SolarWinds, LLC.
+# All rights reserved.
+
+
+module AppOpticsAPM
+  class XTraceOptions
+
+    attr_reader :options, :signature, :trigger_trace, :timestamp
+    attr_reader :pd_keys, :custom_kvs, :ignored # used in tests
+    ##
+    # Params:
+    # +options+ : An X-Trace-Options @options string
+    # +signature+ : hmac signature to pass on for verification
+    #
+    # populates:
+    # - @force_trace (true|false)
+    # - @app_id (as given by Pingdom)
+    # - @probe_id (as given by Pingdom)
+    # - @loc (2 characters given by Pingdom)
+    # - @custom_kvs (hash)
+    # - @ignored (array)
+    #
+    # split it up by ';' separator
+    # kv assignment by '='
+    # currently valid keys:
+    # - force_trace (valid: 0,1) unless we use just a kv
+    # - application_id (format defined by pingdom (no validation))
+    # - probe_id
+    # - custom_* (';=' not allowed in key), value (validate max. length)
+    # - ts (unix timestamp)
+    # - other keys will be reported in the response options as ignored
+
+    def initialize(options, signature = nil)
+      @options = options.dup
+      @signature = signature.dup
+      @trigger_trace = false
+      @custom_kvs = {}
+      @pd_keys = nil
+      @ignored = []
+      @timestamp = 0
+
+      options&.split(/;+/)&.each do |val|
+        k = val.split('=', 2)
+
+        next unless k[0] # it can be nil, eg when the header starts with ';'
+
+        k[0]&.strip!
+        case k[0]
+        when 'trigger-trace'
+          if k[1]
+            @ignored << 'trigger-trace'
+          else
+            @trigger_trace = true
+          end
+        when 'pd-keys'
+          if @pd_keys
+            AppOpticsAPM.logger.info "[appoptics_apm/x-trace-options] Duplicate key: #{k[0]}"
+          else
+            @pd_keys = k[1].strip
+          end
+        when /^custom-[^\s]*$/
+          if @custom_kvs[k[0]]
+            AppOpticsAPM.logger.info "[appoptics_apm/x-trace-options] Duplicate key: #{k[0]}"
+          else
+            @custom_kvs[k[0]] = k[1].strip
+          end
+        when 'ts'
+          if @timestamp > 0
+            AppOpticsAPM.logger.info "[appoptics_apm/x-trace-options] Duplicate key: #{k[0]}"
+          else
+            @timestamp = k[1].to_i
+          end
+        else
+          @ignored << k[0]
+        end
+      end
+      unless @ignored.empty?
+        msg = "[appoptics_apm/x-trace-options] Some keys were ignored: #{@ignored.join(',' )}"
+        AppOpticsAPM.logger.info(msg)
+      end
+    end
+
+    def add_kvs(kvs, settings)
+      return unless settings.auth_ok?
+
+      @custom_kvs.each { |k,v| kvs[k] = v } unless @custom_kvs.empty?
+      kvs['PDKeys'] = @pd_keys if @pd_keys
+      kvs['TriggeredTrace'] = true if settings.triggered_trace?
+    end
+
+    def add_response_header(headers, settings)
+      return unless options
+
+      response = []
+      response << "auth=#{settings.auth_msg}" if @signature
+      if settings.auth_ok?
+        if @trigger_trace
+          trigger_msg = !settings.xtrace.empty? && settings.type == 0 ? 'ignored' : settings.status_msg
+        else
+          trigger_msg = 'not-requested'
+        end
+        response << "trigger-trace=#{trigger_msg}"
+        response << "ignored=#{@ignored.join(',')}" unless @ignored.empty?
+      end
+
+      headers['X-Trace-Options-Response'] = response.join(';')
+    end
+
+  end
+end