appoptics_apm 4.5.0 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54c8c572a8723e86a62a48fbd32aaa6659454ab9f463f06d8b46d268139c1a30
-  data.tar.gz: b147aa117802cee2b26e1362239fad37211979f13c52cb66a3784ab7c361490c
+  metadata.gz: 31429d8883210f939e3c1792f0cfcbe3ffec4b24e104b9edb611ab41860442af
+  data.tar.gz: 8af8ffb315335518cd74f69c3e9d0c60335337ffe31b871eb497282e17f46c67
 SHA512:
-  metadata.gz: d0cd3f37c066dd3b3a5bc1a8449b1d2342f6f6292b412a61defe946abf77cbe67b3ee91180357784ad3303f370e34c93b9f5c76c195b4613c9ebff5dfd491f44
-  data.tar.gz: 5960b044aa3cd9ed21e22925504a215e935484d66427a3c29bd374ea19fb2c3eb76c8b035e2ffab8b7d20ee8bd51b2d05338c9630a08373d60d388a21c7f6006
+  metadata.gz: a3f7e14c292b09293bdc22b053a67eceb128191e77795842b5e135f091def89375bd0e579f20e1b90fa10cbc88fe1ccb680a16597802bcd66d9eb4c68d8a349e
+  data.tar.gz: 29fd7b5b3964125306b7bf9f70bcaa77fcd30c3dea29ddc43c316cf00a1ec8993cff12d0c24ff07d693377481f3d3dc492d44067db7a3460d912f2d03b4b6ae5

data/.rubocop.yml

@@ -3,3 +3,6 @@ Metrics/LineLength:
 
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
+
+Layout/TrailingWhitespace:
+  Enabled: false

data/.travis.yml

@@ -11,10 +11,11 @@ env:
   - DBTYPE=mysql
 
 rvm:
+  - 2.6.0
   - 2.5.3
   - 2.4.5
   - 2.3.8
-  - ruby-head
+#  - ruby-head
 #  - jruby-9.0.5.0
 
 gemfile:
@@ -32,7 +33,11 @@ matrix:
   exclude:
     - rvm: ruby-head
       gemfile: gemfiles/rails42.gemfile
+    - rvm: 2.6.0
+      gemfile: gemfiles/rails42.gemfile
 
+    - rmv: 2.6.0
+      env: DBTYPE=mysql
     - rvm: 2.5.3
       env: DBTYPE=mysql
     - rvm: 2.4.5
@@ -95,7 +100,7 @@ install:
   - popd
 
 before_script:
-  - bundle install --jobs=3 --retry=3 --without development
+  - bundle update --jobs=3 --retry=3
   - bundle exec rake fetch_ext_deps
   - bundle exec rake clean
   - bundle exec rake compile

data/lib/appoptics_apm.rb

@@ -1,10 +1,6 @@
 # Copyright (c) 2016 SolarWinds, LLC.
 # All rights reserved.
 
-# Backward compatibility for supported environment variables
-ENV['APPOPTICS_GEM_VERBOSE'] = ENV['OBOE_GEM_VERBOSE'] if ENV.key?('OBOE_GEM_VERBOSE')
-ENV['APPOPTICS_GEM_TEST']    = ENV['OBOE_GEM_TEST']    if ENV.key?('OBOE_GEM_TEST')
-
 begin
   require 'openssl'
   require 'appoptics_apm/version'

data/lib/appoptics_apm/frameworks/grape.rb

@@ -26,13 +26,13 @@ module AppOpticsAPM
         # Report Controller/Action and Transaction as best possible
         report_kvs = {}
 
-        report_kvs[:Controller] = options[:for].name
-        if route && route.pattern
-          report_kvs[:Action] = route.options ? "#{route.options[:method]}#{route.pattern.origin}" : route.pattern.origin
-          # report_kvs[:Action] = route.pattern.origin
-        else
-          report_kvs[:Action] = args.empty? ? env['PATH_INFO'] : args[0]['PATH_INFO']
-        end
+        report_kvs[:Controller] = options[:for].to_s
+        report_kvs[:Action] =
+          if route&.pattern
+            route.options ? "#{route.options[:method]}#{route.pattern.origin}" : route.pattern.origin
+          else
+            args.empty? ? env['PATH_INFO'] : args[0]['PATH_INFO']
+          end
         report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:grape][:collect_backtraces]
 
         env['appoptics_apm.controller'] = report_kvs[:Controller]

data/lib/appoptics_apm/inst/sidekiq-worker.rb

@@ -39,7 +39,7 @@ module AppOpticsAPM
       # are being lost.  So we re-set the tracing mode to assure
       # we sample as desired.  Setting the tracing mode will re-update
       # the liboboe settings.
-      AppOpticsAPM::Config[:tracing_mode] = AppOpticsAPM::Config[:tracing_mode]
+      AppOpticsAPM.set_tracing_mode(AppOpticsAPM::Config[:tracing_mode].to_sym)
 
       # Continue the trace from the enqueue side?
       if args[1].is_a?(Hash) && AppOpticsAPM::XTrace.valid?(args[1]['SourceTrace'])

data/lib/appoptics_apm/version.rb

@@ -8,7 +8,7 @@ module AppOpticsAPM
   module Version
     MAJOR = 4
     MINOR = 5
-    PATCH = 0
+    PATCH = 1
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/oboe_metal.rb

@@ -31,16 +31,7 @@ module AppOpticsAPM
           when 'udp'
             ENV['APPOPTICS_REPORTER_UDP'] = "#{AppOpticsAPM::Config[:reporter_host]}:#{AppOpticsAPM::Config[:reporter_port]}"
           else # default is ssl, service_key is mandatory
-            service_key = ENV['APPOPTICS_SERVICE_KEY'].to_s || AppOpticsAPM::Config[:service_key].to_s
-            if service_key == ''
-              AppOpticsAPM.logger.warn '[appoptics_apm/warn] APPOPTICS_SERVICE_KEY not set. Cannot submit data.'
-              AppOpticsAPM.loaded = false
-              return
-            elsif service_key !~ /^[0-9a-fA-F]{64}:[-.:_?\\\/\w ]{1,255}$/
-              AppOpticsAPM.logger.warn '[appoptics_apm/warn] APPOPTICS_SERVICE_KEY problem. No service name or api token in wrong format. Cannot submit data.'
-              AppOpticsAPM.loaded = false
-              return
-            end
+            return unless valid_service_key?
             # Oboe will override these settings if there are env settings for them
             options << AppOpticsAPM::Config[:service_key].to_s
             options << AppOpticsAPM::Config[:hostname_alias].to_s
@@ -61,6 +52,19 @@ module AppOpticsAPM
       end
       alias :restart :start
 
+      def valid_service_key?
+        service_key = (ENV['APPOPTICS_SERVICE_KEY'] || AppOpticsAPM::Config[:service_key]).to_s
+        if service_key == ''
+          AppOpticsAPM.logger.warn '[appoptics_apm/warn] APPOPTICS_SERVICE_KEY not set. Cannot submit data.'
+          AppOpticsAPM.loaded = false
+          return false
+        elsif service_key !~ /^[0-9a-fA-F]{64}:[-.:_?\\\/\w ]{1,255}$/
+          AppOpticsAPM.logger.warn '[appoptics_apm/warn] APPOPTICS_SERVICE_KEY problem. No service name or api token in wrong format. Cannot submit data.'
+          AppOpticsAPM.loaded = false
+          return false
+        end
+        true
+      end
       ##
       # sendReport
       #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appoptics_apm
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.5.1
 platform: ruby
 authors:
 - Maia Engeli
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json