appoptics_apm 4.0.4 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6eca844d1e22be51b9a76ac3c00c512974a7fde
-  data.tar.gz: 925cc30ac503e7e3ba8f99494912ee7f5752a9a6
+  metadata.gz: ff856df7c5459eb39bfa7b9d5a248c44f74a6d3e
+  data.tar.gz: e41c9199c097afcae143d271016566f2fb2077f2
 SHA512:
-  metadata.gz: d7684bf87d2ba3359c0b12a94859e6a65a6a7040ee0708aa27391cb86d21a3d28aba9714bfe0ecd296c2c016b0a64250897872ab535706cf58431bc878671a15
-  data.tar.gz: b43b9dd8e0ddfdb2ab7bd78fc163010825578cfe1a0e472c25e628de5c2f1c504878a67606f5968dd738f7694def702dcec7e796b4277e3a919e2660897c7b69
+  metadata.gz: ce3d4658d0bb2f448561fa6aa46f38a506eeabb6eb07681c726b2de3b1b63c5976be1b72851c598c7dcf975a53a85bc9a600267cf569fb1a834ee7ffac0f401e
+  data.tar.gz: 374174feff92a2d0accbd4ce04548f580814d5d3246d390c67d694703474f91da860517cab0c1ba777c2ff4b499c00fcb9556fb0bbee4d2d02a7d50d32546ce6

data/.travis.yml

@@ -6,8 +6,9 @@ cache:
   - vendor/bundle
 
 rvm:
-  - 2.4.1
-  - 2.3.1
+  - 2.5.0
+  - 2.4.3
+  - 2.3.6
   - 1.9.3
 #  - jruby-9.0.5.0
 
@@ -15,6 +16,7 @@ gemfile:
   - gemfiles/noop.gemfile
   - gemfiles/libraries.gemfile
   - gemfiles/instrumentation_mocked.gemfile
+  - gemfiles/instrumentation_mocked_oldgems.gemfile
   - gemfiles/frameworks.gemfile
   - gemfiles/rails32.gemfile
   - gemfiles/rails42.gemfile
@@ -25,7 +27,9 @@ gemfile:
 matrix:
   exclude:
     # Rails 3.2 is not compatible with Ruby >= '2.4'
-    - rvm: 2.4.1
+    - rvm: 2.5.0
+      gemfile: gemfiles/rails32.gemfile
+    - rvm: 2.4.3
       gemfile: gemfiles/rails32.gemfile
 
     - rvm: 1.9.3
@@ -34,9 +38,11 @@ matrix:
     - rvm: 1.9.3
       gemfile: gemfiles/rails51.gemfile
 
-     # WebMock requires Ruby 2.0 or higher
+    # WebMock requires Ruby 2.0 or higher
     - rvm: 1.9.3
       gemfile: gemfiles/instrumentation_mocked.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/instrumentation_mocked_oldgems.gemfile
 
 #    - rvm: jruby-9.0.5.0
 #      gemfile: gemfiles/delayed_job.gemfile
@@ -45,12 +51,11 @@ matrix:
 #    - rvm: jruby-9.0.5.0
 #      gemfile: gemfiles/rails50.gemfile
 
+# 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
 # Updated Cassandra: https://github.com/travis-ci/travis-ci/issues/1650
+
 before_install:
-  - gem update --system '2.6.1'
-  - gem update bundler
-  - gem --version
   - 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

data/Rakefile

@@ -63,25 +63,25 @@ end
 desc "Fetch extension dependency files"
 task :fetch_ext_deps do
   swig_version = %x{swig -version} rescue ''
-  if swig_version.scan(/swig version 3.0.8/i).empty?
-    raise "!! Did not find required swig version 3.0.8, found #{swig_version.inspect}"
+  swig_version = swig_version.scan(/swig version 3.0.\d*/i)
+  if swig_version.empty?
+    $stderr.puts '== ERROR ================================================================='
+    $stderr.puts "Could not find required swig version 3.0.*, found #{swig_version.inspect}"
+    $stderr.puts 'Please install swig "~ 3.0.8" and try again.'
+    $stderr.puts '=========================================================================='
+    raise
   end
+
+  # The c-lib version is different from the gem version
   oboe_version = ENV['OBOE_VERSION'] || 'latest'
-  oboe_arch = ENV['APPOPTICS_OS_ARCH'] || 'x86_64'
   oboe_src_dir = "https://s3-us-west-2.amazonaws.com/rc-files-t2/c-lib/#{oboe_version}"
-  ext_lib_dir = File.expand_path('ext/oboe_metal/lib')
   ext_src_dir = File.expand_path('ext/oboe_metal/src')
 
-  %w(oboe.i oboe.h oboe.hpp oboe_debug.h liboboe-1.0.so.0.0.0 VERSION).each do |filename|
-    # TODO download general linux and alpine linux library
-    if filename =~ /^liboboe-.+so.+/
-      remote_file = File.join(oboe_src_dir,
-                              filename.sub('.so',"-#{oboe_arch}.so"))
-      local_file = File.join(ext_lib_dir, filename)
-    else
-      remote_file = File.join(oboe_src_dir, filename)
-      local_file = File.join(ext_src_dir, filename)
-    end
+  # VERSION is used by extconf.rb to download the correct liboboe when installing the gem
+  %w(oboe.i oboe.h oboe.hpp oboe_debug.h VERSION).each do |filename|
+    remote_file = File.join(oboe_src_dir, filename)
+    local_file = File.join(ext_src_dir, filename)
+
     puts "fetching #{remote_file} to #{local_file}"
     open(remote_file, 'rb') do |rf|
       content = rf.read
@@ -90,7 +90,7 @@ task :fetch_ext_deps do
   end
   FileUtils.cd(ext_src_dir) do
     system('swig -c++ -ruby -module oboe_metal oboe.i')
-    # File.write(f = "oboe_wrap.cxx", "#include <math.h>\n#define isinf\n#define isnan\n" + File.read(f))
+    FileUtils.rm('oboe.i')
   end
 end
 

data/appoptics_apm.gemspec

@@ -16,16 +16,16 @@ Gem::Specification.new do |s|
 
   s.extra_rdoc_files = ["LICENSE"]
   s.files = `git ls-files`.split("\n").reject { |f| f.match(%r{^(test|gemfiles)/}) }
-  s.files += ['ext/oboe_metal/lib/liboboe-1.0.so.0.0.0',
-              'ext/oboe_metal/src/oboe.h',
+  s.files += ['ext/oboe_metal/src/oboe.h',
               'ext/oboe_metal/src/oboe.hpp',
               'ext/oboe_metal/src/oboe_debug.h',
               'ext/oboe_metal/src/oboe_wrap.cxx',
               'ext/oboe_metal/src/VERSION']
-  # s.test_files  = Dir.glob("{test}/**/*.rb")
 
   # TODO this is commented out util we can actually provide gems for different platforms
+  # it will create a gem that goes into noop on Darwin and other unsupported platforms
   # s.platform   = defined?(JRUBY_VERSION) ? 'java' : Gem::Platform::CURRENT
+
   s.extensions = ['ext/oboe_metal/extconf.rb'] unless defined?(JRUBY_VERSION)
 
   s.add_runtime_dependency('json', '>= 0')
@@ -47,9 +47,5 @@ Gem::Specification.new do |s|
     s.add_development_dependency('pry', '>= 0.10.0')
   end
 
-  s.add_development_dependency('benchmark-ips')
-  s.add_development_dependency('benchmark-memory')
-  s.add_development_dependency('ruby-prof')
-
   s.required_ruby_version = '>= 1.9.3'
 end

data/ext/oboe_metal/extconf.rb

@@ -3,6 +3,8 @@
 
 require 'mkmf'
 require 'rbconfig'
+require 'open-uri'
+require 'digest'
 
 ext_dir = File.expand_path(File.dirname(__FILE__))
 
@@ -11,48 +13,95 @@ jruby = defined?(JRUBY_VERSION) ? true : false
 
 # Set the mkmf lib paths so we have no issues linking to
 # the AppOpticsAPM libs.
-ao_lib = File.join(ext_dir, 'lib')
+ao_lib_dir = File.join(ext_dir, 'lib')
 ao_include = File.join(ext_dir, 'src')
 
-
-# TODO seleect the correct oboe lib file  (alpine vs other linux)
-
-
-# Create symlinks for the AppOpticsAPM library
-target = File.join(ao_lib, 'liboboe-1.0.so.0.0.0')
-File.symlink(target, File.join(ao_lib, 'liboboe.so'))
-File.symlink(target, File.join(ao_lib, 'liboboe-1.0.so.0'))
-
-dir_config('oboe', ao_include, ao_lib)
-
-if jruby || ENV.key?('APPOPTICS_URL')
-  # Build the noop extension under JRuby and Heroku.
-  # The oboe-heroku gem builds it's own c extension which links to
-  # libs specific to a Heroku dyno
-  # FIXME: For JRuby we need to remove the c extension entirely
-  create_makefile('oboe_noop', 'noop')
-
-elsif have_library('oboe', 'oboe_config_get_revision', 'oboe.h')
-
-  $libs = append_library($libs, 'oboe')
-  $libs = append_library($libs, 'stdc++')
-
-  $CFLAGS << " #{ENV['CFLAGS']}"
-  $CPPFLAGS << " #{ENV['CPPFLAGS']}"
-  $LIBS << " #{ENV['LIBS']}"
-  $LDFLAGS << " #{ENV['LDFLAGS']} -Wl,-rpath=#{ao_lib}"
-
-  if RUBY_VERSION < '1.9'
-    cpp_command('g++')
-    $CPPFLAGS << '-I./src/'
+# Download the appropriate liboboe from files.appoptics.com
+ao_path = File.join('https://files.appoptics.com/c-lib', File.read(File.join(ao_include, 'VERSION')).chomp)
+ao_arch = `ldd --version 2>&1` =~ /musl/ ? 'alpine-x86_64' : 'x86_64'
+ao_clib = "liboboe-1.0-#{ao_arch}.so.0.0.0"
+ao_item = File.join(ao_path, ao_clib)
+ao_checksum_item = "#{ao_item}.sha256"
+target = File.join(ao_lib_dir, ao_clib)
+
+retries = 3
+while retries > 0
+  begin
+    # download
+    download = open(ao_item, 'rb')
+    IO.copy_stream(download, target)
+
+    checksum = open(ao_checksum_item, 'r').read.chomp
+    target_checksum = Digest::SHA256.file(target).hexdigest
+
+    # verify_checksum
+    if target_checksum != checksum
+      $stderr.puts '== ERROR ================================================================='
+      $stderr.puts 'Checksum Verification failed for the c-extension of the appoptics_apm gem.'
+      $stderr.puts 'appoptics_apm will not instrument the code. No tracing will occur.'
+      $stderr.puts 'Contact support@appoptics.com if the problem persists.'
+      $stderr.puts '=========================================================================='
+      create_makefile('oboe_noop', 'noop')
+      retries = 0
+    else
+      success = true
+      retries = 0
+    end
+  rescue => e
+    File.write(target, '')
+    retries -= 1
+    if retries == 0
+      $stderr.puts '== ERROR =========================================================='
+      $stderr.puts 'Download of the c-extension for the appoptics_apm gem failed.'
+      $stderr.puts 'appoptics_apm will not instrument the code. No tracing will occur.'
+      $stderr.puts 'Contact support@appoptics.com if the problem persists.'
+      $stderr.puts '==================================================================='
+      create_makefile('oboe_noop', 'noop')
+    end
+    sleep 0.5
   end
-  create_makefile('oboe_metal', 'src')
+end
 
-else
-  if have_library('oboe')
-    $stderr.puts 'Error: The oboe gem requires an updated liboboe.  Please update your liboboe packages.'
+if success
+  # Create symlinks for the AppOpticsAPM library
+  File.symlink(target, File.join(ao_lib_dir, 'liboboe.so'))
+  File.symlink(target, File.join(ao_lib_dir, 'liboboe-1.0.so.0'))
+
+  dir_config('oboe', ao_include, ao_lib_dir)
+
+  if jruby || ENV.key?('APPOPTICS_URL')
+    # Build the noop extension under JRuby and Heroku.
+    # The oboe-heroku gem builds it's own c extension which links to
+    # libs specific to a Heroku dyno
+    # FIXME: For JRuby we need to remove the c extension entirely
+    create_makefile('oboe_noop', 'noop')
+
+  elsif have_library('oboe', 'oboe_config_get_revision', 'oboe.h')
+
+    $libs = append_library($libs, 'oboe')
+    $libs = append_library($libs, 'stdc++')
+
+    $CFLAGS << " #{ENV['CFLAGS']}"
+    $CPPFLAGS << " #{ENV['CPPFLAGS']}"
+    $LIBS << " #{ENV['LIBS']}"
+    $LDFLAGS << " #{ENV['LDFLAGS']} -Wl,-rpath=#{ao_lib_dir}"
+
+    if RUBY_VERSION < '1.9'
+      cpp_command('g++')
+      $CPPFLAGS << '-I./src/'
+    end
+    create_makefile('oboe_metal', 'src')
+
+  else
+    $stderr.puts   '== ERROR ========================================================='
+    if have_library('oboe')
+      $stderr.puts "The c-library either needs to be updated or doesn't match the OS."
+      $stderr.puts 'No tracing will occur.'
+    else
+      $stderr.puts 'Could not find a matching c-library. No tracing will occur.'
+    end
+    $stderr.puts   'Contact support@appoptics.com if the problem persists.'
+    $stderr.puts   '=================================================================='
+    create_makefile('oboe_noop', 'noop')
   end
-
-  $stderr.puts 'Error: Could not find the base liboboe libraries.  No tracing will occur.'
-  create_makefile('oboe_noop', 'noop')
 end

data/lib/appoptics_apm/inst/excon.rb

@@ -69,7 +69,7 @@ module AppOpticsAPM
 
       def request_with_appoptics(params={}, &block)
         # Avoid cross host tracing for blacklisted domains
-        blacklisted = AppOpticsAPM::API.blacklisted?(@data[:hostname])
+        blacklisted = AppOpticsAPM::API.blacklisted?(@data[:hostname] || @data[:host])
 
         # If we're not tracing, just do a fast return.
         # If making HTTP pipeline requests (ordered batched)

data/lib/appoptics_apm/inst/faraday.rb

@@ -9,9 +9,10 @@ module AppOpticsAPM
       end
 
       def run_request_with_appoptics(method, url, body, headers, &block)
+        blacklisted = url_blacklisted?
         unless AppOpticsAPM.tracing?
           xtrace = AppOpticsAPM::Context.toString
-          @headers['X-Trace'] = xtrace if AppOpticsAPM::XTrace.valid?(xtrace) && !AppOpticsAPM::API.blacklisted?(@url_prefix.to_s)
+          @headers['X-Trace'] = xtrace if AppOpticsAPM::XTrace.valid?(xtrace) && !blacklisted
           return run_request_without_appoptics(method, url, body, headers, &block)
         end
 
@@ -19,7 +20,7 @@ module AppOpticsAPM
           AppOpticsAPM::API.log_entry(:faraday)
 
           xtrace = AppOpticsAPM::Context.toString
-          @headers['X-Trace'] = xtrace if AppOpticsAPM::XTrace.valid?(xtrace) && !AppOpticsAPM::API.blacklisted?(@url_prefix.to_s)
+          @headers['X-Trace'] = xtrace if AppOpticsAPM::XTrace.valid?(xtrace) && !blacklisted
           result = run_request_without_appoptics(method, url, body, headers, &block)
 
           kvs = {}
@@ -31,7 +32,6 @@ module AppOpticsAPM
           handle_service = !@builder.handlers.include?(Faraday::Adapter::NetHttp) &&
               !@builder.handlers.include?(Faraday::Adapter::Excon)
           if handle_service
-            blacklisted = AppOpticsAPM::API.blacklisted?(@url_prefix.to_s)
             context = AppOpticsAPM::Context.toString
             task_id = AppOpticsAPM::XTrace.task_id(context)
 
@@ -65,6 +65,13 @@ module AppOpticsAPM
           AppOpticsAPM::API.log_exit(:faraday)
         end
       end
+
+      private
+
+      def url_blacklisted?
+        url = @url_prefix ? @url_prefix.to_s : @host
+        AppOpticsAPM::API.blacklisted?(url)
+      end
     end
   end
 end

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

@@ -14,7 +14,7 @@ module AppOpticsAPM
       # The wrapper method for RestClient::Request.execute
       #
       def execute_with_appoptics(&block)
-        blacklisted = AppOpticsAPM::API.blacklisted?(uri)
+        blacklisted = AppOpticsAPM::API.blacklisted?(url)
 
         unless AppOpticsAPM.tracing?
           xtrace = AppOpticsAPM::Context.toString

data/lib/appoptics_apm/version.rb

@@ -8,7 +8,7 @@ module AppOpticsAPM
   module Version
     MAJOR = 4
     MINOR = 0
-    PATCH = 4
+    PATCH = 5
 
     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.0.4
+  version: 4.0.5
 platform: ruby
 authors:
 - Maia Engeli
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-22 00:00:00.000000000 Z
+date: 2018-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -82,48 +82,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: benchmark-ips
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: benchmark-memory
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-prof
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: The AppOpticsAPM gem provides performance instrumentation for MRI Ruby
   and related frameworks.
 email: support@appoptics.com
@@ -160,7 +118,6 @@ files:
 - examples/unicorn_on_heroku_config.rb
 - ext/oboe_metal/extconf.rb
 - ext/oboe_metal/lib/.keep
-- ext/oboe_metal/lib/liboboe-1.0.so.0.0.0
 - ext/oboe_metal/noop/noop.c
 - ext/oboe_metal/src/VERSION
 - ext/oboe_metal/src/bson/bson.h