stackify-ruby-apm 1.0.1 → 1.1.0

data/lib/stackify_apm/util/lru_cache.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module StackifyRubyAPM
+  module Util
+    # @api private
+    class LruCache
+      def initialize(max_size = 512, &block)
+        @max_size = max_size
+        @data = Hash.new(&block)
+        @mutex = Mutex.new
+      end
+
+      def [](key)
+        @mutex.synchronize do
+          val = @data[key]
+          return unless val
+
+          add(key, val)
+          val
+        end
+      end
+
+      def []=(key, val)
+        @mutex.synchronize do
+          add(key, val)
+        end
+      end
+
+      def length
+        @data.length
+      end
+
+      def to_a
+        @data.to_a
+      end
+
+      private
+
+      def add(key, val)
+        @data.delete(key)
+        @data[key] = val
+
+        return unless @data.length > @max_size
+
+        @data.delete(@data.first[0])
+      end
+    end
+  end
+end

data/lib/stackify_apm/util/trace_log_watcher.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module StackifyRubyAPM
+  module Util
+    # rubocop:disable all
+    # This class will handle the monitor of trace log files.
+    module TraceLogWatcher
+      require 'rufus-scheduler'
+
+      # delete_trace_logs - This method will scan the directory `/usr/local/stackify/stackify-ruby-apm/log/` for every 1 hour(configurable) and
+      # delete all trace log files that are older than 1 hour except the stackify-ruby-apm.log files will remain.
+      #
+      def self.delete_trace_logs(config)
+        format = '%Y-%m-%d %H:%M:%S %z'
+        log_trace_path = config.log_trace_path + '/*'
+        file_age = config.trace_log_age_in_hour
+        interval = config.check_trace_log_per_hour
+        scheduler = Rufus::Scheduler.new
+        scheduler.every(interval, tag: 'stackify_ruby_apm') do
+          Dir[log_trace_path].select { |exclude_file|
+            exclude_file =~ /^(?!.*stackify-ruby-apm-[0-9].log).*$/
+          }.map { |file|
+            modified_time = File.mtime(file)
+            t1 = DateTime.parse(modified_time.to_s, format)
+            current_time = Time.now.localtime.strftime(format)
+            t2 = DateTime.parse(current_time.to_s, format)
+            if t2 > t1
+              if modified_time < (Time.now - file_age)
+                FileUtils.rm(file)
+              end
+            end
+          }
+        end
+      end
+    end
+  end
+end

data/lib/stackify_apm/version.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# Sets the version of the APM
+module StackifyRubyAPM
+  VERSION = '1.1.0'.freeze
+end

data/lib/{stackify → stackify_apm}/worker.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
-#
+
 # This class will receive the transactions and send it to HTTP/TraceLogger.
 # Responsible for sending transactions to APM for every 10 secs (config.flush_interval default)
 # Worker will constantly execute transaction sending to APM until the Agent is stopped.
-#
 
 require 'concurrent/timer_task'
 
@@ -41,7 +40,6 @@ module StackifyRubyAPM
 
     attr_reader :config, :messages, :pending_transactions
 
-    # rubocop:disable Metrics/MethodLength
     # Collects and sends the transactions
     #
     def run_forever
@@ -60,7 +58,6 @@ module StackifyRubyAPM
         end
       end
     end
-    # rubocop:enable Metrics/MethodLength
 
     private
 
@@ -78,6 +75,7 @@ module StackifyRubyAPM
       end
     end
 
+    # rubocop:disable Lint/RescueException
     # Collects, builds, and sends transactions via HTTP/TraceLogger
     #
     def collect_and_send_transactions
@@ -93,15 +91,17 @@ module StackifyRubyAPM
         nil
       end
     end
+    # rubocop:enable Lint/RescueException
 
-    def post_error(msg)
+    def post_error(_msg)
       return if pending_transactions.empty?
-      transactions = collect_batched_transactions
-      payload = @serializers.errors.build_all([msg.error])
+      # transactions = collect_batched_transactions
+      # payload = @serializers.errors.build_all([msg.error])
       debug '[Worker] post_error()'
       # @trace_logger.post(payload, transactions[0])
     end
 
+    # rubocop:disable Lint/HandleExceptions
     def collect_batched_transactions
       batch = []
 
@@ -115,5 +115,6 @@ module StackifyRubyAPM
 
       batch
     end
+    # rubocop:enable Lint/HandleExceptions
   end
 end

data/lib/stackify_ruby_apm.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 #
 # The entry point once the server starts after the Stackify APM has been integrated.
 #
 # Checks if Web App's framework is Rails or Sinatra:
 #   if Rails
-#     -> call lib/stackify/railtie.rb to start Agent
+#     -> call lib/stackify_apm/railtie.rb to start Agent
 #   elsif Sinatra
 #     -> access the Web App's /config.ru file to start Agent
 #   end
@@ -12,23 +13,25 @@
 # Incoming requests are then handled by the Middleware (middleware.rb)
 #
 
-require 'stackify/log'
-require 'stackify/version'
-require 'stackify/util/dig'
-require 'stackify/agent'
+require 'stackify_apm/log'
+require 'stackify_apm/version'
+require 'stackify_apm/util/dig'
+require 'stackify_apm/agent'
 # Checks ruby version
-require (RUBY_VERSION.to_f >= 2.4) ? 'stackify/logger/logger_high_version' : 'stackify/logger/logger_lower_version'
-require 'stackify/config'
-require 'stackify/context'
-require 'stackify/instrumenter'
-require 'stackify/internal_error'
-require 'stackify/util'
+require RUBY_VERSION.to_f >= 2.4 ? 'stackify_apm/logger/logger_high_version' : 'stackify_apm/logger/logger_lower_version'
+require 'stackify_apm/helper/database_helper'
+require 'stackify_apm/config'
+require 'stackify_apm/context'
+require 'stackify_apm/instrumenter'
+require 'stackify_apm/internal_error'
+require 'stackify_apm/util'
 
-require 'stackify/middleware'
+require 'stackify_apm/middleware'
 
 # Checks if the framework using is Rails
-require 'stackify/railtie' if defined?(::Rails::Railtie) 
+require 'stackify_apm/railtie' if defined?(::Rails::Railtie)
 
+# Start medoule for StackifyRubyAPM Agent
 module StackifyRubyAPM
   # Starts the StackifyRubyAPM Agent
   #
@@ -75,7 +78,7 @@ module StackifyRubyAPM
 
     agent.transaction(name, type, context: context, &block)
   end
-  
+
   # Starts a new span under the current transaction
   #
   # @param name [String] A description of the span, eq `SELECT FROM "users"`
@@ -84,7 +87,7 @@ module StackifyRubyAPM
   # @yield [Span] Optional block encapsulating span
   # @return [Span] Unless block given
   def self.span(name, type = nil, context: nil, include_stacktrace: true,
-    &block)
+                &block)
     return (block_given? ? yield : nil) unless agent
 
     agent.span(

data/run-test-docker.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+function startContainers() {
+  echo "Starting up containers..."
+  docker-compose up -d -V --remove-orphans --force-recreate
+}
+
+function stopContainers() {
+  echo "Stopping Containers..."
+  docker-compose down --remove-orphans
+
+  # delete volumes
+  echo "Delete Volumes..."
+  docker volume rm  stackify-ruby-apm_postgresdata &> /dev/null
+  docker volume rm  stackify-ruby-apm_mysqldata &> /dev/null
+  docker volume rm  stackify-ruby-apm_mongodata &> /dev/null
+  docker volume rm  stackify-ruby-apm_mongodata_config &> /dev/null
+  echo "Deleted Volumes"
+}
+
+if [[ "$(docker images -q stackify-ruby-rvm:latest 2> /dev/null)" == "" ]]; then
+    docker build --file docker/stackify-ruby-rvm . -t stackify-ruby-rvm:latest
+fi
+
+RUBY_VERSIONS=('2.0.0-p648' '2.1.10' '2.2.10' '2.3.7' '2.4.0' '2.5.1' '2.6.0-preview3')
+
+for ver in "${RUBY_VERSIONS[@]}"
+do
+
+    echo "Testing Ruby Version ${RUBY_VERSIONS}"
+
+    if [[ "$(docker images -q stackify-ruby-$ver:latest 2> /dev/null)" == "" ]]; then
+        docker build --build-arg version=${ver} --file docker/stackify-ruby . -t stackify-ruby-$ver:latest
+    fi
+
+    docker build --build-arg from_version=${ver} --build-arg version=${ver} --file docker/stackify-ruby-test . -t stackify-ruby-$ver-test:latest
+
+    startContainers
+    docker run -e version=${ver} --network="host" --name "stackify-ruby-${ver}-test"  stackify-ruby-$ver-test:latest
+    stopContainers
+
+    docker rm "stackify-ruby-${ver}-test"
+
+done
+
+
+
+
+
+

data/run-test.sh

@@ -30,8 +30,6 @@ function rspec_on_multiple_versions(){
   set -e
 
   RUBY_VERSIONS=('2.0.0-p648' '2.1.10' '2.2.10' '2.3.7' '2.4.0' '2.5.1' '2.6.0-preview3')
-  # BUNDLER ERROR
-  # '2.0.0-p648' 2.1.10
 
   for ver in "${RUBY_VERSIONS[@]}"
   do
@@ -59,7 +57,7 @@ function rspec_on_multiple_versions(){
       echo ">>>Unit Test Error on Version: $ver<<<"
       stopContainers
       exit 1
-    else 
+    else
       echo "====================================================="
       echo "$ver: End Test"
       echo "====================================================="

data/stackify-ruby-apm.gemspec

@@ -1,29 +1,32 @@
+# frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "stackify/version"
+require 'stackify_apm/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "stackify-ruby-apm"
+  spec.name          = 'stackify-ruby-apm'
   spec.version       = StackifyRubyAPM::VERSION
-  spec.authors       = ["Stackify"]
-  spec.email         = ["support@stackify.com"]
+  spec.authors       = ['Stackify']
+  spec.email         = ['support@stackify.com']
   spec.summary       = 'Stackify APM for Ruby'
   spec.homepage      = 'http://www.stackify.com'
   spec.license       = 'Stackify'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+
+  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|docs)/}) }
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_dependency('concurrent-ruby', '~> 1.0')
   spec.add_dependency('delegate_matcher', '~> 0.4')
+  spec.add_dependency('rufus-scheduler', '~> 3.5')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackify-ruby-apm
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Stackify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: rufus-scheduler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
 description: 
 email:
 - support@stackify.com
@@ -89,71 +103,84 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE.md
 - README.md
 - Rakefile
 - docker-compose.yml
+- docker/stackify-ruby
+- docker/stackify-ruby-rvm
+- docker/stackify-ruby-test
 - lib/stackify-ruby-apm.rb
-- lib/stackify/agent.rb
-- lib/stackify/config.rb
-- lib/stackify/context.rb
-- lib/stackify/context/request.rb
-- lib/stackify/context/request/socket.rb
-- lib/stackify/context/request/url.rb
-- lib/stackify/context/response.rb
-- lib/stackify/context_builder.rb
-- lib/stackify/error.rb
-- lib/stackify/error/exception.rb
-- lib/stackify/error/log.rb
-- lib/stackify/error_builder.rb
-- lib/stackify/instrumenter.rb
-- lib/stackify/internal_error.rb
-- lib/stackify/log.rb
-- lib/stackify/logger/log_device.rb
-- lib/stackify/logger/logger_high_version.rb
-- lib/stackify/logger/logger_lower_version.rb
-- lib/stackify/middleware.rb
-- lib/stackify/naively_hashable.rb
-- lib/stackify/normalizers.rb
-- lib/stackify/normalizers/action_controller.rb
-- lib/stackify/normalizers/action_mailer.rb
-- lib/stackify/normalizers/action_view.rb
-- lib/stackify/normalizers/active_record.rb
-- lib/stackify/railtie.rb
-- lib/stackify/root_info.rb
-- lib/stackify/serializers.rb
-- lib/stackify/serializers/errors.rb
-- lib/stackify/serializers/transactions.rb
-- lib/stackify/span.rb
-- lib/stackify/span/context.rb
-- lib/stackify/spies.rb
-- lib/stackify/spies/action_dispatch.rb
-- lib/stackify/spies/httpclient.rb
-- lib/stackify/spies/httprb.rb
-- lib/stackify/spies/mongo.rb
-- lib/stackify/spies/net_http.rb
-- lib/stackify/spies/redis.rb
-- lib/stackify/spies/sinatra.rb
-- lib/stackify/spies/sinatra_activerecord/mysql_adapter.rb
-- lib/stackify/spies/sinatra_activerecord/postgresql_adapter.rb
-- lib/stackify/spies/sinatra_activerecord/sqlite_adapter.rb
-- lib/stackify/spies/tilt.rb
-- lib/stackify/stacktrace.rb
-- lib/stackify/stacktrace/frame.rb
-- lib/stackify/stacktrace_builder.rb
-- lib/stackify/subscriber.rb
-- lib/stackify/trace_logger.rb
-- lib/stackify/transaction.rb
-- lib/stackify/util.rb
-- lib/stackify/util/dig.rb
-- lib/stackify/util/inflector.rb
-- lib/stackify/util/inspector.rb
-- lib/stackify/util/lru_cache.rb
-- lib/stackify/version.rb
-- lib/stackify/worker.rb
+- lib/stackify_apm/agent.rb
+- lib/stackify_apm/config.rb
+- lib/stackify_apm/context.rb
+- lib/stackify_apm/context/request.rb
+- lib/stackify_apm/context/request/socket.rb
+- lib/stackify_apm/context/request/url.rb
+- lib/stackify_apm/context/response.rb
+- lib/stackify_apm/context_builder.rb
+- lib/stackify_apm/error.rb
+- lib/stackify_apm/error/exception.rb
+- lib/stackify_apm/error/log.rb
+- lib/stackify_apm/error_builder.rb
+- lib/stackify_apm/helper/database_helper.rb
+- lib/stackify_apm/instrumenter.rb
+- lib/stackify_apm/internal_error.rb
+- lib/stackify_apm/log.rb
+- lib/stackify_apm/logger/log_device.rb
+- lib/stackify_apm/logger/logger_high_version.rb
+- lib/stackify_apm/logger/logger_lower_version.rb
+- lib/stackify_apm/middleware.rb
+- lib/stackify_apm/naively_hashable.rb
+- lib/stackify_apm/normalizers.rb
+- lib/stackify_apm/normalizers/action_controller.rb
+- lib/stackify_apm/normalizers/action_mailer.rb
+- lib/stackify_apm/normalizers/action_view.rb
+- lib/stackify_apm/normalizers/active_record.rb
+- lib/stackify_apm/railtie.rb
+- lib/stackify_apm/root_info.rb
+- lib/stackify_apm/serializers.rb
+- lib/stackify_apm/serializers/errors.rb
+- lib/stackify_apm/serializers/transactions.rb
+- lib/stackify_apm/span.rb
+- lib/stackify_apm/span/context.rb
+- lib/stackify_apm/spies.rb
+- lib/stackify_apm/spies/action_dispatch.rb
+- lib/stackify_apm/spies/curb.rb
+- lib/stackify_apm/spies/curb/easy.rb
+- lib/stackify_apm/spies/curb/multi.rb
+- lib/stackify_apm/spies/httpclient.rb
+- lib/stackify_apm/spies/httprb.rb
+- lib/stackify_apm/spies/mongo.rb
+- lib/stackify_apm/spies/net_http.rb
+- lib/stackify_apm/spies/redis.rb
+- lib/stackify_apm/spies/sequel.rb
+- lib/stackify_apm/spies/sinatra.rb
+- lib/stackify_apm/spies/sinatra_activerecord/mysql_adapter.rb
+- lib/stackify_apm/spies/sinatra_activerecord/postgresql_adapter.rb
+- lib/stackify_apm/spies/sinatra_activerecord/sqlite_adapter.rb
+- lib/stackify_apm/spies/stackify_logger.rb
+- lib/stackify_apm/spies/tilt.rb
+- lib/stackify_apm/stacktrace.rb
+- lib/stackify_apm/stacktrace/frame.rb
+- lib/stackify_apm/stacktrace_builder.rb
+- lib/stackify_apm/subscriber.rb
+- lib/stackify_apm/trace_logger.rb
+- lib/stackify_apm/transaction.rb
+- lib/stackify_apm/util.rb
+- lib/stackify_apm/util/dig.rb
+- lib/stackify_apm/util/inflector.rb
+- lib/stackify_apm/util/inspector.rb
+- lib/stackify_apm/util/lru_cache.rb
+- lib/stackify_apm/util/trace_log_watcher.rb
+- lib/stackify_apm/version.rb
+- lib/stackify_apm/worker.rb
 - lib/stackify_ruby_apm.rb
+- run-test-docker.sh
 - run-test.sh
 - stackify-ruby-apm.gemspec
 homepage: http://www.stackify.com