Merge pull request #94 from appoptics/AO-11710_AO-9152_padrino

AO-11710 AO-9152 padrino AO-14223 faraday AO-14045 azure

Author: prettycoder

.travis.yml

@@ -14,7 +14,8 @@ rvm:
   - 2.6.4
   - 2.5.5
   - 2.4.5
-  - ruby-head
+  - 2.7.0-preview1
+#  - ruby-head
 #  - jruby-9.0.5.0
 
 gemfile:
@@ -86,6 +87,7 @@ matrix:
       env: DBTYPE=mysql2
   allow_failures:
     - rvm: ruby-head
+    - rvm: 2.7.0-preview1
 
 # FIXME: Figure out if this is still an issue when reviewing cassandra test setup
 # Attempt Travis/Cassandra fix re: https://github.com/travis-ci/travis-ci/issues/1484

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
+gem 'rake'
 
 group :development, :test do
-  gem 'rake'
   gem 'minitest'
   gem 'minitest-reporters', '< 1.0.18'
   gem 'minitest-debugger', :require => false
@@ -18,12 +18,12 @@ group :development, :test do
   gem 'byebug'
   gem 'get_process_mem'
   gem 'memory_profiler'
-end
 
-if defined?(JRUBY_VERSION)
-  gem 'sinatra', :require => false
-else
-  gem 'sinatra'
+  if defined?(JRUBY_VERSION)
+    gem 'sinatra', :require => false
+  else
+    gem 'sinatra'
+  end
 end
 
 gemspec

build_gem.sh

@@ -4,7 +4,7 @@
 # we currently only build for MRI, no JRuby
 echo -e "\n=== building for MRI ===\n"
 rm -f Gemfile.lock
-bundle install
+bundle install --without development --without test
 bundle exec rake distclean
 bundle exec rake fetch_ext_deps
 gem build appoptics_apm.gemspec

ext/oboe_metal/src/VERSION

@@ -1 +1 @@
-6.0.0
+7.0.0

gemfiles/instrumentation_mocked.gemfile

@@ -14,7 +14,7 @@ group :development, :test do
   gem 'mocha'
 end
 
-gem 'curb', '0.9.7' # temporarily freeze version, TODO find fix for 0.9.8
+gem 'curb'
 gem 'excon'
 gem 'faraday'
 gem 'httpclient'

lib/appoptics_apm/frameworks/padrino.rb

@@ -46,14 +46,6 @@ def render_with_appoptics(engine, data = nil, options = {}, locals = {}, &block)
           report_kvs[:engine] = engine
           report_kvs[:template] = data
 
-          begin
-            report_kvs[:File]         = __FILE__
-            report_kvs[:LineNumber]   = __LINE__
-          rescue StandardError => e
-            AppOpticsAPM.logger.debug "[appoptics_apm/padrino] #{e.message}"
-            AppOpticsAPM.logger.debug e.backtrace.join(', ')
-          end
-
           AppOpticsAPM::SDK.trace(:padrino_render, report_kvs, :padrino_render) do
             report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:padrino][:collect_backtraces]
             render_without_appoptics(engine, data, options, locals, &block)

lib/appoptics_apm/frameworks/sinatra.rb

@@ -61,14 +61,6 @@ def render_with_appoptics(engine, data, options = {}, locals = {}, &block)
           report_kvs[:engine] = engine
           report_kvs[:template] = data
 
-          begin
-            report_kvs[:File]         = __FILE__
-            report_kvs[:LineNumber]   = __LINE__
-          rescue StandardError => e
-            AppOpticsAPM.logger.debug "[appoptics_apm/sinatra] #{e.message}"
-            AppOpticsAPM.logger.debug e.backtrace.join(', ')
-          end
-
           AppOpticsAPM::SDK.trace(:sinatra_render, report_kvs, :sinatra_render) do
             report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:sinatra][:collect_backtraces]
             render_without_appoptics(engine, data, options, locals, &block)

lib/appoptics_apm/inst/faraday.rb

@@ -37,7 +37,15 @@ def run_request_with_appoptics(method, url, body, headers, &block)
             AppOpticsAPM::XTrace.continue_service_context(xtrace, xtrace_new)
           end
           kvs = {}
-          kvs[:Middleware] = @builder.handlers
+
+          # this seems the safer condition than trying to identify the
+          # faraday version when adapter started to work without arg
+          # and handlers don't include the adapter anymore
+          if @builder.method(:adapter).parameters.find { |ele| ele[0] == :req }
+            kvs[:Middleware] = @builder.handlers
+          else
+            kvs[:Middleware] = [@builder.adapter] + @builder.handlers
+          end
           kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:faraday][:collect_backtraces]
 
           # Only send service KVs if we're not using an adapter
@@ -68,16 +76,20 @@ def url_blacklisted?
 
       # This is only considered a remote service call if the middleware/adapter is not instrumented
       def remote_call?
-        (@builder.handlers.map(&:name) & APPOPTICS_INSTR_ADAPTERS).count == 0
+        if @builder.method(:adapter).parameters.find { |ele| ele[0] == :req }
+          (@builder.handlers.map(&:name) & APPOPTICS_INSTR_ADAPTERS).count == 0
+        else
+          ((@builder.handlers.map(&:name) << @builder.adapter.name) & APPOPTICS_INSTR_ADAPTERS).count == 0
+        end
       end
 
-      def rsc_kvs(url, method, result)
+      def rsc_kvs(_url, method, result)
         kvs = { :Spec => 'rsc',
                 :IsService => 1,
                 :HTTPMethod => method.upcase,
                 :HTTPStatus => result.status, }
         kvs[:Blacklisted] = true if url_blacklisted?
-        kvs[:RemoteURL] = result.to_hash[:url].to_s
+        kvs[:RemoteURL] = result.env.to_hash[:url].to_s
         kvs[:RemoteURL].split('?').first unless AppOpticsAPM::Config[:faraday][:log_args]
 
         kvs

lib/appoptics_apm/version.rb

@@ -7,7 +7,7 @@ module AppOpticsAPM
   # appoptics_apm.gemspec during gem build process
   module Version
     MAJOR = 4 # breaking,
-    MINOR = 9 # feature,
+    MINOR = 10 # feature,
     PATCH = 0 # fix => BFF
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')

lib/appoptics_apm/xtrace.rb

@@ -97,16 +97,16 @@ def edge_id(xtrace)
       # +finish+ is the context returned to us (as an HTTP response header
       # if that be the case)
       #
-      def continue_service_context(start, finish)
-        if AppOpticsAPM::XTrace.valid?(finish) && AppOpticsAPM.tracing?
+      def continue_service_context(start_xtrace, end_xtrace)
+        if AppOpticsAPM::XTrace.valid?(end_xtrace) && AppOpticsAPM.tracing?
 
-          # Assure that we received back a valid X-Trace with the same task_id
+          # Make sure that we received back a valid X-Trace with the same task_id
           # and the sampling bit is set, otherwise it is a response from a non-sampling service
-          if AppOpticsAPM::XTrace.task_id(start) == AppOpticsAPM::XTrace.task_id(finish) &&
-            AppOpticsAPM::XTrace.sampled?(finish)
-            AppOpticsAPM::Context.fromString(finish)
+          if AppOpticsAPM::XTrace.task_id(start_xtrace) == AppOpticsAPM::XTrace.task_id(end_xtrace) &&
+            AppOpticsAPM::XTrace.sampled?(end_xtrace)
+            AppOpticsAPM::Context.fromString(end_xtrace)
           else
-            AppOpticsAPM.logger.debug "[XTrace] Sampling flag unset or mismatched start and finish ids:\n#{start}\n#{finish}"
+            AppOpticsAPM.logger.debug "[XTrace] Sampling flag unset or mismatched start and finish ids:\n#{start_xtrace}\n#{end_xtrace}"
           end
         end
       end