stackify-ruby-apm 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f5b0114ca432b384986bef0196ff170ddc28d29
-  data.tar.gz: 8c5850539e077d39f1b0542a9bc4c80a9d5c21cf
+  metadata.gz: 6bd379b0656760e155c8796bf1774627e593ecbe
+  data.tar.gz: cb1f771b879d3c21dafc339e7f1cb874f592f9fb
 SHA512:
-  metadata.gz: 51f466a4778791cb024cb072a38e590cf8f07e09a7e202be694d6bb6a97be1ea501ccb79a057c68c538e1a18186b8a375b894d8133845eb6c44608d6ec3a6681
-  data.tar.gz: a858da77af22d0f32415377fdd454effb880fccb7ebf2e82d2045c1da1d9d451634a5405539cae2ebcb040db701b659296828428e06c6b44f72129a3836dd29c
+  metadata.gz: be773012e733b98d520a0605f9a6fe85f79a06feddfda47046479929eba89b161a50528e0bc8188717ad2d5004fc236b71f720941f78378baeb74ae87f0f564f
+  data.tar.gz: bae740a96d52bd9905af652998a3f5440f836028e1d000684e496ea37f5fd8b0c50e9f752b02ada9b84e341a6fcd2f44c9409d7efc96e6f26b627d9d9630b0a5

data/Gemfile

@@ -2,3 +2,21 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in stackify-ruby-apm.gemspec
 gemspec
+
+group :test do
+  gem 'mongo'
+  gem 'webmock'
+  gem 'fakeredis'
+  gem 'rack-test'
+  gem 'rails'
+  gem 'httpclient'
+  gem 'http'
+  gem 'timecop'
+  gem "sinatra"
+  gem "activerecord"
+  gem "sinatra-activerecord"
+  gem "sqlite3"
+  gem 'mysql2'
+  gem 'pg', '~> 0.20'
+  gem 'rubocop', require: false
+end

data/Gemfile.lock

@@ -1,29 +1,149 @@
 PATH
   remote: .
   specs:
-    stackify-ruby-apm (0.9.0)
+    stackify-ruby-apm (1.0.0)
       concurrent-ruby (~> 1.0)
       delegate_matcher (~> 0.4)
-      webmock (~> 3.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    actioncable (5.2.2)
+      actionpack (= 5.2.2)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.2)
+      actionview (= 5.2.2)
+      activesupport (= 5.2.2)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.2)
+      activesupport (= 5.2.2)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.2)
+      activesupport (= 5.2.2)
+      globalid (>= 0.3.6)
+    activemodel (5.2.2)
+      activesupport (= 5.2.2)
+    activerecord (5.2.2)
+      activemodel (= 5.2.2)
+      activesupport (= 5.2.2)
+      arel (>= 9.0)
+    activestorage (5.2.2)
+      actionpack (= 5.2.2)
+      activerecord (= 5.2.2)
+      marcel (~> 0.3.1)
+    activesupport (5.2.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    concurrent-ruby (1.1.3)
+    arel (9.0.0)
+    ast (2.4.0)
+    bson (4.3.0)
+    builder (3.2.3)
+    concurrent-ruby (1.1.4)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
+    crass (1.0.4)
     delegate_matcher (0.4.3)
       proc_extensions (~> 0.2)
     diff-lcs (1.3)
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
+    erubi (1.8.0)
+    fakeredis (0.7.0)
+      redis (>= 3.2, < 5.0)
     file-tail (1.2.0)
       tins (~> 1.0)
-    hashdiff (0.3.7)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    hashdiff (0.3.8)
+    http (4.0.0)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.0)
+      http_parser.rb (~> 0.6.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    http-form_data (2.1.1)
+    http_parser.rb (0.6.0)
+    httpclient (2.8.3)
+    i18n (1.5.1)
+      concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.2)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mimemagic (0.3.3)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    mongo (2.6.2)
+      bson (>= 4.3.0, < 5.0.0)
+    mustermann (1.0.3)
+    mysql2 (0.5.2)
+    nio4r (2.3.1)
+    nokogiri (1.10.0)
+      mini_portile2 (~> 2.4.0)
+    parallel (1.12.1)
+    parser (2.5.3.0)
+      ast (~> 2.4.0)
+    pg (0.21.0)
+    powerpack (0.1.2)
     proc_extensions (0.2)
       sourcify (~> 0.5)
     public_suffix (3.0.3)
+    rack (2.0.6)
+    rack-protection (2.0.5)
+      rack
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.2)
+      actioncable (= 5.2.2)
+      actionmailer (= 5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
+      activemodel (= 5.2.2)
+      activerecord (= 5.2.2)
+      activestorage (= 5.2.2)
+      activesupport (= 5.2.2)
+      bundler (>= 1.3.0)
+      railties (= 5.2.2)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.2)
+      actionpack (= 5.2.2)
+      activesupport (= 5.2.2)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rainbow (3.0.0)
     rake (10.5.0)
+    redis (4.1.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -37,32 +157,85 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
+    rubocop (0.62.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.4.0)
+    ruby-progressbar (1.10.0)
     ruby2ruby (2.4.1)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.6)
-    ruby_parser (3.11.0)
+    ruby_parser (3.12.0)
       sexp_processor (~> 4.9)
     safe_yaml (1.0.4)
     sexp_processor (4.11.0)
+    sinatra (2.0.5)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.5)
+      tilt (~> 2.0)
+    sinatra-activerecord (2.0.13)
+      activerecord (>= 3.2)
+      sinatra (>= 1.0)
     sourcify (0.5.0)
       file-tail (>= 1.0.5)
       ruby2ruby (>= 1.2.5)
       ruby_parser (>= 2.0.5)
       sexp_processor (>= 3.0.5)
-    tins (1.19.0)
-    webmock (3.4.2)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tilt (2.0.9)
+    timecop (0.9.1)
+    tins (1.20.2)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
+    unicode-display_width (1.4.1)
+    webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord
   bundler (~> 1.16)
+  fakeredis
+  http
+  httpclient
+  mongo
+  mysql2
+  pg (~> 0.20)
+  rack-test
+  rails
   rake (~> 10.0)
   rspec (~> 3.0)
+  rubocop
+  sinatra
+  sinatra-activerecord
+  sqlite3
   stackify-ruby-apm!
+  timecop
+  webmock
 
 BUNDLED WITH
-   1.16.4
+   1.17.3

data/LICENSE.md

@@ -0,0 +1,66 @@
+Stackify Ruby APM LICENSE
+---
+
+Certain inventions disclosed in this file may be claimed within patents owned or patent applications filed by 
+Stackify, LLC (“Stackify”) or third parties.
+
+Stackify grants you a revocable, non-exclusive, non-transferable, limited license to download, install and use this 
+Stackify Ruby APM package (“Application”) strictly in accordance with the terms of this Agreement and the terms found 
+at https://stackify.com/terms-conditions.
+
+You agree not to, and you will not permit others to: license, sell, rent, lease, assign, distribute, transmit, host, 
+outsource, disclose or otherwise commercially exploit the Application or make the Application available to any third 
+party; modify, make derivative works of, disassemble, decrypt, reverse compile or reverse engineer any part of the 
+Application; or remove, alter or obscure any proprietary notice (including any notice of copyright or trademark) of 
+Stackify or its affiliates, partners, suppliers or the licensors of the Application.
+
+You may install, execute, and distribute these files and their contents only in conjunction with your direct use of 
+Stackify’s services. These files and their contents shall not be used in conjunction with any other product or 
+software, including but not limited to those that may compete with any Stackify product, feature, or software. As a 
+condition to the foregoing grant, you must provide this notice along with each copy you distribute and you must not 
+remove, alter, or obscure this notice.
+
+The Application, including without limitation all copyrights, patents, trademarks, trade secrets and other intellectual 
+property rights are, and shall remain, the sole and exclusive property of Stackify. Any feedback, comments, ideas, 
+code, pull requests, improvements or suggestions (collectively, "Suggestions") provided by you to Stackify with respect 
+to the Application shall remain the sole and exclusive property of Stackify. Stackify shall be free to use, copy, 
+modify, publish, or redistribute the Suggestions for any purpose and in any way without any credit or any compensation 
+to you.
+
+Stackify reserves the right to modify, suspend or discontinue, temporarily or permanently, the Application or any 
+service to which it connects, with or without notice and without liability to you.
+
+Stackify may from time to time provide enhancements or improvements to the features/functionality of the Application, 
+which may include patches, bug fixes, updates, upgrades and other modifications ("Updates"). Updates may modify or 
+delete certain features and/or functionalities of the Application. You agree that Stackify has no obligation to (i) 
+provide any Updates, or (ii) continue to provide or enable any particular features and/or functionalities of the 
+Application to you. You further agree that all Updates will be (i) deemed to constitute an integral part of the 
+Application, and (ii) subject to the terms and conditions of this Agreement.
+
+All other use, reproduction, modification, distribution, or other exploitation of these files is strictly prohibited, 
+except as may be set forth in a separate written license agreement between you and Stackify.  The terms of any such 
+license agreement will control over this notice.  The license stated above will be automatically terminated and 
+revoked if you exceed its scope or violate any of the terms of this notice.
+
+Upon termination of this Agreement, you shall cease all use of the Application and delete all copies of the 
+Application from your mobile device or from your computer.
+ 
+Termination of this Agreement will not limit any of Stackify LLC's rights or remedies at law or in equity in case of 
+breach by you (during the term of this Agreement) of any of your obligations under the present Agreement.
+
+You agree to indemnify and hold Stackify LLC and its parents, subsidiaries, affiliates, officers, employees, agents, 
+partners and licensors (if any) harmless from any claim or demand, including reasonable attorneys' fees, due to or 
+arising out of your: (a) use of the Application; (b) violation of this Agreement or any law or regulation; or (c) 
+violation of any right of a third party.
+
+Unless otherwise expressly agreed by Stackify in a separate written license agreement, these files are provided 
+AS IS, WITHOUT WARRANTY OF ANY KIND, including without any implied warranties of MERCHANTABILITY, FITNESS FOR A 
+PARTICULAR PURPOSE, TITLE, or NON-INFRINGEMENT.  As a condition to your use of these files, you are solely responsible 
+for such use. Stackify will have no liability to you for direct, indirect, consequential, incidental, special, or 
+punitive damages or for lost profits or data.
+
+The Application also uses code from the following open source projects under the following licenses:
+
+* concurrent-ruby - http://opensource.org/licenses/MIT 
+* delegate_matcher - http://opensource.org/licenses/MIT
+* webmock - http://opensource.org/licenses/MIT 

data/README.md

@@ -6,9 +6,11 @@
 1. Install **Stackify Linux Agent**. 
 
 2. Check that your setup meets our system requirements. 
-    * Ruby version 2.5+
-    * Framework 
-        * Ruby on Rails 5.2+
+    * Ruby version 2.0+
+    * Frameworks
+        * Ruby on Rails 4+
+        * Rack 1+
+        * Sinatra 1.4+ 
     * Operating System 
         * Linux
 

data/Rakefile

@@ -1,6 +1,10 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
+if defined?(Sinatra)
+    require "rspec/integration/sinatra_sqlite_adapter_rspec"
+    require "sinatra/activerecord/rake"
+end
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec

data/docker-compose.yml

@@ -0,0 +1,46 @@
+version: "3"
+services:
+
+  dbpostgresql:
+    image: postgres
+    volumes:
+      - postgresdata:/var/lib/postgresql/data
+    ports:
+      - 5433:5432
+    environment:
+      POSTGRES_DB: PostgresTestDB
+      POSTGRES_USER: bob
+      POSTGRES_PASSWORD: password
+    container_name: sinatra_activerecord_postgres_test
+
+  dbmysql:
+    image: mysql:5.7
+    volumes:
+      - mysqldata:/var/lib/mysql
+    ports:
+      - 3305:3306
+    environment:
+      - MYSQL_ROOT_PASSWORD=secret
+      - MYSQL_USER=bob
+      - MYSQL_PASSWORD=password
+      - MYSQL_DATABASE=MysqlTestDB
+    container_name: sinatra_activerecord_mysql_test
+
+  dbmongo:
+    image: mongo:3.6
+    volumes:
+      - mongodata:/data/db
+      - mongodata_config:/data/configdb
+    ports:
+      - 27018:27017
+    container_name: sinatra_activerecord_mongo_test
+
+volumes:
+  postgresdata:
+    driver: local
+  mysqldata:
+    driver: local
+  mongodata:
+    driver: local
+  mongodata_config:
+    driver: local

data/lib/stackify/agent.rb

@@ -27,6 +27,16 @@ module StackifyRubyAPM
     def self.start(config)
       return @instance if @instance
       config = Config.new(config) unless config.is_a?(Config)
+      pid = $PID || Process.pid
+      host_name = config.hostname || `hostname`
+      date_now = Time.now
+      current_trace_file = config.log_trace_path + host_name.squish! + "#" + pid.to_s.squish! + ".log"
+
+      if(ENV['STACKIFY_RUBY_ENV'] != 'rspec')
+        config.tracer_logger = StackifyLogger.new(current_trace_file, config.filenum_rotate, config.logger_byte_size)
+        config.logtime_created =  date_now.strftime("%H:%M")
+      end  
+      
       LOCK.synchronize do
         return @instance if @instance
         @instance = new(config).start
@@ -53,7 +63,6 @@ module StackifyRubyAPM
     end
 
     def initialize(config)
-      # puts '@stackify_ruby [Agent] [lib/agent.rb] initialize()'
       @config = config
       @trace_logger = TraceLogger.new(config)
       @messages = Queue.new
@@ -62,6 +71,7 @@ module StackifyRubyAPM
       @context_builder = ContextBuilder.new(self)
       @error_builder = ErrorBuilder.new(self)
       @stacktrace_builder = StacktraceBuilder.new(self)
+      @error_serializer = Serializers::Errors.new(config)
     end
 
     attr_reader :config,
@@ -71,18 +81,17 @@ module StackifyRubyAPM
                 :context_builder,
                 :stacktrace_builder,
                 :trace_logger,
+                :error_serializer,
                 :error_builder
 
     def start
-      # puts '@stackify_ruby [Agent] [lib/agent.rb] start()'
-      # puts '@stackify_ruby [Agent] [lib/agent.rb] Environment: ' + @config.environment_name
-      # puts '@stackify_ruby [Agent] [lib/agent.rb] Application Name: ' + @config.application_name
-      # @instrumenter.start
-      debug 'Loaded spies:'
+      info '[Agent] start()'
+      spies_name = ''
       config.enabled_spies.each do |lib|
-        debug lib.inspect
+        spies_name = spies_name + ', ' + lib.inspect.to_s
         require "stackify/spies/#{lib}"
       end
+      debug '[Agent] Loaded spies:' + spies_name
       self
     end
 
@@ -142,7 +151,11 @@ module StackifyRubyAPM
         exception,
         handled: handled
       )
-      enqueue_error error
+      current_error =  @error_serializer.build(error)
+      if current_transaction
+        current_transaction.add_exception(current_error)
+      end
+
     end
 
     def report_message(message, backtrace: nil, **attrs)
@@ -157,7 +170,7 @@ module StackifyRubyAPM
     private
 
     def boot_worker
-      debug 'Booting worker'
+      debug '[Agent] Booting worker'
 
       @worker_thread = Thread.new do
         Worker.new(