lenjador 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d96edbeff69ee13444e45a5924d8fedd4907725831f9ce62fd2f3280b48b244
-  data.tar.gz: b7e501d6a7dba6b7461df12e72530796900a4241700dd676c48d6e6f8341e0b2
+  metadata.gz: f6196d724a25318d7d37585d8240aeadf4539730a3d2456852e99f00a703ad60
+  data.tar.gz: aefd0d89ad20ed8f1decdd5e084adee315fdc6dbc14702fc26747f83b81274ec
 SHA512:
-  metadata.gz: b1142e4a26fb13f3ba2d880de8c3b58e18eacc77de055d36b10c3a9783c6c1d597a50aab94f1611a43fc17f8490f6598049da6f5d4c9ed73af77be2fa5ccb26e
-  data.tar.gz: 6f6d29354c80eae57485fc2f3fa5f6e0643aad692763957ab43c8ba3041a8f5d9cbba6fb3e9453a121c6634d5e7e776d82df0286a966b97613d03c437b602827
+  metadata.gz: 74e4d77b7bbe1867605dac6cd7edfa7e5b7ff5fdf7d2699422c49a0bd6168d531174d7f4c2f594b104afb4e90eaf5d0926c595d5543f3c56bea16d156465a283
+  data.tar.gz: 1bb069818e94912e408cd7cd95fa09db743336dd3242ebccd1b0029cb887b3dcf223cc4aa207ee2f543dac9044b38e6549ace8efe24453a4aae8f1380c898ccc

data/lenjador.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'lenjador'
-  gem.version       = '2.1.0'
+  gem.version       = '2.2.0'
   gem.authors       = ['Salemove']
   gem.email         = ['support@salemove.com']
   gem.description   = "It's lenjadoric"
@@ -23,6 +23,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'benchmark-ips'
   gem.add_development_dependency 'bundler'
+  gem.add_development_dependency 'opentelemetry-api'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'

data/lib/lenjador/adapters/stdout_json_adapter.rb

@@ -5,7 +5,6 @@ class Lenjador
     class StdoutJsonAdapter
       def initialize(service_name)
         @application_name = Utils.application_name(service_name)
-        @mutex = Mutex.new if RUBY_ENGINE == 'jruby'
       end
 
       def log(level, metadata = {})
@@ -20,10 +19,6 @@ class Lenjador
         def print_line(str)
           $stdout.puts(str)
         end
-      elsif RUBY_ENGINE == 'jruby'
-        def print_line(str)
-          @mutex.synchronize { $stdout.write("#{str}\n") }
-        end
       else
         def print_line(str)
           $stdout.write("#{str}\n")

data/lib/lenjador/utils.rb

@@ -63,17 +63,37 @@ class Lenjador
       word
     end
 
-    # Tracing information
-    #
-    # Tracing information is included only if OpenTracing is defined and if it
-    # supports method called `active_span` (version >= 0.4.1). We use
-    # SpanContext#trace_id and SpanContext#span_id methods to retrieve tracing
-    # information. These methods are not yet supported by the OpenTracing API,
-    # so we first check if these methods exist. Popular tracing libraries
-    # already implement them. These methods are likely to be added to the API
-    # very soon: https://github.com/opentracing/specification/blob/master/rfc/trace_identifiers.md
     def self.tracing_information
-      return NO_TRACE_INFORMATION if !defined?(OpenTracing) || !OpenTracing.respond_to?(:active_span)
+      tracing_information_from_opentelemetry ||
+        tracing_information_from_opentracing ||
+        NO_TRACE_INFORMATION
+    end
+    private_class_method :tracing_information
+
+    def self.tracing_information_from_opentelemetry
+      return nil unless defined?(OpenTelemetry)
+
+      current_span_context = OpenTelemetry::Trace.current_span.context
+      return nil unless current_span_context.valid?
+
+      {
+        trace_id: current_span_context.hex_trace_id,
+        span_id: current_span_context.hex_span_id
+      }
+    end
+    private_class_method :tracing_information_from_opentelemetry
+
+    # Tracing information is included only if OpenTracing supports method
+    # called `active_span` (version >= 0.4.1). We use SpanContext#trace_id and
+    # SpanContext#span_id methods to retrieve tracing information. These
+    # methods are not yet supported by the OpenTracing API, so we first check
+    # if these methods exist. Popular tracing libraries already implement them.
+    # These methods are likely to be added to the API very soon:
+    # https://github.com/opentracing/specification/blob/master/rfc/trace_identifiers.md
+    #
+    # @deprecated Use OpenTelemetry instead
+    def self.tracing_information_from_opentracing
+      return nil if !defined?(OpenTracing) || !OpenTracing.respond_to?(:active_span)
 
       context = OpenTracing.active_span&.context
       if context && context.respond_to?(:trace_id) && context.respond_to?(:span_id)
@@ -81,10 +101,8 @@ class Lenjador
           trace_id: context.trace_id,
           span_id: context.span_id
         }
-      else
-        NO_TRACE_INFORMATION
       end
     end
-    private_class_method :tracing_information
+    private_class_method :tracing_information_from_opentracing
   end
 end

data/spec/lenjador/utils_spec.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
+require 'opentelemetry-api'
 
 describe Lenjador::Utils do
   let(:now) { Time.utc(2015, 10, 11, 23, 10, 21, 123_456) }
@@ -46,6 +47,27 @@ describe Lenjador::Utils do
       end
     end
 
+    context 'when OpenTelemetry is defined' do
+      it 'includes trace information' do
+        provider = OpenTelemetry.tracer_provider
+
+        tracer = provider.tracer('my_app', '1.0')
+        recorded_event = tracer.in_span('my_task') do |_task_span|
+          event
+        end
+
+        expect(recorded_event).to include(
+          trace_id: instance_of(String),
+          span_id: instance_of(String)
+        )
+      end
+
+      it 'does not include trace information if span is invalid' do
+        expect(OpenTelemetry::Trace.current_span.context).not_to be_valid
+        expect(event).not_to include(:trace_id, :span_id)
+      end
+    end
+
     context 'when OpenTracing is defined' do # rubocop:disable RSpec/MultipleMemoizedHelpers
       let(:trace_id) { 'trace-id' }
       let(:span_id) { 'span-id' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lenjador
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Salemove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-21 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lru_redux
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement