logbrew-sdk 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f086729efb0a0a98821ef3bce8d96b71066b202beff5656917d958e4ca119479
-  data.tar.gz: 7c5eafb18cda7d001dc8c72c9646852e857a46bd4e06508abeda5a23365489a1
+  metadata.gz: 23bb3971a708e01fb3baa93461beb30dda7ff5a6d1b807a6f21a2c4365b718ee
+  data.tar.gz: 2254bb2a7317aa32053e43ae2463ba527c8ec4bd9d7147d31a1c085df690857d
 SHA512:
-  metadata.gz: 583a7cdc7ccc4ea1435a31454c0d90cea390a7b9f37e1322c3f39bc84bf0b2c731aaa08abff5384675871f62082fd8fc98c5c2c7284ad89a1fb6c9b1221982e0
-  data.tar.gz: 5093fb1d5ea5540302c6a99c8d6fa7ce1b66142a55010c7d867e1f0539d1fe57525270486c59e58acd687a68bb51e44aaa62f480a3c119681648d9a876d70fbb
+  metadata.gz: b516708afcb021d131aac74c02b0dae2b97d04875f45ec408ff431a5046d2c12af0e824ddddbd5e9280c934ed2a016615cabb4e9d035174c2da99e4806afbc14
+  data.tar.gz: '09b94b37beba32a8956b06295ca7ad0b4f16b0de21e1148a127797f1fd61f0c7763dc85b336ee7a8e249dbd38f02e2e878aadb855dc6beb4404584a5ae6b89d4'

data/README.md

@@ -23,7 +23,7 @@ needed:
 
 ```ruby
 # Gemfile
-gem "logbrew-sdk", "~> 0.1.7"
+gem "logbrew-sdk", "~> 0.1.8"
 ```
 
 ```bash

data/lib/logbrew/trace.rb

@@ -240,7 +240,7 @@ module LogBrew
 
     private
 
-    def capture_request_span(env, status_code, elapsed_ms, status)
+    def capture_request_span(env, status_code, elapsed_ms, status, timestamp)
       context = rack_trace_context(env)
       attributes = {
         name: request_name(env),
@@ -252,31 +252,21 @@ module LogBrew
       }
       attributes[:parentSpanId] = context.parent_span_id if context && context.parent_span_id
 
-      @client.span(next_event_id("span"), logbrew_timestamp, attributes)
+      @client.span(next_event_id("span"), timestamp, attributes)
     end
 
     def trace_id(env)
-      context = rack_trace_context(env)
-      return context.trace_id if context
-
-      super
+      rack_trace_context(env)&.trace_id || super
     end
 
     def span_id(env)
-      context = rack_trace_context(env)
-      return context.span_id if context
-
-      super
+      rack_trace_context(env)&.span_id || super
     end
 
     def request_metadata(env, status_code)
       Trace.add_metadata(super, rack_trace_context(env))
     end
 
-    def exception_metadata(env, error)
-      Trace.add_metadata(super, rack_trace_context(env))
-    end
-
     def rack_trace_context(env)
       trace = env["logbrew.trace"] if env.respond_to?(:[])
       trace.is_a?(TraceContext) ? trace : Trace.current

data/lib/logbrew/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LogBrew
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/logbrew.rb

@@ -45,9 +45,9 @@ module LogBrew
       metadata.each_with_object({}) { |(key, value), copied| copied[key.to_s] = value if primitive_metadata_value?(value) }
     end
 
-    def logbrew_timestamp
+    def logbrew_timestamp(precision = nil)
       timestamp = @timestamp_provider.respond_to?(:call) ? @timestamp_provider.call : Time.now
-      timestamp.respond_to?(:iso8601) ? timestamp.iso8601 : timestamp.to_s
+      timestamp.respond_to?(:iso8601) ? timestamp.iso8601(*[precision].compact) : timestamp.to_s
     end
 
     def capture_safely
@@ -412,36 +412,42 @@ module LogBrew
 
     def call(env)
       started_at = monotonic_time
-      begin
-        response = @app.call(env)
+      started_timestamp, timestamp_error = request_timestamp
+      response = begin
+        @app.call(env)
       rescue StandardError => error
-        status_code = exception_status_code(error)
-        capture_safely do
-          capture_exception_issue(env, error) if status_code >= 500
-          capture_request_span(env, status_code, duration_ms(started_at), status_code >= 500 ? "error" : "ok")
-          flush_if_configured
-        end
+        capture_request(env, exception_status_code(error), started_at, started_timestamp, timestamp_error, error)
         raise
       end
+      capture_request(env, rack_status(response), started_at, started_timestamp, timestamp_error)
+      response
+    end
+
+    private
 
-      status_code = rack_status(response)
+    def capture_request(env, status_code, started_at, timestamp, timestamp_error, error = nil)
       capture_safely do
-        capture_request_span(env, status_code, duration_ms(started_at), status_code >= 500 ? "error" : "ok")
+        raise timestamp_error unless timestamp_error.nil?
+        capture_exception_issue(env, error, logbrew_timestamp(6)) if error && status_code >= 500
+        capture_request_span(env, status_code, duration_ms(started_at), status_code >= 500 ? "error" : "ok", timestamp)
         flush_if_configured
       end
-      response
     end
 
-    private
+    def request_timestamp
+      [logbrew_timestamp(6), nil]
+    rescue StandardError => error
+      [nil, error]
+    end
 
     def exception_status_code(_error)
       500
     end
 
-    def capture_request_span(env, status_code, elapsed_ms, status)
+    def capture_request_span(env, status_code, elapsed_ms, status, timestamp)
       @client.span(
         next_event_id("span"),
-        logbrew_timestamp,
+        timestamp,
         name: request_name(env),
         traceId: trace_id(env),
         spanId: span_id(env),
@@ -451,7 +457,7 @@ module LogBrew
       )
     end
 
-    def capture_exception_issue(env, error)
+    def capture_exception_issue(env, error, timestamp)
       attributes = IssueDiagnostics.from_exception(
         error,
         message: @include_exception_message ? error.message : nil,
@@ -459,7 +465,7 @@ module LogBrew
         handled: false,
         metadata: exception_metadata(env, error)
       )
-      @client.issue(next_event_id("issue"), logbrew_timestamp, attributes)
+      @client.issue(next_event_id("issue"), timestamp, attributes)
     end
 
     def next_event_id(kind)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logbrew-sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - LogBrew