stackify-ruby-apm 1.8.0 → 1.10.4

data/lib/stackify_apm/transport/aws_lambda_logging.rb

@@ -0,0 +1,53 @@
+require 'base64'
+require 'stringio'
+require 'zlib'
+require 'stackify_apm/root_info'
+require 'stackify_apm/serializers'
+
+
+module StackifyRubyAPM
+  # This class will handle the writing of messages through a logfile.
+  # @api private
+  class AWSLoggerClient
+    include Log
+    COMPRESS_DEFAULT_LEVEL = 6
+
+    def initialize(config)
+      @config = config
+      @transaction_serializers = Serializers::Transactions.new(@config)
+      @logger = Logger.new(STDOUT)
+      @logger.level = :debug
+      @logger.formatter = proc do |severity, datetime, progname, msg|
+        "STACKIFY-TRACE: #{msg}\n"
+      end
+    end
+
+    # This method will build an Array of Transactions in a json format.
+    # It will accept Array of transactions.
+    def post(transactions = [])
+      # convert transactions to json
+      json_traces = []
+      transactions.each  do |transaction|
+        # convert transaction to json
+        json_transaction = @transaction_serializers.build_json(@config, transaction).to_json
+
+        # add to json traces array
+        json_traces.push(json_transaction)
+      end
+
+      return unless ENV['STACKIFY_RUBY_ENV'] != 'rspec'
+
+      json_traces.each do |json_trace|
+        str = StringIO.new mode='w'
+        gz = Zlib::GzipWriter.new str, 6
+        gz.write json_trace.to_s
+        gz.close
+        compressed = Base64.strict_encode64 str.string
+        @logger.debug compressed
+      end
+      debug '[LogClient] post() Successfully write to logfile.' if ENV['STACKIFY_TRANSPORT_LOG_LEVEL'] == '0'
+    rescue StandardError => e
+      debug "[LogClient] post() exception: #{e.inspect}"
+    end
+  end
+end

data/lib/stackify_apm/transport/unix_socket_client.rb

@@ -4,7 +4,7 @@ require 'net_http_unix'
 require 'ostruct'
 
 module StackifyRubyAPM
-  # This class will handle the sending of protobuf messages through unix domain socket.
+  # This class will handle the sending of transaction messages through unix domain socket.
   # @api private
   class UnixSocketClient < AgentBaseTransport
     include Log
@@ -14,10 +14,18 @@ module StackifyRubyAPM
       super(config)
     end
 
+    def get_protobuf_headers
+      'application/x-protobuf'
+    end
+
+    def get_json_headers
+      'application/json'
+    end
+
     # rubocop:disable Metrics/CyclomaticComplexity
     # rubocop:disable Metrics/PerceivedComplexity
     #
-    # This method will send a protobuf message to the unix domain socket.
+    # This method will send a transaction message to the unix domain socket.
     # It will accept Array of transactions.
     def post(transactions = [])
       debug '[UnixSocketClient] post()' if ENV['STACKIFY_TRANSPORT_LOG_LEVEL'] == '0'
@@ -27,11 +35,10 @@ module StackifyRubyAPM
       delay = @config.delay_seconds
       begin
         # Convert message into binary and send it to unix domain socket
-        protobuf_obj = build_message(transactions)
-        message = StackifyProtoBuf::Traces.encode(protobuf_obj)
+        message = get_json_message(transactions)
         client = NetX::HTTPUnix.new('unix://' + @config.unix_socket_path)
         req = Net::HTTP::Post.new(@config.agent_traces_url)
-        req.set_content_type('application/x-protobuf')
+        req.set_content_type(get_json_headers)
         req.body = message
         response = client.request(req)
         debug "[UnixSocketClient] status_code = #{response.code}" if ENV['STACKIFY_TRANSPORT_LOG_LEVEL'] == '0'

data/lib/stackify_apm/transport_selector.rb

@@ -14,6 +14,8 @@ module StackifyRubyAPM
           StackifyRubyAPM::UnixSocketClient.new(config)
         when StackifyRubyAPM::AGENT_HTTP
           StackifyRubyAPM::AgentHTTPClient.new(config)
+        when StackifyRubyAPM::LOGGING
+          StackifyRubyAPM::AWSLoggerClient.new(config)
         else
           StackifyRubyAPM::LogClient.new(config)
         end

data/lib/stackify_apm/version.rb

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

data/lib/stackify_ruby_apm.rb

@@ -33,9 +33,7 @@ require 'stackify_apm/transport/agent_base'
 require 'stackify_apm/transport/log_client'
 require 'stackify_apm/transport/unix_socket_client'
 require 'stackify_apm/transport/agent_http_client'
-
-require 'google/protobuf'
-require 'proto/stackify_trace'
+require 'stackify_apm/transport/aws_lambda_logging'
 
 # Checks if the framework using is Rails
 require 'stackify_apm/railtie' if defined?(::Rails::Railtie)

data/lib/stackify_ruby_apm_lambda.rb

@@ -0,0 +1,62 @@
+require 'stackify_ruby_apm'
+
+module AWS
+  def self.instrument
+    config = {
+      transport: 'logging',
+      queue: false,
+    }
+    StackifyRubyAPM.start config
+  end
+
+  def self.handler(event:, context:, &block)
+    begin
+      ctx = StackifyRubyAPM::Context.new
+      ctx.add_aws_context({:arn => context.invoked_function_arn})
+      transaction = StackifyRubyAPM.transaction context.function_name, 'TASK', context: ctx
+      ret = block.call
+    rescue StackifyRubyAPM::InternalError
+      raise # Don't report StackifyRubyAPM errors
+    rescue StandardError => e
+      StackifyRubyAPM.report e
+      raise e
+    ensure
+      transaction.submit()
+    end
+    ret
+  end
+
+  # STACKIFY LAMBDA HANDLER
+  #
+  # @return original function execution
+  def self.stackify_handler(event:, context:)
+    begin
+      if !StackifyRubyAPM.running?
+        config = {
+          transport: 'logging',
+          queue: false,
+        }
+        StackifyRubyAPM.start config
+      end
+
+      ctx = StackifyRubyAPM::Context.new
+      ctx.add_aws_context({:arn => context.invoked_function_arn})
+      transaction = StackifyRubyAPM.transaction context.function_name, 'TASK', context: ctx
+
+      lambda_handler = StackifyRubyAPM.agent.config.lambda_handler.split('.')
+      function_file = lambda_handler[0]
+      function_name = lambda_handler[-1]
+
+      require "./#{function_file}"
+
+      send(function_name, event: event, context: context)
+    rescue StackifyRubyAPM::InternalError
+      raise # Don't report StackifyRubyAPM errors
+    rescue StandardError => e
+      StackifyRubyAPM.report e
+      raise e
+    ensure
+      transaction.submit()
+    end
+  end
+end

data/stackify-ruby-apm.gemspec

@@ -21,13 +21,44 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  # rails
+  if RUBY_VERSION > '2.5'
+    spec.add_development_dependency  'rails', '~> 5.0'
+  else
+    spec.add_development_dependency  'rails', '~> 4.0'
+  end
+
+  # bigdecimal
+  if RUBY_VERSION > '2.5'
+    spec.add_development_dependency  'bigdecimal'
+  end
+
   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 'activerecord'
+  spec.add_development_dependency 'curb', '0.9.8'
+  spec.add_development_dependency 'fakeredis'
+  spec.add_development_dependency 'http'
+  spec.add_development_dependency 'httpclient'
+  spec.add_development_dependency 'mongo'
+  spec.add_development_dependency 'mysql2'
+  spec.add_development_dependency 'pg', '~> 0.20'
+  spec.add_development_dependency 'rack-test'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'sequel'
+  spec.add_development_dependency 'sinatra'
+  spec.add_development_dependency 'sinatra-activerecord'
+  spec.add_development_dependency 'sqlite3', '1.3.13'
+  spec.add_development_dependency 'stackify-api-ruby'
+  spec.add_development_dependency 'timecop'
+  spec.add_development_dependency 'to_bool'
+  spec.add_development_dependency 'webmock'
+  spec.add_development_dependency 'delayed_job'
+
   spec.add_dependency('concurrent-ruby', '~> 1.0')
   spec.add_dependency('delegate_matcher', '~> 0.4')
   spec.add_dependency('faraday', '~> 0.8')
-  spec.add_dependency('google-protobuf', '3.5.0')
   spec.add_dependency('net_http_unix', '~> 0.2')
-  spec.add_dependency('rufus-scheduler', '~> 3.5')
+  spec.add_dependency('rufus-scheduler', '~> 3.0')
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: stackify-ruby-apm
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.10.4
 platform: ruby
 authors:
 - Stackify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +80,272 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  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: curb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
+- !ruby/object:Gem::Dependency
+  name: fakeredis
+  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: http
+  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: httpclient
+  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: mongo
+  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: mysql2
+  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: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  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: rubocop
+  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: sequel
+  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: sinatra
+  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: sinatra-activerecord
+  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: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.13
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.13
+- !ruby/object:Gem::Dependency
+  name: stackify-api-ruby
+  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: timecop
+  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: to_bool
+  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: webmock
+  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: delayed_job
+  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: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +388,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: google-protobuf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: net_http_unix
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +408,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.0'
 description: 
 email:
 - support@stackify.com
@@ -143,18 +423,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gemignore"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".ruby-version"
 - Gemfile
-- Gemfile.lock
 - LICENSE.md
 - README.md
 - Rakefile
-- docker-compose.yml
 - lib/proto/stackify_trace.rb
+- lib/stackify-ruby-apm-lambda.rb
 - lib/stackify-ruby-apm.rb
 - lib/stackify_apm/agent.rb
 - lib/stackify_apm/config.rb
@@ -197,6 +471,7 @@ files:
 - lib/stackify_apm/spies/curb/easy.rb
 - lib/stackify_apm/spies/curb/multi.rb
 - lib/stackify_apm/spies/custom_instrumenter.rb
+- lib/stackify_apm/spies/delayed_job.rb
 - lib/stackify_apm/spies/httparty.rb
 - lib/stackify_apm/spies/httpclient.rb
 - lib/stackify_apm/spies/httprb.rb
@@ -204,6 +479,7 @@ files:
 - lib/stackify_apm/spies/net_http.rb
 - lib/stackify_apm/spies/redis.rb
 - lib/stackify_apm/spies/sequel.rb
+- lib/stackify_apm/spies/sidekiq.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
@@ -218,6 +494,7 @@ files:
 - lib/stackify_apm/transaction.rb
 - lib/stackify_apm/transport/agent_base.rb
 - lib/stackify_apm/transport/agent_http_client.rb
+- lib/stackify_apm/transport/aws_lambda_logging.rb
 - lib/stackify_apm/transport/log_client.rb
 - lib/stackify_apm/transport/unix_socket_client.rb
 - lib/stackify_apm/transport_selector.rb
@@ -230,6 +507,7 @@ files:
 - lib/stackify_apm/version.rb
 - lib/stackify_apm/worker.rb
 - lib/stackify_ruby_apm.rb
+- lib/stackify_ruby_apm_lambda.rb
 - stackify-ruby-apm.gemspec
 homepage: http://www.stackify.com
 licenses: