loga 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a97eae050b9e31ef0ddb1e6f327563c4e0f54eb1a42ea7bb53b03e22c8fb9c9
-  data.tar.gz: 771373253651884fead19e93038d5c7e31827d3c562d2cd748e0acd66f31124e
+  metadata.gz: dc1346e981871beb7504038280a989df0b08f8758de0aafbc2ad6353bf15b37b
+  data.tar.gz: 7cca9a16fd0d79616445d8b497d28064b4e62c5b9ec075594787e069020d031c
 SHA512:
-  metadata.gz: 28d17a44bf2c8c0a919916438c8935a4033e14176185ca87ff69987ee03507dee5ae854c2887ff89d174c78fd0fa846b8d8237392b6705eb552365202f2f7680
-  data.tar.gz: 45bf838fa85c9a3a01ba1134034b2ab2e577cd9f9c28ecceaf175935ff69627f156856dc8e383b5212829636934657ee4fb0c40f5e5e992a54eb1027ee47d74f
+  metadata.gz: 9b644025cbf6f8ff20b5980d8c261146a3832b2ea0e18eec3efabd1c8d7fbb75b540591fe5eb480a3475c8e646a85fd274a2352c9ed95baebf84ec01c29c8a8b
+  data.tar.gz: 5b5b9ae15e5383bb6b8b48e2a990b340134c2e77391fef261a275ae47e41b95538a9ba95553820d335634bdd8cbd1530f839bae8dade08b8bfd57af18dfd15aa

data/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.8.0] - 2023-11-14
+### Added
+- Support open-telemetry and add trace_id and span_id to logs events
+
 ## [2.7.0] - 2023-03-28
 ### Added
 - Support for sidekiq 7

data/lib/loga/formatters/gelf_formatter.rb

@@ -39,12 +39,7 @@ module Loga
       private
 
       def build_event(time, message)
-        event = case message
-                when Loga::Event
-                  message
-                else
-                  Loga::Event.new(message: message)
-                end
+        event = message.is_a?(Loga::Event) ? message : Loga::Event.new(message: message)
 
         event.timestamp ||= time
         # Overwrite sidekiq_context data anything manually specified
@@ -54,6 +49,7 @@ module Loga
           hash.merge! compute_type(event.type)
           # Overwrite hash with Loga's additional fields
           hash.merge! loga_additional_fields
+          hash.merge! open_telemetry_fields
         end
         event
       end
@@ -103,6 +99,17 @@ module Loga
         }
       end
 
+      def open_telemetry_fields
+        return {} unless defined?(::OpenTelemetry::Trace)
+
+        span = ::OpenTelemetry::Trace.current_span
+
+        {
+          trace_id: span.context.hex_trace_id,
+          span_id: span.context.hex_span_id,
+        }
+      end
+
       def sidekiq_context
         return {} unless defined?(::Sidekiq::Context)
 

data/lib/loga/version.rb

@@ -1,3 +1,3 @@
 module Loga
-  VERSION = '2.7.0'.freeze
+  VERSION = '2.8.0'.freeze
 end

data/spec/unit/loga/formatters/gelf_formatter_spec.rb

@@ -209,6 +209,29 @@ describe Loga::Formatters::GELFFormatter do
       end
     end
 
+    context 'when working with additional fields via otel' do
+      let(:options) { { message: 'Wooden house' } }
+      let(:message) { Loga::Event.new(options) }
+      let(:trace_context) { { hex_trace_id: '123', hex_span_id: '456' } }
+
+      before do
+        klass = Class.new do
+          class << self
+            attr_accessor :current_span
+          end
+        end
+        klass.current_span = OpenStruct.new(context: OpenStruct.new(trace_context))
+        stub_const('::OpenTelemetry::Trace', klass)
+      end
+
+      it 'includes the trace_id and span_id' do
+        expect(json['_trace_id']).to eq('123')
+        expect(json['_span_id']).to eq('456')
+      end
+
+      include_examples 'valid GELF message'
+    end
+
     {
       'DEBUG'   => 7,
       'INFO'    => 6,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loga
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Funding Circle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-03 00:00:00.000000000 Z
+date: 2023-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport