appoptics_apm 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e1848b37d0d06b89195907e8f817c24163e9830
-  data.tar.gz: a0fec3cbb8b5d49bcec6d9cfb69a819e3831793e
+  metadata.gz: 1177c37c4ef9faf18d4ac7cc9d3ae521512b7853
+  data.tar.gz: 90e612e51a74f8767452087b40b6d5500a06ff8f
 SHA512:
-  metadata.gz: b74b13c3a988bff0f25220f63df0295b761c36e8f4c9e816de5197faf08cf49c0c6a4170abc9f0c99841e40936033831bac8cfc4f919af76fc56671c7a9bf29e
-  data.tar.gz: 96c8b84c66f18adc6b8f4ee13fc7488f012eec782e7bc91ea1513545a8cb7062a2534436d493db92c5e7703dfed1aaacc9e3b69adc3410d5d354cecaed6b4205
+  metadata.gz: 07b21a9dccda5a46e8d30059d20f0d5361b8936cf3da8c2add1cf1d9ce1dcb7b2aa815f1c71cc50fb01f4191f5529fbef4b532f27023ddda92a395b6d19115f0
+  data.tar.gz: fcb45549e655a4cc8e28e6f939a765ba9393eee8591095cc784cd545e6b8ccf314aa38d36ca1510369937212f4aee2aac3a349b3452f8b245394aa81fe256dfe

data/.travis.yml

@@ -12,7 +12,7 @@ env:
 
 rvm:
   - 2.5.1
-  - 2.4.3
+  - 2.4.4
   - 2.3.6
 #  - jruby-9.0.5.0
 
@@ -24,8 +24,8 @@ gemfile:
   - gemfiles/frameworks.gemfile
 #  - gemfiles/rails32.gemfile # We currently are not supporting Rails 3.2
   - gemfiles/rails42.gemfile
-#  - gemfiles/rails50.gemfile
   - gemfiles/rails51.gemfile
+#  - gemfiles/rails52.gemfile # postgres test needs fixing first
   - gemfiles/delayed_job.gemfile
 
 matrix:
@@ -34,6 +34,8 @@ matrix:
       env: DBTYPE=mysql
     - rvm: 2.4.3
       env: DBTYPE=mysql
+    - rvm: 2.4.4
+      env: DBTYPE=mysql
 
     - gemfile: gemfiles/noop.gemfile
       env: DBTYPE=mysql
@@ -47,6 +49,8 @@ matrix:
       env: DBTYPE=mysql
     - gemfile: gemfiles/rails51.gemfile
       env: DBTYPE=mysql
+    - gemfile: gemfiles/rails52.gemfile
+      env: DBTYPE=mysql
     - gemfile: gemfiles/delayed_job.gemfile
       env: DBTYPE=mysql
 

data/Dockerfile_test

@@ -38,6 +38,7 @@ RUN  git clone https://github.com/rbenv/rbenv.git ~/.rbenv \
 RUN . ~/.profile \
     && rbenv install 2.3.6 \
     && rbenv install 2.4.3 \
+    && rbenv install 2.4.4 \
     && rbenv install 2.5.1
 #    && rbenv install jruby-9.1.16.0
 

data/lib/appoptics_apm/config.rb

@@ -92,7 +92,7 @@ module AppOpticsAPM
 
       AppOpticsAPM.logger.warn "\n# Logging of outgoing HTTP query args"
       @@instrumentation.each do |config|
-        AppOpticsAPM.logger.warn "AppOpticsAPM::Config[:#{config}][:log_args] = #{@@config[config][:log_args]}"
+        AppOpticsAPM.logger.warn "AppOpticsAPM::Config[:#{config}][:log_args] = #{@@config[config][:log_args] || false}"
       end
 
       AppOpticsAPM.logger.warn "\n# Bunny Controller and Action"

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

@@ -15,10 +15,10 @@ module AppOpticsAPM
         report_kvs[:Flavor]    = :sidekiq
         report_kvs[:Queue]     = queue
         report_kvs[:Retry]     = msg['retry']
-        report_kvs[:JobName]   = worker_class
+        report_kvs[:JobName]   = msg['wrapped'] || worker_class
         report_kvs[:MsgID]     = msg['jid']
         report_kvs[:Args]      = msg['args'].to_s[0..1024] if AppOpticsAPM::Config[:sidekiqclient][:log_args]
-        report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace         if AppOpticsAPM::Config[:sidekiqclient][:collect_backtraces]
+        report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:sidekiqclient][:collect_backtraces]
       rescue => e
         AppOpticsAPM.logger.warn "[appoptics_apm/sidekiq] Non-fatal error capturing KVs: #{e.message}"
       end
@@ -44,6 +44,8 @@ module AppOpticsAPM
 end
 
 if defined?(::Sidekiq) && AppOpticsAPM::Config[:sidekiqclient][:enabled]
+  ::AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting sidekiq client' if AppOpticsAPM::Config[:verbose]
+
   ::Sidekiq.configure_client do |config|
     config.client_middleware do |chain|
       ::AppOpticsAPM.logger.info '[appoptics_apm/loading] Adding Sidekiq client middleware' if AppOpticsAPM::Config[:verbose]

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

@@ -15,16 +15,16 @@ module AppOpticsAPM
         report_kvs[:Flavor]     = :sidekiq
         report_kvs[:Queue]      = queue
         report_kvs[:Retry]      = msg['retry']
-        report_kvs[:JobName]    = worker.class.to_s
+        report_kvs[:JobName]    = msg['wrapped'] || msg['class']
         report_kvs[:MsgID]      = msg['jid']
         report_kvs[:Args]       = msg['args'].to_s[0..1024] if AppOpticsAPM::Config[:sidekiqworker][:log_args]
-        report_kvs[:Backtrace]  = AppOpticsAPM::API.backtrace         if AppOpticsAPM::Config[:sidekiqworker][:collect_backtraces]
+        report_kvs[:Backtrace]  = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:sidekiqworker][:collect_backtraces]
 
         # Webserver Spec KVs
         report_kvs[:'HTTP-Host'] = Socket.gethostname
         report_kvs[:Controller] = "Sidekiq_#{queue}"
-        report_kvs[:Action] = msg['class']
-        report_kvs[:URL] = "/sidekiq/#{queue}/#{msg['class']}"
+        report_kvs[:Action] = msg['wrapped'] || msg['class']
+        report_kvs[:URL] = "/sidekiq/#{queue}/#{msg['wrapped'] || msg['class']}"
       rescue => e
         AppOpticsAPM.logger.warn "[appoptics_apm/sidekiq] Non-fatal error capturing KVs: #{e.message}"
       end
@@ -56,7 +56,7 @@ module AppOpticsAPM
 end
 
 if defined?(::Sidekiq) && AppOpticsAPM::Config[:sidekiqworker][:enabled]
-  ::AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting sidekiq' if AppOpticsAPM::Config[:verbose]
+  ::AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting sidekiq worker' if AppOpticsAPM::Config[:verbose]
 
   ::Sidekiq.configure_server do |config|
     config.server_middleware do |chain|

data/lib/appoptics_apm/version.rb

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

data/run_tests_docker.rb

@@ -27,6 +27,6 @@ travis['matrix']['exclude'].each do |h|
 end
 
 matrix.each do |args|
-  `docker-compose run --rm --service-ports ruby_appoptics_apm /code/ruby-appoptics_apm/ruby_setup.sh #{args['rvm']} #{args['gemfile']} #{args['env']}`
   puts "docker-compose run --rm --service-ports ruby_appoptics_apm /code/ruby-appoptics_apm/ruby_setup.sh #{args['rvm']} #{args['gemfile']} #{args['env']}"
+  `docker-compose run --rm --service-ports ruby_appoptics_apm /code/ruby-appoptics_apm/ruby_setup.sh #{args['rvm']} #{args['gemfile']} #{args['env']}`
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appoptics_apm
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - Maia Engeli
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2018-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json