datadog-json_logger 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beb6fb82518d662d8db07b415cc953e99fc67348208aa5f34a1b02111ce487a8
-  data.tar.gz: d555d69fe127aaedd4505b69e0d790cc03d43eb23a711895cc46fc35cd10d19c
+  metadata.gz: 25aa55fc996314835493e0d134ffdf5c44080a36a27a3b82d21977d19623c565
+  data.tar.gz: 49c7e190cafd5dd5291afdb8f9baf0d0b655179e45763920fe188590f9692693
 SHA512:
-  metadata.gz: 6710e8f18de45387168fafc58bfb54d84731af279707a9c1788c60f569b846dd581d080d8f7e8ebb8e70e24f2d66ff88829ca5e9d1e51cfb2f7c6550ba36abc8
-  data.tar.gz: a707d9786bf1fb06ce3607b134fd6feb892d60287f94eb7e87888d76ffcb56872d8faa513f8c81cf43db18d9de65770f66814f5147884deb2efa56e29f7c04a0
+  metadata.gz: 9c8c19712e5653add057734e39f22c6266fd60649868cb297ac5e79aa179c695645c12111b0a1d072af24707907472720d7618872a18278926c18ab5f5bd31ef
+  data.tar.gz: 8975469ccdefd6b762ef0605f8c1baa0923d3a6a5d8e15f24eaa1b8bd27fd2be3b93d453fa9c23e1340c44d399a06e2dceacfd9725f26b4cea216163facba413

data/datadog-json_logger.gemspec

@@ -16,6 +16,13 @@ Gem::Specification.new do |spec|
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
+  if ENV.fetch('GEM_PUSHER', 'default') == 'github'
+    spec.metadata['allowed_push_host'] = 'https://rubygems.pkg.github.com/buyco'
+  else
+    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+  end
+
+
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/eth3rnit3/datadog-json_logger"
   spec.metadata["changelog_uri"] = "https://github.com/eth3rnit3/datadog-json_logger/blob/main/CHANGELOG.md"

data/lib/datadog/loggers/version.rb

@@ -2,6 +2,6 @@
 
 module Datadog
   module Loggers
-    VERSION = "0.1.3"
+    VERSION = "0.1.5"
   end
 end

data/lib/datadog/sinatra_middleware.rb

@@ -16,16 +16,21 @@ module Datadog
   class SinatraMiddleware
     attr_reader :app, :logger
 
-    def initialize(app, logger)
+    def initialize(app, logger, opt = {})
       @app = app
       @logger = logger
+      @raise_exceptions = opt.fetch(:raise_exceptions, false)
     end
 
     def call(env)
       request = Rack::Request.new(env)
       start_time = Time.now
 
-      status, headers, body = safely_process_request(env)
+      status, headers, body = if @raise_exceptions
+                                app.call(env)
+                              else
+                                safely_process_request(env)
+                              end
       end_time = Time.now
 
       log_request(request, env, status, headers, start_time, end_time)
@@ -39,8 +44,8 @@ module Datadog
 
     def safely_process_request(env)
       app.call(env)
-    rescue StandardError
-      [500, { "Content-Type": "text/html" }, ["Internal Server Error"]]
+    rescue StandardError => e
+      [500, { "Content-Type": "application/json" }, [e.class.name, e.message].join(": ")]
     end
 
     def log_request(request, env, status, headers, start_time, end_time)
@@ -49,6 +54,7 @@ module Datadog
         request_ip: request.ip,
         method: request.request_method,
         controller: env["sinatra.controller_name"],
+        resource: env["sinatra.resource_name"] || env["sinatra.controller_name"],
         action: env["sinatra.action_name"],
         path: request.path,
         params: parse_query(request.query_string),
@@ -57,9 +63,18 @@ module Datadog
         duration: calculate_duration(start_time, end_time)
       }
 
+      log_data[:message] = message(log_data)
+
       logger.info(log_data)
     end
 
+    def message(log_data)
+      "Received #{log_data[:method]} request from #{log_data[:request_ip]} " \
+        "to #{log_data[:controller]}##{log_data[:action]} at #{log_data[:path]} " \
+        "with params #{log_data[:params].to_json}. Responded with status #{log_data[:status]} " \
+        "in #{log_data[:duration]}ms. Content-Type: #{log_data[:format]}."
+    end
+
     def calculate_duration(start_time, end_time)
       ((end_time - start_time) * 1000).round # Duration in milliseconds
     end

data/sig/datadog/sinatra_middleware.rbs

@@ -7,14 +7,13 @@ end
 module Datadog
   class SinatraMiddleware
     @app: untyped
-
     @logger: Logger
+    @raise_exceptions: bool
 
     attr_reader app: untyped
-
     attr_reader logger: Logger
 
-    def initialize: (untyped app, Logger logger) -> void
+    def initialize: (untyped app, Logger logger, ?Hash[Symbol, untyped] opt) -> void
 
     def call: (untyped env) -> untyped
 
@@ -23,6 +22,8 @@ module Datadog
     def safely_process_request: (untyped env) -> untyped
 
     def log_request: (Rack::Request request, untyped env, String status, Hash[String, String] headers, Time start_time, Time end_time) -> untyped
+                   
+    def message: (Hash[Symbol, untyped] log_data) -> String
 
     def calculate_duration: (Time start_time, Time end_time) -> Integer
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datadog-json_logger
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Eth3rnit3