stackify-ruby-apm 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de9af597a0b5c2cd3404ca49bb58b493ceddf026
-  data.tar.gz: dbfed2f61477f371a4e04d4e21e99774f85e3dba
+  metadata.gz: 9cdc4202c1c0062af195e5385b43fee272208e7e
+  data.tar.gz: 3983a54aee8710f485551e0f5c24fce5e940bbd9
 SHA512:
-  metadata.gz: 2b1bae168fc9700f547c8de0ba4e26185c62b1e416d9b9520d7195db70977a6226cde6d47c07ab3ad1fa36fadeb3f2cdf685f3f006af8fedb6de93c210cd4fc7
-  data.tar.gz: e9050031fcfcdf3449c9375837d41e8f157fb183c6882d063b7bbe879710998290eace9b3f3e847607328649b07026c3746e76c4188762f47d62034c28b75b4b
+  metadata.gz: 7ee08ddb0772686f93ba2546807762f2c780f7c15c2c039a41b09a3f3589f5bf3d180d3f8989de4922d16e8b802a0a7739025000062b925908eae30cb9ae1e01
+  data.tar.gz: 9ab46ee1da02e93377974ae4ab020a66b8a7b89069fee2f32d1e673dc4372397f5f784f86195c41220c7e06dc56004927739546f17eab1a6d912e7a7581bc659

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 
 group :test do
   gem 'activerecord'
-  gem 'curb'
+  gem 'curb', '0.9.8'
   gem 'fakeredis'
   gem 'http'
   gem 'httpclient'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stackify-ruby-apm (1.1.0)
+    stackify-ruby-apm (1.1.1)
       concurrent-ruby (~> 1.0)
       delegate_matcher (~> 0.4)
       rufus-scheduler (~> 3.5)
@@ -43,11 +43,11 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     arel (6.0.4)
     ast (2.4.0)
-    bson (4.3.0)
+    bson (4.4.2)
     builder (3.2.3)
     concurrent-ruby (1.1.4)
     crack (0.4.3)
@@ -94,14 +94,14 @@ GEM
     mini_mime (1.0.1)
     mini_portile2 (2.1.0)
     minitest (5.11.3)
-    mongo (2.6.2)
-      bson (>= 4.3.0, < 5.0.0)
+    mongo (2.7.1)
+      bson (>= 4.4.2, < 5.0.0)
     multipart-post (2.0.0)
     mysql2 (0.5.2)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-    parallel (1.12.1)
-    parser (2.5.3.0)
+    parallel (1.13.0)
+    parser (2.6.0.0)
       ast (~> 2.4.0)
     pg (0.21.0)
     powerpack (0.1.2)
@@ -170,8 +170,8 @@ GEM
       sexp_processor (~> 4.9)
     rufus-scheduler (3.5.2)
       fugit (~> 1.1, >= 1.1.5)
-    safe_yaml (1.0.4)
-    sequel (5.16.0)
+    safe_yaml (1.0.5)
+    sequel (5.18.0)
     sexp_processor (4.11.0)
     sinatra (1.4.8)
       rack (~> 1.5)
@@ -193,7 +193,7 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
-    stackify-api-ruby (1.0.11)
+    stackify-api-ruby (1.0.13)
       faraday (~> 0.8)
     thor (0.20.3)
     thread_safe (0.3.6)
@@ -206,7 +206,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.4.1)
+    unicode-display_width (1.5.0)
     webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -218,7 +218,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord
   bundler (~> 1.16)
-  curb
+  curb (= 0.9.8)
   fakeredis
   http
   httpclient
@@ -241,4 +241,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.17.1
+   1.17.3

data/lib/stackify_apm/agent.rb

@@ -93,10 +93,14 @@ module StackifyRubyAPM
     def start
       info '[Agent] start()'
       spies_name = ''
+      # If the rake task is detected as being ran then we don't load the spies
+      StackifyRubyAPM::Util.apm_disabled_in_rake
+      return false unless @config.instrument
       config.enabled_spies.each do |lib|
         spies_name = spies_name + ', ' + lib.inspect.to_s
         require "stackify_apm/spies/#{lib}"
       end
+
       debug '[Agent] Loaded spies:' + spies_name
       self
     end

data/lib/stackify_apm/config.rb

@@ -122,6 +122,7 @@ module StackifyRubyAPM
 
     attr_reader :client_id
     attr_reader :device_id
+    attr_reader :apm_disabled_in_rake
 
     def app=(app)
       case app_type?(app)

data/lib/stackify_apm/spies/httpclient.rb

@@ -16,10 +16,6 @@ module StackifyRubyAPM
             req = nil
             return request_without_apm(method, uri, *args, &block) unless StackifyRubyAPM.current_transaction
 
-            # unless StackifyRubyAPM.current_transaction
-            #   return request_without_apm(method, uri, *args, &block)
-            # end
-
             # Data configuration
             #
             method = method.upcase

data/lib/stackify_apm/spies/sinatra_activerecord/mysql_adapter.rb

@@ -8,7 +8,6 @@ module StackifyRubyAPM
     # @api private
     class MysqlAdapterSpy
       TYPE = 'db.sinatra_active_record.sql'.freeze
-
       if ActiveRecord::VERSION::MAJOR.to_i >= 5
         def install
           ActiveRecord::ConnectionAdapters::MySQL::DatabaseStatements.class_eval do

data/lib/stackify_apm/util.rb

@@ -7,6 +7,15 @@ module StackifyRubyAPM
     def self.micros(target = Time.now.utc)
       target.to_i * 1_000_000 + target.usec
     end
+
+    #
+    # This method will check if there is any rake task is running.
+    # If rake task is detected we set instrument=false and don't load the spies.
+    #
+    def self.apm_disabled_in_rake
+      cmd_rake = ($PROGRAM_NAME =~ /rake$/)
+      StackifyRubyAPM.agent.config.instrument = false if cmd_rake
+    end
   end
 end
 require 'stackify_apm/util/inspector'

data/lib/stackify_apm/version.rb

@@ -2,5 +2,5 @@
 
 # Sets the version of the APM
 module StackifyRubyAPM
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackify-ruby-apm
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Stackify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler