opentrace 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad0233533a9c236a70cf379346c1f64f7ffecc58cf91ce413e55665e8b4f5675
-  data.tar.gz: 92d7052f7901fad33897b767441ea01f8ed299bc47d90d43153110a2fdd22c1e
+  metadata.gz: e5c67d0aecd2be7ec0624bd339bda99a46d8c2de8d0a04009d6778f94cefee3d
+  data.tar.gz: 0b54c97978becc24a2339e1f615de4f715388fc9247dc88099880dc7e1532a43
 SHA512:
-  metadata.gz: 6f9b631bf0faab3e6671a41eccc04039339f2f95cfa90a6c380517572256c08c3115bb4c30ddae230933bac18f8c9858195a55beacda27ff2e44c5efb02ef4f7
-  data.tar.gz: 3671e28a4393225a5e891c09a38a734b974c05b70fd393ff892b06bb816fd5954880f7eab5da257248fe025df948f96b0fb94b2f526338d060a928514d5a4917
+  metadata.gz: 60bc99ef6e4e950851358a9dbf3b2b8342209f81ff24d58eb248c07362657d4c040c1f60e6e8fdb3cb56d625cac4f8b9a4641e953241a1af52195f27232790f6
+  data.tar.gz: d655b2237f513c8b3fe8a12e936086937fc80b1f50d5bb3766b6e5ef3ed1a137d90bf9798546aa99413633dba9e9588c87f2b99d4e54e226c0842fea720f309e

data/lib/opentrace/payload_builder.rb

@@ -28,12 +28,18 @@ module OpenTrace
 
       static_ctx = OpenTrace.send(:static_context)
       static_ctx.each { |k, v| meta[k] ||= v }
-      meta[:request_id] ||= request_id if request_id
 
       # Extract trace_id from metadata if user provided it there
       meta_trace_id = meta.delete(:trace_id)
       effective_trace_id = meta_trace_id || trace_id
 
+      # Promote indexed fields to top-level (remove from metadata to avoid duplication)
+      commit_hash = meta.delete(:git_sha)
+      effective_request_id = meta.delete(:request_id) || request_id
+      exception_class = meta.delete(:exception_class)
+      error_fingerprint = meta.delete(:error_fingerprint)
+      source_file, source_line = extract_source_location(meta[:backtrace])
+
       payload = {
         timestamp: format_timestamp(ts),
         level: level.to_s.upcase,
@@ -43,6 +49,12 @@ module OpenTrace
         metadata: meta.compact
       }
 
+      payload[:commit_hash] = commit_hash if commit_hash
+      payload[:request_id] = effective_request_id.to_s if effective_request_id
+      payload[:exception_class] = exception_class if exception_class
+      payload[:error_fingerprint] = error_fingerprint if error_fingerprint
+      payload[:source_file] = source_file if source_file
+      payload[:source_line] = source_line if source_line && source_line > 0
       payload[:event_type] = event_type.to_s if event_type
       payload[:trace_id] = effective_trace_id.to_s if effective_trace_id
       payload[:span_id] = span_id if span_id
@@ -69,13 +81,19 @@ module OpenTrace
         meta[:user_id] = cached_ctx[:user_id]
       end
 
+      exception_class = nil
+      error_fingerprint = nil
+      source_file = nil
+      source_line = nil
+
       if exc_class
-        meta[:exception_class] = exc_class
+        exception_class = exc_class
         meta[:exception_message] = exc_message&.slice(0, 500)
         if exc_backtrace
           cleaned = clean_backtrace(exc_backtrace)
           meta[:backtrace] = cleaned.first(15)
-          meta[:error_fingerprint] = OpenTrace.send(:compute_error_fingerprint, exc_class, cleaned)
+          error_fingerprint = OpenTrace.send(:compute_error_fingerprint, exc_class, cleaned)
+          source_file, source_line = extract_source_location(cleaned)
         end
       end
 
@@ -119,6 +137,10 @@ module OpenTrace
                 end
       meta[:transaction_name] = transaction_name if transaction_name
 
+      # Promote indexed fields to top-level (remove from metadata to avoid duplication)
+      commit_hash = meta.delete(:git_sha)
+      effective_request_id = meta.delete(:request_id) || request_id
+
       payload = {
         timestamp: format_timestamp(started),
         level: level,
@@ -127,6 +149,12 @@ module OpenTrace
         message: message,
         metadata: meta.compact
       }
+      payload[:commit_hash] = commit_hash if commit_hash
+      payload[:request_id] = effective_request_id.to_s if effective_request_id
+      payload[:exception_class] = exception_class if exception_class
+      payload[:error_fingerprint] = error_fingerprint if error_fingerprint
+      payload[:source_file] = source_file if source_file
+      payload[:source_line] = source_line if source_line && source_line > 0
       payload[:trace_id] = trace_id.to_s if trace_id
       payload[:span_id] = span_id if span_id
       payload[:parent_span_id] = parent_span_id if parent_span_id
@@ -145,6 +173,22 @@ module OpenTrace
       end
     end
 
+    # Extract source file and line number from the first app-relevant backtrace line.
+    # Format: "app/controllers/users_controller.rb:42:in `show'"
+    def extract_source_location(backtrace)
+      return [nil, nil] unless backtrace.is_a?(Array) && !backtrace.empty?
+
+      line = backtrace.first.to_s
+      parts = line.split(":", 3)
+      return [nil, nil] if parts.length < 2
+
+      file = parts[0]
+      line_num = parts[1].to_i
+      [file, line_num]
+    rescue StandardError
+      [nil, nil]
+    end
+
     def clean_backtrace(backtrace)
       if defined?(::Rails) && ::Rails.respond_to?(:backtrace_cleaner)
         ::Rails.backtrace_cleaner.clean(backtrace)

data/lib/opentrace/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenTrace
-  VERSION = "0.15.0"
+  VERSION = "0.15.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opentrace
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - OpenTrace