stackify-api-ruby 1.2.4 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6e7d47c5f5d7eba2a6326a4efdc6823d57aec456a946bc3eefd7694a29a8078
-  data.tar.gz: d2b022c023a0593391e7e190ca1e5784cdb56c4afacd010fa73d40fa581f9189
+  metadata.gz: 9e13cf81984bdf8a8f010af5a741a3d98e56cb5aff747c8dbc934c0a47edf1a5
+  data.tar.gz: f4f69adfdde2a04c864440a8ca8dd3859529b4d397cbd26005dca9bd2aa1fea7
 SHA512:
-  metadata.gz: 5d3ac89a398d1bf3192c6ed4a4cf8ab27e0523f67839ce17ff3d2fe41243bce977fe4d46a8dd8a23d684603aaf2dc6cc0ede38877ae16456c83b4d2693ce1af6
-  data.tar.gz: 61f4ded1b2cef4c418333adcfe893b999b637acc7a055a08b0c3664f95637414b21510718bd9f3a86f9e037f8dec241eeb2fb9c5b8f32afb5a924aaf46dcaac4
+  metadata.gz: a27451afa0f62688c83977a9fb05f595689d0617d7c2d4f4e286c058d018e8eefe8051f03d4443dc27d3ebaaa35b0959ca281aa6205cf4e9dc777f259add3283
+  data.tar.gz: 2827a27560393bee018e43c0055b7ef2a32baeb569e7df45f84313fea6cd8aef5b75c1d1a9d8e4d3ad2af0a81f0b068b44f57ef1d7b73a83a9a6af4769a10007

data/lib/core_ext/core_ext.rb

@@ -1,3 +1,2 @@
 require 'json'
 require 'core_ext/object'
-require 'core_ext/fixnum'

data/lib/stackify-api-ruby.rb

@@ -2,8 +2,6 @@ require 'stackify/version'
 require 'stackify/utils/methods'
 require 'core_ext/core_ext' unless defined? Rails
 
-require 'google/protobuf'
-require 'proto/stackify-agent.rb'
 
 module Stackify
 
@@ -14,7 +12,6 @@ module Stackify
 
   autoload :Backtrace,            'stackify/utils/backtrace'
   autoload :MsgObject,            'stackify/utils/msg_object'
-  autoload :ProtobufLogObject,    'stackify/utils/protobuf_log_object'
   autoload :Configuration,        'stackify/utils/configuration'
   autoload :HttpClient,           'stackify/http_client'
   autoload :Authorizable,         'stackify/authorization/authorizable'

data/lib/stackify/agent_base_sender.rb

@@ -1,5 +1,5 @@
 #
-# This class will handle the sending of protobuf message to agent
+# This class will handle the sending of log group message to agent
 #
 module Stackify
   class AgentBaseSender < Worker
@@ -23,28 +23,27 @@ module Stackify
     def send_logs_task attempts = nil, msgs
       properties[:attempts] = attempts if attempts
       Stackify::ScheduleTask.new properties do
-        data = create_log_group msgs
+        data = gather_and_pack_data(msgs).to_json
         send_request data
       end
     end
 
-    # create_log_group() This function will create a log group protobuf object
-    # @msgs {Object} Protobuf message
-    # return {Object} Return an object
-    def create_log_group msgs
-      # @details {Object} it will return the properties based in Stackify.setup() configuration
-      details = Stackify::Utils.get_app_settings
-      log_group = Stackify::LogGroup.new
-      msgs.each do |msg|
-        log_group.logs << msg
-      end
-      log_group.environment = details['env'].to_s
-      log_group.server_name = details['server_name'].to_s
-      log_group.application_name = details['app_name'].to_s
-      log_group.application_location = details['app_location'].to_s
-      log_group.logger = 'Ruby logger'
-      log_group.platform = 'ruby'
-      log_group
+    def gather_and_pack_data msgs
+      details = Stackify::EnvDetails.instance.auth_info
+      {
+        'CDID' => details['DeviceID'],
+        'CDAppID' => details['DeviceAppID'],
+        'Logger' => 'Rails logger',
+        'AppName' => details['AppName'],
+        'AppNameID' => details['AppNameID'],
+        'Env' => details['Env'],
+        'EnvID' => details['EnvID'],
+        'AppEnvID' => details['AppEnvID'],
+        'ServerName' => details['DeviceName'],
+        'Msgs' => msgs,
+        'AppLoc' => details['AppLocation'],
+        'Platform' => 'Ruby'
+      }
     end
 
     def send_request log_group

data/lib/stackify/agent_client.rb

@@ -36,11 +36,11 @@ module Stackify
     end
 
     def has_error msg
-      !msg.error.nil?
+      !msg['Ex'].nil?
     end
 
     def get_epoch msg
-      msg.date_millis
+      msg['EpochMs']
     end
 
     def send_logs msgs, attempts = 3
@@ -59,16 +59,16 @@ module Stackify
             e
           end
           ex = StackifiedError.new(ex, binding())
-          Stackify.msgs_queue << Stackify::ProtobufLogObject.new(level, ex.message, caller[0], trans_id, log_uuid, ex).to_obj
+          Stackify.msgs_queue << Stackify::MsgObject.new(level, ex.message, caller[0], trans_id, log_uuid, ex).to_h
         else
-          Stackify.msgs_queue << Stackify::ProtobufLogObject.new(level, msg, caller[0], trans_id, log_uuid).to_obj
+          Stackify.msgs_queue << Stackify::MsgObject.new(level, msg, caller[0], trans_id, log_uuid).to_h
         end
       end
     end
 
     def log_exception_task level, ex, trans_id=nil, log_uuid=nil
       Stackify::ScheduleTask.new ({limit: 1}) do
-        Stackify.msgs_queue << Stackify::ProtobufLogObject.new(level, ex.message, caller[0], trans_id, log_uuid, ex).to_obj
+        Stackify.msgs_queue << Stackify::MsgObject.new(level, ex.message, caller[0], trans_id, log_uuid, ex).to_h
       end
     end
 

data/lib/stackify/agent_http_sender.rb

@@ -3,27 +3,25 @@ require 'faraday'
 require 'ostruct'
 
 #
-# This class will handle the sending of protobuf message to agent using http request
+# This class will handle the sending of log messages to agent using http request
 #
 module Stackify
   class AgentHTTPSender < AgentBaseSender
 
     HEADERS = {
-      'Content-Type' => 'application/x-protobuf'
+      'Content-Type' => 'application/json'
     }
 
     # send_request() This function will post an http request
-    # @msgs {Object} Protobuf message
+    # @msgs {Object} log group message
     # return {Object} Return an object {status, message}
     def send_request log_group
       begin
-        # Convert data into binary and send it to agent
-        message = Stackify::LogGroup.encode(log_group)
         conn = Faraday.new(proxy: Stackify.configuration.proxy, ssl: { verify: false })
         @response = conn.post do |req|
           req.url URI(Stackify.configuration.http_endpoint + Stackify.configuration.agent_log_url)
           req.headers = HEADERS
-          req.body = message
+          req.body = log_group
         end
         if @response.try(:status) == 200
           Stackify.internal_log :debug, "[AgentHTTPSender]: Successfully send message via http request."

data/lib/stackify/error.rb

@@ -40,7 +40,7 @@ module Stackify
 
     def to_h
       env = Stackify::EnvDetails.instance
-      {
+      data = {
         'OccurredEpochMillis' => Time.now.to_f*1000,
         'Error' => {
           'InnerError' => @exception.try(:cause),
@@ -52,11 +52,20 @@ module Stackify
           'SourceMethod' => source_method,
         },
         'EnvironmentDetail' => env.auth_info,
-        'WebRequestDetail' => env.request_details.try{ |d| d.fetch('webrequest_details', '') },
-        'ServerVariables' => env.request_details.try{ |d| d.fetch('server_variables', '') },
         'CustomerName' => 'Customer',
         'UserName' => @context.fetch('user', '')
       }
+      web_request_details = env.request_details.try{ |d| d.fetch('webrequest_details', '') }
+      if web_request_details.nil?
+        data['WebRequestDetail'] = web_request_details
+      end
+
+      server_variables = env.request_details.try{ |d| d.fetch('server_variables', '') }
+      if server_variables.nil?
+        data['ServerVariables'] = server_variables
+      end
+
+      data
     end
 
   end

data/lib/stackify/metrics/metrics_client.rb

@@ -1,6 +1,6 @@
 module Stackify::Metrics
   class MetricsClient
-
+    TEN_MINUTES = 600
     attr_reader :metrics_queue
 
     def initialize
@@ -57,7 +57,7 @@ module Stackify::Metrics
 
     def start_upload_metrics
       current_time = Stackify::Utils.rounded_current_time
-      purge_older_than = current_time - 10.minutes
+      purge_older_than = current_time - TEN_MINUTES
       #read everything up to the start of the current minute
       read_queued_metrics_batch current_time
       handle_zero_reports current_time
@@ -67,7 +67,7 @@ module Stackify::Metrics
       if first_50_metrics.length > 0
         #only getting metrics less than 10 minutes old to drop old data in case we get backed up
         #they are removed from the @aggregated_metrics in the upload function upon success
-        upload_aggregates(first_50_metrics.select { |_key, aggr| aggr.occurred_utc > current_time - 10.minutes })
+        upload_aggregates(first_50_metrics.select { |_key, aggr| aggr.occurred_utc > current_time - TEN_MINUTES })
       end
       @aggregate_metrics.delete_if { |_key, aggr| aggr.occurred_utc < purge_older_than }
     end

data/lib/stackify/unix_socket_sender.rb

@@ -2,22 +2,20 @@ require 'net_http_unix'
 require 'ostruct'
 
 #
-# This class will handle the sending of protobuf message to unix domain socket
+# This class will handle the sending of log messages to unix domain socket
 #
 module Stackify
   class UnixSocketSender < AgentBaseSender
 
     # send_request() This function will send http request via unix domain socket
-    # @msgs {Object} Protobuf message
+    # @msgs {Object} log group message
     # return {Object} Return an object {status, message}
     def send_request log_group
       begin
-        # Convert data into binary and send it to unix domain socket
-        message = Stackify::LogGroup.encode(log_group)
         client = NetX::HTTPUnix.new('unix://' + Stackify.configuration.unix_socket_path)
         req = Net::HTTP::Post.new(Stackify.configuration.agent_log_url)
-        req.set_content_type('application/x-protobuf')
-        req.body = message
+        req.set_content_type('application/json')
+        req.body = log_group
         response = client.request(req)
         Stackify.internal_log :debug, "[UnixSocketSender] status_code = #{response.code}"
         if response.code.to_i == 200

data/lib/stackify/utils/backtrace.rb

@@ -3,6 +3,7 @@ module Stackify::Backtrace
   ALL_TEXT_FROM_START_TO_FIRST_COLON_REGEXP = /\A([^:]+)/
   NUMBER_BETWEEN_TWO_COLONS_REGEXP = /:(\d+):/
   TEXT_AFTER_IN_BEFORE_END_REGEXP = /in\s`(\S+)'\z/
+  TEXT_AFTER_IN_BEFORE_END_REGEXP_ = /in\s(\S+)'\z/
 
   def self.line_number backtrace_str
     backtrace_str[NUMBER_BETWEEN_TWO_COLONS_REGEXP, 1]
@@ -10,7 +11,7 @@ module Stackify::Backtrace
 
   def self.method_name backtrace_str
     return nil unless backtrace_str
-    backtrace_str[TEXT_AFTER_IN_BEFORE_END_REGEXP, 1]
+    backtrace_str[TEXT_AFTER_IN_BEFORE_END_REGEXP, 1] || backtrace_str[TEXT_AFTER_IN_BEFORE_END_REGEXP_, 1]
   end
 
   def self.file_name backtrace_str

data/lib/stackify/version.rb

@@ -1,3 +1,3 @@
 module Stackify
-  VERSION = '1.2.4'
+  VERSION = '1.2.7'
 end

data/stackify-api-ruby.gemspec

@@ -22,6 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 0'
   spec.add_runtime_dependency 'faraday', '~> 0.8'
-  spec.add_runtime_dependency 'google-protobuf', '~> 3.0'
   spec.add_runtime_dependency 'net_http_unix', '~> 0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackify-api-ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.7
 platform: ruby
 authors:
 - Stackify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,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.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: net_http_unix
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +81,6 @@ files:
 - README.md
 - Rakefile
 - lib/core_ext/core_ext.rb
-- lib/core_ext/fixnum.rb
 - lib/core_ext/object.rb
 - lib/generators/stackify/stackify_generator.rb
 - lib/generators/stackify/templates/stackify.rb

data/lib/core_ext/fixnum.rb

@@ -1,17 +0,0 @@
-class Fixnum
-  SECONDS_IN_MINUTE = 60
-  SECONDS_IN_HOUR =  60 * SECONDS_IN_MINUTE
-  SECONDS_IN_DAY = 24 * SECONDS_IN_HOUR
-
-  def days
-    self * SECONDS_IN_DAY
-  end
-
-  def minutes
-    self * SECONDS_IN_MINUTE
-  end
-
-  def ago
-    Time.now - self
-  end
-end