appoptics_apm 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14962bf4e9f8b8b81ca0e153a11aea4d14d6e301
-  data.tar.gz: 2738dbd25b94e1b2339958ca83ed68e1d9cfd4d3
+  metadata.gz: f6eca844d1e22be51b9a76ac3c00c512974a7fde
+  data.tar.gz: 925cc30ac503e7e3ba8f99494912ee7f5752a9a6
 SHA512:
-  metadata.gz: b0a701a61d0a71efeb0a046c8c2ed2aa34d0fb73ae7ae9d9cab4c04b60f46bec5a9c99ed10bde6c98a0f2d042742b0c280c7ce51b8786df9903306a0ea2e000a
-  data.tar.gz: acc3f8518f0afeb4023ba7d80f0d2168b240189c3321f43a057bb857827d0f82267d121ac41b5b4b5158ea14deda3d546af0996c1007dc6e4ab0d53a2f9ec350
+  metadata.gz: d7684bf87d2ba3359c0b12a94859e6a65a6a7040ee0708aa27391cb86d21a3d28aba9714bfe0ecd296c2c016b0a64250897872ab535706cf58431bc878671a15
+  data.tar.gz: b43b9dd8e0ddfdb2ab7bd78fc163010825578cfe1a0e472c25e628de5c2f1c504878a67606f5968dd738f7694def702dcec7e796b4277e3a919e2660897c7b69

data/Dockerfile_test

@@ -19,7 +19,6 @@ RUN apt-get update \
        less \
        tree \
        psmisc \
-       swig \
     && rm -rf /var/lib/apt/lists/*
 
 # rbenv setup
@@ -39,12 +38,12 @@ RUN .  ~/.profile \
 #    && rbenv install jruby-9.0.5.0
 
 # install swig 3.0.8
-#git statuRUN curl -SL http://kent.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz \
-#    | tar xzC /tmp \
-#    && cd /tmp/swig-3.0.8 \
-#    && ./configure && make && make install \
-#    && cd \
-#    && rm -rf /tmp/swig-3.0.8
+RUN curl -SL http://kent.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz \
+    | tar xzC /tmp \
+    && cd /tmp/swig-3.0.8 \
+    && ./configure && make && make install \
+    && cd \
+    && rm -rf /tmp/swig-3.0.8
 
 # install postgres, redis, and memcached
 RUN apt-get update \

data/README.md

@@ -8,9 +8,9 @@ It has the ability to report performance metrics on an array of libraries, datab
 
 It requires an [AppOptics](https://www.appoptics.com/) account to view metrics.  Get yours, [it's free](https://https://my.appoptics.com/sign_up).
 
-[![Gem Version](https://badge.fury.io/rb/appoptics.png)](https://badge.fury.io/rb/appoptics)
-[![Build Status](https://travis-ci.org/tracelytics/ruby-appoptics.png?branch=master)](https://travis-ci.org/tracelytics/ruby-appoptics)
-[![Code Climate](https://codeclimate.com/github/tracelytics/ruby-appoptics.png)](https://codeclimate.com/github/tracelytics/ruby-appoptics)
+[![Gem Version](https://badge.fury.io/rb/appoptics_apm.png)](https://badge.fury.io/rb/appoptics_apm)
+[![Build Status](https://travis-ci.com/librato/ruby-appoptics.png?branch=master)](https://travis-ci.com/librato/ruby-appoptics)
+[![Code Climate](https://codeclimate.com/github/librato/ruby-appoptics.png)](https://codeclimate.com/github/librato/ruby-appoptics)
 
 _Note: The repository name has been changed to ruby-appoptics.  Please update your github remotes with `git remote set-url origin git@github.com:tracelytics/ruby-appoptics.git`._
 

data/Rakefile

@@ -67,12 +67,13 @@ task :fetch_ext_deps do
     raise "!! Did not find required swig version 3.0.8, found #{swig_version.inspect}"
   end
   oboe_version = ENV['OBOE_VERSION'] || 'latest'
-  oboe_arch = ENV['OBOE_ARCH'] || 'x86_64'
+  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"))
@@ -89,7 +90,7 @@ task :fetch_ext_deps do
   end
   FileUtils.cd(ext_src_dir) do
     system('swig -c++ -ruby -module oboe_metal oboe.i')
-    FileUtils.rm('oboe.i')
+    # File.write(f = "oboe_wrap.cxx", "#include <math.h>\n#define isinf\n#define isnan\n" + File.read(f))
   end
 end
 

data/appoptics_apm.gemspec

@@ -15,14 +15,14 @@ Gem::Specification.new do |s|
   s.description = %q{The AppOpticsAPM gem provides performance instrumentation for MRI Ruby and related frameworks.}
 
   s.extra_rdoc_files = ["LICENSE"]
-  s.files = `git ls-files`.split("\n")
+  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',
               '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")
+  # s.test_files  = Dir.glob("{test}/**/*.rb")
 
   # TODO this is commented out util we can actually provide gems for different platforms
   # s.platform   = defined?(JRUBY_VERSION) ? 'java' : Gem::Platform::CURRENT

data/docker-compose.yml

@@ -34,28 +34,6 @@ services:
        - MYSQL_HOST=mysql
        - APPOPTICS_MONGO_SERVER=mongo
 
-  ruby_appoptics_apm_alpine:
-     container_name: ruby_appoptics_apm_alpine
-     image: ruby_alpine
-     build:
-        context: .
-        dockerfile: ./Dockerfile_alpine
-     cpu_quota: 100000 # 1 cpu, assumes cpu_period of 1 second
-     mem_limit: 1G
-     volumes:
-       - .:/code/ruby-appoptics_apm
-     depends_on:
-       - wait
-     links:
-       - wait
-     environment:
-       - APPOPTICS_RABBITMQ_SERVER=rabbitmq
-       - DOCKER_MYSQL_PASS=admin
-       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
-       - MYSQL_ROOT_PASSWORD=admin
-       - MYSQL_HOST=mysql
-       - APPOPTICS_MONGO_SERVER=mongo
-
   rabbitmq:
     container_name: rabbitmq
     image: rabbitmq:3-management

data/ext/oboe_metal/extconf.rb

@@ -14,6 +14,10 @@ jruby = defined?(JRUBY_VERSION) ? true : false
 ao_lib = 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'))

data/lib/appoptics_apm/config.rb

@@ -208,17 +208,22 @@ module AppOpticsAPM
       @@config[key.to_sym] = value
 
       if key == :sampling_rate
-        AppOpticsAPM.logger.warn 'sampling_rate is not a supported setting for AppOpticsAPM::Config.  ' \
+        AppOpticsAPM.logger.warn '[appoptics_apm/config] sampling_rate is not a supported setting for AppOpticsAPM::Config.  ' \
                          'Please use :sample_rate.'
 
       elsif key == :sample_rate
         unless value.is_a?(Integer) || value.is_a?(Float)
-          fail 'appoptics_apm :sample_rate must be a number between 0 and 1000000 (1m)'
+          AppOpticsAPM.logger.warn "[appoptics_apm/config] :sample_rate must be a number between 0 and 1000000 (1m) " \
+                                   "(provided: #{value}), corrected to 0"
+          value = 0
         end
 
         # Validate :sample_rate value
         unless value.between?(0, 1e6)
-          fail 'appoptics_apm :sample_rate must be between 0 and 1000000 (1m)'
+          value_1 = value
+          value = value_1 < 0 ? 0 : 1_000_000
+          AppOpticsAPM.logger.warn "[appoptics_apm/config] :sample_rate must be between 0 and 1000000 (1m) " \
+                                   "(provided: #{value_1}), corrected to #{value}"
         end
 
         # Assure value is an integer
@@ -226,11 +231,11 @@ module AppOpticsAPM
         AppOpticsAPM.set_sample_rate(value) if AppOpticsAPM.loaded
 
       elsif key == :action_blacklist
-        AppOpticsAPM.logger.warn "[appoptics_apm/unsupported] :action_blacklist has been deprecated and no longer functions."
+        AppOpticsAPM.logger.warn "[appoptics_apm/config] :action_blacklist has been deprecated and no longer functions."
 
       elsif key == :resque
-        AppOpticsAPM.logger.warn "[appoptics_apm/warn] :resque config is deprecated.  It is now split into :resqueclient and :resqueworker."
-        AppOpticsAPM.logger.warn "[appoptics_apm/warn] Called from #{Kernel.caller[0]}"
+        AppOpticsAPM.logger.warn "[appoptics_apm/config] :resque config is deprecated.  It is now split into :resqueclient and :resqueworker."
+        AppOpticsAPM.logger.warn "[appoptics_apm/config] Called from #{Kernel.caller[0]}"
 
       elsif key == :include_url_query_params
         # Obey the global flag and update all of the per instrumentation

data/lib/appoptics_apm/version.rb

@@ -8,7 +8,7 @@ module AppOpticsAPM
   module Version
     MAJOR = 4
     MINOR = 0
-    PATCH = 3
+    PATCH = 4
 
     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.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Maia Engeli
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -170,20 +170,6 @@ files:
 - ext/oboe_metal/src/oboe_debug.h
 - ext/oboe_metal/src/oboe_wrap.cxx
 - ext/oboe_metal/tests/test.rb
-- gemfiles/delayed_job.gemfile
-- gemfiles/frameworks.gemfile
-- gemfiles/instrumentation_mocked.gemfile
-- gemfiles/libraries.gemfile
-- gemfiles/noop.gemfile
-- gemfiles/rails23.gemfile
-- gemfiles/rails30.gemfile
-- gemfiles/rails31.gemfile
-- gemfiles/rails32.gemfile
-- gemfiles/rails40.gemfile
-- gemfiles/rails41.gemfile
-- gemfiles/rails42.gemfile
-- gemfiles/rails50.gemfile
-- gemfiles/rails51.gemfile
 - get_version.rb
 - init.rb
 - lib/appoptics_apm.rb
@@ -264,100 +250,6 @@ files:
 - ruby_setup.sh
 - run_docker_build_gem_upload_to_packagecloud.sh
 - run_tests_docker.rb
-- test/benchmark/README.md
-- test/benchmark/logging_bench.rb
-- test/benchmark/with_libraries_gemfile/bunny_bench.rb
-- test/benchmark/with_rails5x_gemfile/action_controller5x_bench.rb
-- test/frameworks/apps/grape_nested.rb
-- test/frameworks/apps/grape_simple.rb
-- test/frameworks/apps/padrino_simple.rb
-- test/frameworks/apps/sinatra_simple.rb
-- test/frameworks/grape_test.rb
-- test/frameworks/padrino_test.rb
-- test/frameworks/rails3x_test.rb
-- test/frameworks/rails4x_test.rb
-- test/frameworks/rails5x_api_test.rb
-- test/frameworks/rails5x_test.rb
-- test/frameworks/rails_shared_tests.rb
-- test/frameworks/sinatra_test.rb
-- test/instrumentation/bunny_client_test.rb
-- test/instrumentation/bunny_consumer_test.rb
-- test/instrumentation/curb_test.rb
-- test/instrumentation/dalli_test.rb
-- test/instrumentation/em_http_request_test.rb
-- test/instrumentation/excon_test.rb
-- test/instrumentation/faraday_test.rb
-- test/instrumentation/http_test.rb
-- test/instrumentation/httpclient_test.rb
-- test/instrumentation/memcache_test.rb
-- test/instrumentation/memcached_test.rb
-- test/instrumentation/mongo_v1_test.rb
-- test/instrumentation/mongo_v2_index_test.rb
-- test/instrumentation/mongo_v2_test.rb
-- test/instrumentation/mongo_v2_view_test.rb
-- test/instrumentation/moped_test.rb
-- test/instrumentation/rack_test.rb
-- test/instrumentation/redis_hashes_test.rb
-- test/instrumentation/redis_keys_test.rb
-- test/instrumentation/redis_lists_test.rb
-- test/instrumentation/redis_misc_test.rb
-- test/instrumentation/redis_sets_test.rb
-- test/instrumentation/redis_sortedsets_test.rb
-- test/instrumentation/redis_strings_test.rb
-- test/instrumentation/resque_test.rb
-- test/instrumentation/rest-client_test.rb
-- test/instrumentation/sequel_mysql2_test.rb
-- test/instrumentation/sequel_mysql_test.rb
-- test/instrumentation/sequel_pg_test.rb
-- test/instrumentation/sidekiq-client_test.rb
-- test/instrumentation/sidekiq-worker_test.rb
-- test/instrumentation/twitter-cassandra_test.rb
-- test/instrumentation/typhoeus_test.rb
-- test/jobs/delayed_job/db_worker_job.rb
-- test/jobs/delayed_job/error_worker_job.rb
-- test/jobs/delayed_job/remote_call_worker_job.rb
-- test/jobs/resque/db_worker_job.rb
-- test/jobs/resque/error_worker_job.rb
-- test/jobs/resque/remote_call_worker_job.rb
-- test/jobs/sidekiq/db_worker_job.rb
-- test/jobs/sidekiq/error_worker_job.rb
-- test/jobs/sidekiq/remote_call_worker_job.rb
-- test/minitest_helper.rb
-- test/mocked/curb_mocked_test.rb
-- test/mocked/excon_mocked_test.rb
-- test/mocked/faraday_mocked_test.rb
-- test/mocked/http_mocked_test.rb
-- test/mocked/httpclient_mocked_test.rb
-- test/mocked/rest_client_mocked_test.rb
-- test/mocked/typhoeus_mocked_test.rb
-- test/models/widget.rb
-- test/noop/noop_test.rb
-- test/profiling/legacy_method_profiling_test.rb
-- test/profiling/method_profiling_test.rb
-- test/queues/delayed_job-client_test.rb
-- test/queues/delayed_job-worker_test.rb
-- test/reporter/reporter_test.rb
-- test/servers/delayed_job.rb
-- test/servers/rackapp_8101.rb
-- test/servers/rails3x_8140.rb
-- test/servers/rails4x_8140.rb
-- test/servers/rails5x_8140.rb
-- test/servers/rails5x_api_8150.rb
-- test/servers/sidekiq.rb
-- test/servers/sidekiq.yml
-- test/servers/sidekiq_initializer.rb
-- test/settings
-- test/support/auto_tracing_test.rb
-- test/support/backcompat_test.rb
-- test/support/config_test.rb
-- test/support/dnt_test.rb
-- test/support/init_report_test.rb
-- test/support/liboboe_settings_test.rb
-- test/support/logging_test.rb
-- test/support/sql_sanitize_test.rb
-- test/support/tracing_mode_test.rb
-- test/support/tvalias_test.rb
-- test/support/xtrace_test.rb
 homepage: https://www.appoptics.com/
 licenses:
 - Librato Open License, Version 1.0
@@ -382,95 +274,4 @@ rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: AppOptics APM performance instrumentation gem for Ruby
-test_files:
-- test/benchmark/logging_bench.rb
-- test/benchmark/with_rails5x_gemfile/action_controller5x_bench.rb
-- test/benchmark/with_libraries_gemfile/bunny_bench.rb
-- test/minitest_helper.rb
-- test/mocked/rest_client_mocked_test.rb
-- test/mocked/httpclient_mocked_test.rb
-- test/mocked/http_mocked_test.rb
-- test/mocked/excon_mocked_test.rb
-- test/mocked/faraday_mocked_test.rb
-- test/mocked/typhoeus_mocked_test.rb
-- test/mocked/curb_mocked_test.rb
-- test/noop/noop_test.rb
-- test/reporter/reporter_test.rb
-- test/models/widget.rb
-- test/instrumentation/sequel_mysql_test.rb
-- test/instrumentation/memcache_test.rb
-- test/instrumentation/mongo_v2_test.rb
-- test/instrumentation/sidekiq-client_test.rb
-- test/instrumentation/bunny_consumer_test.rb
-- test/instrumentation/redis_misc_test.rb
-- test/instrumentation/resque_test.rb
-- test/instrumentation/redis_strings_test.rb
-- test/instrumentation/sidekiq-worker_test.rb
-- test/instrumentation/memcached_test.rb
-- test/instrumentation/mongo_v1_test.rb
-- test/instrumentation/redis_keys_test.rb
-- test/instrumentation/bunny_client_test.rb
-- test/instrumentation/twitter-cassandra_test.rb
-- test/instrumentation/rack_test.rb
-- test/instrumentation/faraday_test.rb
-- test/instrumentation/redis_hashes_test.rb
-- test/instrumentation/redis_sortedsets_test.rb
-- test/instrumentation/moped_test.rb
-- test/instrumentation/curb_test.rb
-- test/instrumentation/rest-client_test.rb
-- test/instrumentation/sequel_mysql2_test.rb
-- test/instrumentation/redis_lists_test.rb
-- test/instrumentation/mongo_v2_view_test.rb
-- test/instrumentation/dalli_test.rb
-- test/instrumentation/em_http_request_test.rb
-- test/instrumentation/excon_test.rb
-- test/instrumentation/sequel_pg_test.rb
-- test/instrumentation/mongo_v2_index_test.rb
-- test/instrumentation/http_test.rb
-- test/instrumentation/typhoeus_test.rb
-- test/instrumentation/redis_sets_test.rb
-- test/instrumentation/httpclient_test.rb
-- test/support/config_test.rb
-- test/support/xtrace_test.rb
-- test/support/tracing_mode_test.rb
-- test/support/init_report_test.rb
-- test/support/backcompat_test.rb
-- test/support/sql_sanitize_test.rb
-- test/support/liboboe_settings_test.rb
-- test/support/logging_test.rb
-- test/support/tvalias_test.rb
-- test/support/dnt_test.rb
-- test/support/auto_tracing_test.rb
-- test/profiling/method_profiling_test.rb
-- test/profiling/legacy_method_profiling_test.rb
-- test/queues/delayed_job-worker_test.rb
-- test/queues/delayed_job-client_test.rb
-- test/jobs/sidekiq/remote_call_worker_job.rb
-- test/jobs/sidekiq/error_worker_job.rb
-- test/jobs/sidekiq/db_worker_job.rb
-- test/jobs/resque/remote_call_worker_job.rb
-- test/jobs/resque/error_worker_job.rb
-- test/jobs/resque/db_worker_job.rb
-- test/jobs/delayed_job/remote_call_worker_job.rb
-- test/jobs/delayed_job/error_worker_job.rb
-- test/jobs/delayed_job/db_worker_job.rb
-- test/frameworks/rails_shared_tests.rb
-- test/frameworks/grape_test.rb
-- test/frameworks/rails5x_test.rb
-- test/frameworks/rails4x_test.rb
-- test/frameworks/rails5x_api_test.rb
-- test/frameworks/rails3x_test.rb
-- test/frameworks/padrino_test.rb
-- test/frameworks/apps/sinatra_simple.rb
-- test/frameworks/apps/grape_nested.rb
-- test/frameworks/apps/grape_simple.rb
-- test/frameworks/apps/padrino_simple.rb
-- test/frameworks/sinatra_test.rb
-- test/servers/rackapp_8101.rb
-- test/servers/sidekiq.rb
-- test/servers/rails3x_8140.rb
-- test/servers/rails5x_api_8150.rb
-- test/servers/sidekiq_initializer.rb
-- test/servers/rails4x_8140.rb
-- test/servers/rails5x_8140.rb
-- test/servers/delayed_job.rb
+test_files: []

data/gemfiles/delayed_job.gemfile

@@ -1,36 +0,0 @@
-source "https://rubygems.org"
-
-group :development, :test do
-  gem 'rake'
-  gem 'minitest'
-  gem 'minitest-reporters', '< 1.0.18'
-  gem 'minitest-debugger', :require => false
-  gem 'rack-test'
-  gem 'puma', '< 3.1.0'
-  gem 'bson', '< 4.0'
-end
-
-# New mime-types/mime-types-data requires ruby 2.0
-if RUBY_VERSION < '2.0'
-  gem 'mime-types', '< 3.0'
-end
-
-if defined?(JRUBY_VERSION)
-  gem 'sinatra', :require => false
-  gem 'activerecord-jdbc-adapter'
-  gem 'jdbc-postgresql'
-else
-  gem 'sinatra'
-  # pg 0.19 and above require ruby 2.0
-  if RUBY_VERSION < '2.0'
-    gem 'pg', '< 0.19'
-  else
-    gem 'pg', '< 1.0.0' # rails is not ready for pg 1.0
-  end
-  gem "delayed_job_active_record"
-end
-
-gem "rails", "~> 4.2.5"
-
-gemspec :path => File.expand_path(File.dirname(__FILE__) + '/../')
-# vim:syntax=ruby