helios-opentelemetry-sdk 0.1.14 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e7f2f77a8b66880739f7a053fd1e0ac0ed6a9330d9d9068ccbeb060460ba7db
-  data.tar.gz: 806da26e71661cb27095bcc616d098b1a36af5ffbb4699e461cdeae5d0e077f4
+  metadata.gz: 82426806e8d43f898618e45a8b6285f55911cfac228a3182570172c87507d905
+  data.tar.gz: 771fa774bc6f35b9594fa7b4079294bbef6a722cc6ec81fe65ff21d99f388638
 SHA512:
-  metadata.gz: 4dd2dac65944039de49814d7958161bcd5317864bc1bc3b35c89024691739ce4dd4bdfbd168fcd9a2a2df75212dea7c7a7c81e716156880c5e5ce6bc8618aee0
-  data.tar.gz: f5ae7746690135bf149d897fcb61fe53709a5b7bc0f8f7ed32c48116b686a2a74e4b3d79f762ce0c16425cbfb5b7cc760da4f9d23c69a848c97fa03132e03df5
+  metadata.gz: 58cf30a126082e5bc20893172165647a9cdbec2bea5dc2bd847293f1d8eb120d73620a8e676e5d6c38d7486511daf05652e7c46c18787b70cec4b354c54ef88a
+  data.tar.gz: 40fa5d278137ade4190316222108855bf7fea06fd24cc77c61a3ff063206d2246c22aacac99701a30a423a33e2e5e8a71b9b14bb53f970090b16e0ffe7295e0b

data/.rubocop.yml

@@ -21,3 +21,9 @@ Style/HashSyntax:
 
 Metrics/BlockLength:
   Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false

data/Gemfile.lock

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

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

@@ -5,6 +5,11 @@ require_relative '../../semantic_attributes'
 module FaradayPatch
   module HeliosFaradayMiddleware
     def trace_response(span, env)
+      extract_additional_attributes(span, env)
+      super(span, env)
+    end
+
+    def extract_additional_attributes(span, env)
       request_headers = env.request_headers
       semantic_attributes = Helios::OpenTelemetry::SemanticAttributes
       span.set_attribute(semantic_attributes::HTTP_REQUEST_HEADERS, request_headers.to_json)
@@ -12,8 +17,8 @@ module FaradayPatch
       response_headers = env.response_headers
       span.set_attribute(semantic_attributes::HTTP_RESPONSE_HEADERS, response_headers.to_json)
       span.set_attribute(semantic_attributes::HTTP_RESPONSE_BODY, env.response_body) unless env.response_body.nil?
-
-      super(span, env)
+    rescue StandardError
+      # Do nothing
     end
   end
 end

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

@@ -6,7 +6,8 @@ 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(Helios::OpenTelemetry::SemanticAttributes::HTTP_REQUEST_HEADERS,
+                                 collect_headers(req))
       unless body.nil?
         current_span.set_attribute(Helios::OpenTelemetry::SemanticAttributes::HTTP_REQUEST_BODY,
                                    body.is_a?(String) ? body : body.to_s)
@@ -27,5 +28,23 @@ module NetHttpPatch
 
       headers.to_json
     end
+
+    def extract_request_attributes(span, req, body)
+      ::OpenTelemetry.logger.warn('aaaaaaa')
+      span.set_attribute(Helios::OpenTelemetry::SemanticAttributes::HTTP_REQUEST_HEADERS, collect_headers(req))
+      unless body.nil?
+        span.set_attribute(Helios::OpenTelemetry::SemanticAttributes::HTTP_REQUEST_BODY,
+                           body.is_a?(String) ? body : body.to_s)
+      end
+    rescue StandardError
+      # Do nothing
+    end
+
+    def extract_response_attributes(span, response)
+      span.set_attribute(Helios::OpenTelemetry::SemanticAttributes::HTTP_RESPONSE_HEADERS, collect_headers(response))
+      span.set_attribute(Helios::OpenTelemetry::SemanticAttributes::HTTP_RESPONSE_BODY, response.body)
+    rescue StandardError
+      # Do nothing
+    end
   end
 end

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

@@ -6,24 +6,35 @@ module RackPatch
   module HeliosRackMiddleware
     def request_span_attributes(env:)
       res = super(env: env)
+      extract_request_attributes(env, res)
+      res
+    end
+
+    def set_attributes_after_request(span, status, headers, response)
+      extract_response_attributes(span, headers, response)
+      super(span, status, headers, response)
+    end
+
+    def extract_request_attributes(env, res)
       # Request headers are attributes in the env hash that start with HTTP_
       request_headers = env.select { |k, _v| k.start_with? 'HTTP_' }.transform_keys { |k| k.sub(/^HTTP_/, '').downcase }
       semantic_attributes = Helios::OpenTelemetry::SemanticAttributes
       res[semantic_attributes::HTTP_REQUEST_HEADERS] = request_headers.to_json
       request_body = env['rack.input']&.read
       env['rack.input']&.rewind
-      if request_body&.length&.positive?
-        res[semantic_attributes::HTTP_REQUEST_BODY] = request_body
-      end
-
-      res
+      res[semantic_attributes::HTTP_REQUEST_BODY] = request_body if request_body&.length&.positive?
+    rescue StandardError
+      # Do nothing
     end
 
-    def set_attributes_after_request(span, status, headers, response)
+    def extract_response_attributes(span, headers, response)
       semantic_attributes = Helios::OpenTelemetry::SemanticAttributes
       span.set_attribute(semantic_attributes::HTTP_RESPONSE_HEADERS, headers.to_json)
-      span.set_attribute(semantic_attributes::HTTP_RESPONSE_BODY, response[0]) if response[0]&.length&.positive?
-      super(span, status, headers, response)
+      if response.respond_to?(:first) && response.first&.length&.positive?
+        span.set_attribute(semantic_attributes::HTTP_RESPONSE_BODY, response.first)
+      end
+    rescue StandardError
+      # Do nothing
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Helios
   module OpenTelemetry
     module SDK
-      VERSION = '0.1.14'
+      VERSION = '0.1.17'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helios-opentelemetry-sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.17
 platform: ruby
 authors:
 - Team Helios
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler