helios-opentelemetry-sdk 0.1.19 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1333d4f45a6affbdc086bb2e8e98f8871e7a295a50e4dd87f624b60ca4be78e
-  data.tar.gz: b50075cf28a40a5ccc36dd39c46d6c1323b8a6514e027f558f3fc1cb4439e0e6
+  metadata.gz: 71228262be35fda8a5c39eb237ca42493837d315d9ae146dd69c04210905a731
+  data.tar.gz: 19125d421f0a1f086875a97f68b637d3b57df214a542e70c9cbdc9be472dd190
 SHA512:
-  metadata.gz: d6467ee1a6eabce6fb8a743e536c8e83ba3bbdb9705b62fd9793552ef163b9d69a43649e13d948f686d4d4a6cbb4da02ad3f90e5a65b59d66d497a7757d89a91
-  data.tar.gz: 9b96c5e12e92befd75f0d5f650b2119e79279efe19e4b2aa4e1b69cceb7939a4f90f8eddc5ee495fa0bbfa72c435ae86ae4012634f6c514f93233aa00bf3337d
+  metadata.gz: 2fac93ce1793b9e423f0b7c034e14367c69a64fc2be163a57dc6feb7035310d8a4dee2ddec29a56c962e52db0379375a71f660f88e00be019ded30c1431e6574
+  data.tar.gz: 5840af6374120b29742da322c7a0780907f293fb884a2892cb387c916fd54b6487c8da9747f5e1b9e0cb25f720724a6c2f96438fb047c530a097f07991b8f1f5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    helios-opentelemetry-sdk (0.1.19)
+    helios-opentelemetry-sdk (0.1.20)
       opentelemetry-exporter-otlp (~> 0.22.0)
       opentelemetry-instrumentation-all (~> 0.25.0)
       opentelemetry-instrumentation-rspec (~> 0.2.0)

data/lib/helios/opentelemetry/sdk/helios_processor.rb

@@ -0,0 +1,12 @@
+require 'opentelemetry/sdk'
+
+HELIOS_TEST_TRIGGERED_TRACE = 'hs-triggered-test'.freeze
+
+class HeliosProcessor < ::OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor
+  def on_start(span, parent_context)
+    baggage = ::OpenTelemetry::Baggage.values(context: parent_context)
+    return unless baggage.key?(HELIOS_TEST_TRIGGERED_TRACE)
+
+    span.set_attribute(HELIOS_TEST_TRIGGERED_TRACE, 'true')
+  end
+end

data/lib/helios/opentelemetry/sdk/patches/net_http_patch.rb

@@ -7,18 +7,10 @@ module NetHttpPatch
   module Instrumentation
     def request(req, body = nil, &block)
       current_span = OpenTelemetry::Trace.current_span
-      current_span.set_attribute(Helios::OpenTelemetry::SemanticAttributes::HTTP_REQUEST_HEADERS,
-                                 collect_headers(req))
-      current_span.set_attribute(OpenTelemetry::SemanticConventions::Trace::HTTP_URL, req.uri&.to_s)
-      unless body.nil?
-        current_span.set_attribute(Helios::OpenTelemetry::SemanticAttributes::HTTP_REQUEST_BODY,
-                                   body.is_a?(String) ? body : body.to_s)
-      end
+      extract_request_attributes(current_span, req, body)
 
       super(req, body, &block).tap do |response|
-        current_span.set_attribute(Helios::OpenTelemetry::SemanticAttributes::HTTP_RESPONSE_HEADERS,
-                                   collect_headers(response))
-        current_span.set_attribute(Helios::OpenTelemetry::SemanticAttributes::HTTP_RESPONSE_BODY, response.body)
+        extract_response_attributes(current_span, response)
       end
     end
 
@@ -37,6 +29,17 @@ module NetHttpPatch
         span.set_attribute(Helios::OpenTelemetry::SemanticAttributes::HTTP_REQUEST_BODY,
                            body.is_a?(String) ? body : body.to_s)
       end
+
+      url = req.uri&.to_s
+      sem_conv = OpenTelemetry::SemanticConventions::Trace
+      if url.nil?
+        scheme = span.attributes[sem_conv::HTTP_SCHEME]
+        hostname = span.attributes[sem_conv::HTTP_HOST] || span.attributes[sem_conv::NET_PEER_NAME]
+        target = span.attributes[sem_conv::HTTP_TARGET]
+        url = "#{scheme}://#{hostname}#{target}" if scheme && hostname && target
+      end
+
+      span.set_attribute(sem_conv::HTTP_URL, url) unless url.nil?
     rescue StandardError => e
       ::OpenTelemetry.logger.debug("Error extracting net http request attributes: #{e}")
     end

data/lib/helios/opentelemetry/sdk/version.rb

@@ -1,7 +1,7 @@
 module Helios
   module OpenTelemetry
     module SDK
-      VERSION = '0.1.19'
+      VERSION = '0.1.21'
     end
   end
 end

data/lib/helios/opentelemetry/sdk.rb

@@ -3,6 +3,7 @@ require 'opentelemetry/exporter/otlp'
 require 'opentelemetry/instrumentation/all'
 require_relative 'sdk/version'
 require_relative 'sdk/instrumentations'
+require_relative 'sdk/helios_processor'
 
 module Helios
   module OpenTelemetry
@@ -37,11 +38,11 @@ module Helios
           end
           c.resource = ::OpenTelemetry::SDK::Resources::Resource.create(resource_attrs)
           apply_instrumentations(c)
-          c.add_span_processor(
-            ::OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor.new(
-              get_span_exporter(helios_config)
-            )
-          )
+          c.add_span_processor(HeliosProcessor.new(get_span_exporter(helios_config)))
+          puts 'Helios tracing initialized (' \
+            "service: #{service_name}, " \
+            "token: #{api_token[0, 3]}*****, " \
+            "environment: #{environment})"
         end
 
         send_debug_span

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helios-opentelemetry-sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.21
 platform: ruby
 authors:
 - Team Helios
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-04 00:00:00.000000000 Z
+date: 2022-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,6 +129,7 @@ files:
 - bin/setup
 - helios-opentelemetry-sdk.gemspec
 - lib/helios/opentelemetry/sdk.rb
+- lib/helios/opentelemetry/sdk/helios_processor.rb
 - lib/helios/opentelemetry/sdk/instrumentations.rb
 - lib/helios/opentelemetry/sdk/patches/faraday_patch.rb
 - lib/helios/opentelemetry/sdk/patches/mongo_patch.rb