appoptics_apm 4.8.2 → 4.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efeb5fdc0a0dec8438fa1ed7af73324858865e20c2705c555effd282232971b1
-  data.tar.gz: 8d3bbe8905e430d61de61f182793fc1c73e45d8bf0cfdeaa269de136e516edba
+  metadata.gz: 5c27f1f8e2eb4cd26fb79201841a19fd805a4121001b9d384a81854834990778
+  data.tar.gz: bf80c6401e81c17c4566ed597a3e94ad653f93f719583a0f47e2f5d3ca15af5c
 SHA512:
-  metadata.gz: 3904ed8d0f79a0786a9fef1e4f9feb555843035fba8165ca225d72682a1576b37a220da1edf7e0e11be34c7553b47cf46908d3e38f81723c90286c27f573e384
-  data.tar.gz: 9cd0d8b27c28c9c020bcc6990b5e799dbacfebed34707324922416eca0240df5519f76966271a7ae4183624d2c2a43c5a0e93367a5e91e36003e9f61b56cec73
+  metadata.gz: 0c198e1f9288bb934e97da00f10e69dd1a599d106b6e5e22940eb225c553d1e205cde734d71896ef3b63547fd03094f8846b627fd01ce73ff688818b3cb7465c
+  data.tar.gz: d326e1d4ad5689f97164709a68e5e4d7083b5879c4de3d5f966f1c7729a598f58c660264b31096724ea4c9038246f3579177338857f7d409f7bb8467acfdb0cf

data/.travis.yml

@@ -11,8 +11,8 @@ env:
   - DBTYPE=mysql
 
 rvm:
-  - 2.6.2
-  - 2.5.3
+  - 2.6.3
+  - 2.5.5
   - 2.4.5
   - ruby-head
 #  - jruby-9.0.5.0
@@ -32,13 +32,13 @@ matrix:
   exclude:
     - rvm: ruby-head
       gemfile: gemfiles/rails42.gemfile
-    - rvm: 2.6.2
+    - rvm: 2.6.3
       gemfile: gemfiles/rails42.gemfile
 
 
-    - rmv: 2.6.2
+    - rmv: 2.6.3
       env: DBTYPE=mysql
-    - rvm: 2.5.3
+    - rvm: 2.5.5
       env: DBTYPE=mysql
     - rvm: 2.4.5
       env: DBTYPE=mysql
@@ -85,12 +85,15 @@ matrix:
 # Attempt Travis/Cassandra fix re: https://github.com/travis-ci/travis-ci/issues/1484
 # Updated Cassandra: https://github.com/travis-ci/travis-ci/issues/1650
 
-before_install:
-  - sudo service cassandra stop
-  - sudo sh -c "echo 'JVM_OPTS=\"\${JVM_OPTS} -Djava.net.preferIPv4Stack=false\"' >> /etc/cassandra/cassandra-env.sh"
-  - echo "127.0.0.1 localhost"  | sudo tee /etc/hosts
-  - echo "127.0.0.1 " `hostname` | sudo tee -a /etc/hosts
-  - sudo service cassandra start
+# the following is not working anymore on travis
+# commenting it out as per AO-13532 as we currently don't have instrumentation
+# for cassandra
+#before_install:
+#  - sudo service cassandra stop
+#  - sudo sh -c "echo 'JVM_OPTS=\"\${JVM_OPTS} -Djava.net.preferIPv4Stack=false\"' >> /etc/cassandra/cassandra-env.sh"
+#  - echo "127.0.0.1 localhost"  | sudo tee /etc/hosts
+#  - echo "127.0.0.1 " `hostname` | sudo tee -a /etc/hosts
+#  - sudo service cassandra start
 
 install:
   - curl -LO http://kent.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz
@@ -100,6 +103,13 @@ install:
   - popd
 
 before_script:
+  - export APPOPTICS_GEM_TEST=true
+  - export APPOPTICS_REPORTER=file
+  - export APPOPTICS_COLLECTOR=/tmp/appoptics_traces.bson
+  - export APPOPTICS_REPORTER_FILE_SINGLE=false
+  - export APPOPTICS_TOKEN_BUCKET_CAPACITY=1000
+  - export APPOPTICS_TOKEN_BUCKET_RATE=1000
+  - export OBOE_VERSION=5.1.1
   - bundle update --jobs=3 --retry=3
   - bundle exec rake fetch_ext_deps
   - bundle exec rake clean
@@ -108,14 +118,19 @@ before_script:
   - mysql -e 'create database travis_ci_test;'
   - redis-server --requirepass secret_pass &
   - sleep 10
-  - export APPOPTICS_TOKEN_BUCKET_CAPACITY=1000
-  - export APPOPTICS_TOKEN_BUCKET_RATE=1000
 
 script: "N=1 bundle exec rake test"
 
 services:
   - mongodb
   - memcached
-  - cassandra
-#  - redis
+  - mysql
+#  - cassandra
+  - postgresql
+#  - redis-server
   - rabbitmq
+
+addons:
+  apt:
+    packages:
+      - rabbitmq-server

data/Gemfile

@@ -18,7 +18,6 @@ group :development, :test do
   gem 'byebug'
   gem 'get_process_mem'
   gem 'memory_profiler'
-  gem 'stackprof'
 end
 
 if defined?(JRUBY_VERSION)

data/README.md

@@ -390,4 +390,4 @@ See the README in the test directory.
 
 Copyright (c) 2018 SolarWinds, LLC
 
-Released under the [Librato Open License](https://docs.appoptics.com/kb/apm_tracing/librato-open-license/)
+Released under the [Librato Open License](https://docs.appoptics.com/kb/apm_tracing/librato-open-license/)

data/Rakefile

@@ -31,6 +31,9 @@ Rake::TestTask.new do |t|
     if Rails::VERSION::MAJOR == 5
       t.test_files = FileList["test/frameworks/rails#{Rails::VERSION::MAJOR}x_test.rb"] +
                      FileList["test/frameworks/rails#{Rails::VERSION::MAJOR}x_api_test.rb"]
+    elsif Rails::VERSION::MAJOR == 6
+      t.test_files = FileList["test/frameworks/rails5x_test.rb"] +
+                     FileList["test/frameworks/rails5x_api_test.rb"]
     else
       t.test_files = FileList["test/frameworks/rails#{Rails::VERSION::MAJOR}x_test.rb"]
     end
@@ -121,7 +124,7 @@ task :fetch_ext_deps do
 
   FileUtils.cd(ext_src_dir) do
     system('swig -c++ -ruby -module oboe_metal oboe.i')
-    # FileUtils.rm('oboe.i')
+    FileUtils.rm('oboe.i')
   end
 end
 

data/build_gem_upload_to_packagecloud.sh

@@ -8,13 +8,8 @@ else
   ./build_gem.sh
 fi
 
-# save current rbenv setting and switch to 2.4.1 for the package_cloud commands
-current_ruby=`rbenv global`
-rbenv global 2.4.1
+gem install package_cloud --no-document
 
 # prerequisite: package_cloud token needs to be in ~/.packagecloud
 gem=`ls -dt1 appoptics_apm-[^pre]*.gem | head -1`
 package_cloud push solarwinds/appoptics-apm-ruby $gem
-
-# restore ruby version
-rbenv global $current_ruby

data/examples/SDK/01_basic_tracing.rb

@@ -63,8 +63,6 @@ def do_traced_work
   end
 end
 
-# Example with logging
 AppOpticsAPM::SDK.start_trace('outer_span_2') do
-  AppopticsAPM.logger.warn "Hello World!"
   do_traced_work
 end

data/ext/oboe_metal/README.md

@@ -0,0 +1,69 @@
+# Debug the c-code with gdb
+
+inspired by: https://dev.to/wataash/how-to-create-and-debug-ruby-gem-with-c-native-extension-3l8b
+
+
+## install ruby with sources
+
+rbenv is your friend ;) 😄 -k means keep sources
+
+```
+rbenv install -k 2.6.3
+rbenv shell 2.6.3
+
+# check that ruby is debuggable
+type ruby           # => ruby is /home/wsh/.rbenv/shims/ruby
+rbenv which ruby    # => /home/wsh/.rbenv/versions/2.6.3/bin/ruby
+```
+
+
+##
+## add debug info when compiling appoptics_apm
+add this line to extconf.rb to turn off optimization
+
+```
+CONFIG["optflags"] = "-O0"
+```
+
+
+##
+## start ruby app with gdb
+
+This will run ruby and load the app with a breakpoint in the Reporter::startThread
+c-function.
+
+`bundle exec gdb -q -ex 'set breakpoint pending on' -ex 'b Reporter::startThread' -ex run --args ruby -e 'require "./app"'`
+
+If there is a bug in the ruby code or a ruby byebug binding that halts the 
+script, the debugger will hang without showing any output. 
+So, make sure `bundle exec ruby app.rb` runs.
+
+use the gdb navigation commands to step through the code. If it says:
+
+```
+(gdb) n
+Single stepping until exit from function _ZN8Reporter11startThreadEv@plt,
+which has no line number information.
+```
+
+type `c` and it may end up stopping in the right location.
+
+##
+## make ruby .gdbinit macros available
+
+These macros are pretty elaborate. They are checked in the ruby github 
+repo: https://github.com/ruby/ruby/blob/master/.gdbinit
+The code is nicely formatted and colorized in github and easiest to read there.
+
+installation in the user's home dir:
+```
+wget https://github.com/ruby/ruby/blob/master/.gdbinit
+```
+##
+## examples
+
+Some inspiring examples here:
+
+https://jvns.ca/blog/2016/06/12/a-weird-system-call-process-vm-readv/
+
+https://medium.com/@zanker/finding-a-ruby-bug-with-gdb-56d6b321bc86

data/ext/oboe_metal/src/VERSION

@@ -1 +1 @@
-5.0.2
+5.1.1

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
+  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_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/version.rb

@@ -8,7 +8,7 @@ module AppOpticsAPM
   module Version
     MAJOR = 4 # breaking,
     MINOR = 8 # feature,
-    PATCH = 2 # fix => BFF
+    PATCH = 3 # fix => BFF
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appoptics_apm
 version: !ruby/object:Gem::Version
-  version: 4.8.2
+  version: 4.8.3
 platform: ruby
 authors:
 - Maia Engeli
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -30,20 +30,20 @@ dependencies:
   name: no_proxy_fix
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
@@ -132,6 +132,7 @@ files:
 - build_gem_upload_to_packagecloud.sh
 - examples/SDK/01_basic_tracing.rb
 - examples/carrying_context.rb
+- ext/oboe_metal/README.md
 - ext/oboe_metal/extconf.rb
 - ext/oboe_metal/lib/.keep
 - ext/oboe_metal/noop/noop.c
@@ -254,8 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: AppOptics APM performance instrumentation gem for Ruby