tpt_serverless 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b77f8c69c7659ad042a65c49fd24d10dce69561ad50bb5be5cc1769c10772c04
-  data.tar.gz: 9183232aa41d8575f48272ac3b9cd98f0e528e25854380eae93ea05d1d3b8b76
+  metadata.gz: 4e40167211120d2403b0f6c91770b43384ff2d9781cb0282e2fad5c34f0a1459
+  data.tar.gz: 790516d5026b0a26123d929ddab13424e46ce56e27eb7de1dcd05d135cd7dba5
 SHA512:
-  metadata.gz: 531e07d718df8e8b6d040e088bfad8798f6c259faf47c9cc77ffafee653376c07263e76f075bb65c4ee70ec9f13c44f95bba45026e9275b4ad0c5e39a9cacbd5
-  data.tar.gz: 1a08cdd1f3e073bca3517bd617eefb06cf7df36836a3d949f8a4413d794cd55859abd0a7f0032d54d0275b9cf98106eb1439915e3368d8cb00b859e95152e0b7
+  metadata.gz: 4731b9cf978c054b73779578280757be12d8e7ecc08305bdf5e87a6b3d272ac3f6101eddd6fdf3f9d60371126b227603a6eb218156d73a05e2856a72fcf83d22
+  data.tar.gz: f0f048fb5a0b0f02b34c2a06e5a157b8727ae13cfdb69c8fa2a3ebced4132c939e4a3b833a7d438c800fc00830e58f31279c1b2d75086c1ba6399a5694b51711

data/lib/tpt_serverless.rb

@@ -1,4 +1,5 @@
 require "tpt_serverless/version"
+require 'tpt_serverless/sumo_log_forwarder'
 
 module TptServerless
   class Error < StandardError; end

data/lib/tpt_serverless/sumo_log_forwarder.rb

@@ -6,7 +6,7 @@ Example of how to add this to your `serverless.yml`:
   forwardLogs:
     name: ${self:service.name}-forwardLogs-${self:provider.stage}
     # NOTE: Ensure that you update the path below if you update the tpt_serverless gem
-    handler: /opt/ruby/2.5.0/gems/tpt_serverless-X.X.X/lib/tpt_serverless/sumo_log_forwarder.rb
+    handler: /opt/ruby/2.5.0/gems/tpt_serverless-X.X.X/lib/tpt_serverless/sumo_log_forwarder.SumoLogForwarder.handler
     timeout: 10 # seconds
     environment:
       SUMO_ENDPOINT: ${self:custom.sumoEndpoint}
@@ -22,84 +22,86 @@ require 'base64'
 
 TIME_REGEX = /^20\d\d-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\dZ/
 
-# This handler receives CloudWatch log events, parses the events and forwards the extracted logs to
-# Sumo Logic.
-#
-# It performs a few helpful cleanup/prep functions as well.
-def handler(event: , context:)
-  sumo_endpoint = ENV['SUMO_ENDPOINT']
-
-  if sumo_endpoint.nil? || sumo_endpoint.strip.empty?
-    puts 'ERROR: SUMO_ENDPOINT is not set. Skipping log forwarding.'
-    return
-  end
-
-  sumo_url = URI.parse(sumo_endpoint)
-  raw_data = event.fetch('awslogs').fetch('data')
-  unzipped_data = Zlib::GzipReader.new(StringIO.new(Base64.decode64(raw_data))).read
-  data = JSON.parse(unzipped_data)
-
-  message_type = data.fetch('messageType')
-  log_group = data.fetch('logGroup')
-  log_stream = data.fetch('logStream')
-  log_events = data.fetch('logEvents')
-
-  if message_type === 'CONTROL_MESSAGE'
-    puts 'skipping control message'
-    return
-  end
-
-  puts "message_count=#{log_events.length}"
-
-  messages_data = extract_messages(log_events).map do |message|
-    # AWS replaces newlines with carriage returns in Lambda logs
-    message.gsub(/\r(?!\n)/, "\n")
-  end.join('')
+class SumoLogForwarder
+  class << self
+    # This handler receives CloudWatch log events, parses the events and forwards the extracted logs to
+    # Sumo Logic.
+    #
+    # It performs a few helpful cleanup/prep functions as well.
+    def handler(event: , context:)
+      sumo_endpoint = ENV['SUMO_ENDPOINT']
+
+      if sumo_endpoint.nil? || sumo_endpoint.strip.empty?
+        puts 'ERROR: SUMO_ENDPOINT is not set. Skipping log forwarding.'
+        return
+      end
+
+      sumo_url = URI.parse(sumo_endpoint)
+      raw_data = event.fetch('awslogs').fetch('data')
+      unzipped_data = Zlib.gunzip(Base64.decode64(raw_data))
+      data = JSON.parse(unzipped_data)
+
+      message_type = data.fetch('messageType')
+      log_group = data.fetch('logGroup')
+      log_stream = data.fetch('logStream')
+      log_events = data.fetch('logEvents')
+
+      if message_type === 'CONTROL_MESSAGE'
+        puts 'skipping control message'
+        return
+      end
+
+      puts "message_count=#{log_events.length}"
+
+      messages_data = extract_messages(log_events).map do |message|
+        # AWS replaces newlines with carriage returns in Lambda logs
+        message.gsub(/\r(?!\n)/, "\n")
+      end.join('')
+
+      send_to_sumo(sumo_url, log_group, log_stream, messages_data)
+    end
 
-  send_to_sumo(sumo_url, log_group, log_stream, messages_data)
-end
+    private
 
-private
+    def extract_messages(log_events)
+      log_events.map do |log_event|
+        message = log_event.fetch('message')
+        timestamp = Integer(log_event.fetch('timestamp'))
 
-def extract_messages(log_events)
-  log_events.map do |log_event|
-    message = log_event.fetch('message')
-    timestamp = Integer(log_event.fetch('timestamp'))
+        # Ensure the message starts with a time.
+        # E.g. START/END/REPORT log events don't.
+        if TIME_REGEX !~ message
+          time_string = Time.at(timestamp/1000.0).utc.strftime('%Y-%m-%dT%H:%M:%S.%LZ')
+          message = "#{time_string} #{message}"
+        end
 
-    # Ensure the message starts with a time.
-    # E.g. START/END/REPORT log events don't.
-    if TIME_REGEX !~ message
-      time_string = Time.at(timestamp/1000.0).utc.strftime('%Y-%m-%dT%H:%M:%S.%LZ')
-      message = "#{time_string} #{message}"
+        message
+      end
     end
 
-    message
-  end
-end
-
-def send_to_sumo(sumo_url, log_group, log_stream, data)
-  response = Net::HTTP.start(sumo_url.host, sumo_url.port, use_ssl: sumo_url.scheme == 'https') do |http|
-    http.open_timeout = 3
-    http.read_timeout = 3
-
-    req = Net::HTTP::Post.new(
-      sumo_url,
-      {
-        'X-Sumo-Category' => log_group,
-        'X-Sumo-Client' => 'cwl-aws-lambda',
-        'X-Sumo-Host' => log_group,
-        'X-Sumo-Name' => log_stream,
-        'Accept' => 'application/json',
-        'Content-Type' => 'application/json'
-      }
-    )
-
-    req.body = data.to_json
-
-    http.request(req)
-  end
-
-  if response.code != '200'
-    response.error!
+    def send_to_sumo(sumo_url, log_group, log_stream, data)
+      response = Net::HTTP.start(sumo_url.host, sumo_url.port, use_ssl: sumo_url.scheme == 'https') do |http|
+        http.open_timeout = 3
+        http.read_timeout = 3
+
+        req = Net::HTTP::Post.new(
+          sumo_url,
+          {
+            'X-Sumo-Category' => log_group,
+            'X-Sumo-Client' => 'cwl-aws-lambda',
+            'X-Sumo-Host' => log_group,
+            'X-Sumo-Name' => log_stream,
+          }
+        )
+
+        req.body = data
+
+        http.request(req)
+      end
+
+      if response.code != '200'
+        response.error!
+      end
+    end
   end
 end

data/lib/tpt_serverless/version.rb

@@ -1,3 +1,3 @@
 module TptServerless
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tpt_serverless
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - TpT
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-03-02 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: