helios-opentelemetry-sdk 0.1.17 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82426806e8d43f898618e45a8b6285f55911cfac228a3182570172c87507d905
-  data.tar.gz: 771fa774bc6f35b9594fa7b4079294bbef6a722cc6ec81fe65ff21d99f388638
+  metadata.gz: a91efee8919de8c1d6ba5535e9bd3e347f3402545739261b272e33e1a64e036e
+  data.tar.gz: 1d0c7e40082bcb8153aacd08b36ed919589d32836a17cd65ba16ef68db13391c
 SHA512:
-  metadata.gz: 58cf30a126082e5bc20893172165647a9cdbec2bea5dc2bd847293f1d8eb120d73620a8e676e5d6c38d7486511daf05652e7c46c18787b70cec4b354c54ef88a
-  data.tar.gz: 40fa5d278137ade4190316222108855bf7fea06fd24cc77c61a3ff063206d2246c22aacac99701a30a423a33e2e5e8a71b9b14bb53f970090b16e0ffe7295e0b
+  metadata.gz: 62f535badbe0f1c481f15dd17e110209233c99025b8d544988e264e78ff23d5b70e12bc10579748f33a0cc23fcf0716b8b4bcade9e2ab3509a1150b1795ef88d
+  data.tar.gz: a935beb8953928cbd407dc71ddad09a6f1134f8d39c5d385e40eafdbf273f1976657f72a5fc114c64595a6ad53b52a2899f8878c8117c699458be3f8867e2568

data/.github/workflows/test.yml

@@ -21,6 +21,16 @@ jobs:
             fail-fast: false
             matrix:
                 ruby-version: ['2.6', '2.7', '3.1']
+        services:
+            mongodb:
+                image: mongo@sha256:845fd775d7a58f564fae7c17a4eec7ff038e1c4004ebe05cc1cb5fc3767cf6cc
+                ports:
+                    - 27017:27017
+                options: >-
+                    --health-cmd="echo 'db.runCommand(\"ping\").ok' | mongo localhost:27017/test --quiet"
+                    --health-interval=10s
+                    --health-timeout=5s
+                    --health-retries=3
         steps:
             - uses: actions/checkout@v2
             - uses: actions/setup-ruby@v1

data/Gemfile

@@ -10,3 +10,4 @@ gem 'rubocop', '~> 1.30.1', group: [:development, :test]
 gem 'bundler', '~> 2.3.16', group: [:development, :test]
 gem 'faraday', '~> 2.3.0', group: [:development, :test]
 gem 'rack', '~> 2.2.4', group: [:development, :test]
+gem 'mongo', '~> 2.5', group: [:development, :test]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    helios-opentelemetry-sdk (0.1.17)
+    helios-opentelemetry-sdk (0.1.20)
       opentelemetry-exporter-otlp (~> 0.22.0)
       opentelemetry-instrumentation-all (~> 0.25.0)
       opentelemetry-instrumentation-rspec (~> 0.2.0)
@@ -11,6 +11,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
+    bson (4.15.0)
     diff-lcs (1.5.0)
     faraday (2.3.0)
       faraday-net_http (~> 2.0)
@@ -19,6 +20,8 @@ GEM
     google-protobuf (3.21.1)
     googleapis-common-protos-types (1.3.1)
       google-protobuf (~> 3.14)
+    mongo (2.18.1)
+      bson (>= 4.14.1, < 5.0.0)
     opentelemetry-api (1.0.2)
     opentelemetry-common (0.19.6)
       opentelemetry-api (~> 1.0)
@@ -245,6 +248,7 @@ DEPENDENCIES
   bundler (~> 2.3.16)
   faraday (~> 2.3.0)
   helios-opentelemetry-sdk!
+  mongo (~> 2.5)
   opentelemetry-exporter-otlp (~> 0.22.0)
   opentelemetry-instrumentation-all (~> 0.25.0)
   opentelemetry-instrumentation-rspec (~> 0.2.0)

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

@@ -55,6 +55,8 @@ end
 def patch_net_http
   require_relative 'patches/net_http_patch'
   ::Net::HTTP.prepend(NetHttpPatch::Instrumentation)
+rescue StandardError => e
+  ::OpenTelemetry.logger.debug("Error patching net http: #{e}")
 end
 
 def patch_faraday
@@ -65,6 +67,8 @@ def patch_faraday
   ::OpenTelemetry::Instrumentation::Faraday::Middlewares::TracerMiddleware.prepend(
     FaradayPatch::HeliosFaradayMiddleware
   )
+rescue StandardError => e
+  ::OpenTelemetry.logger.debug("Error patching faraday: #{e}")
 end
 
 def patch_rack
@@ -75,10 +79,28 @@ def patch_rack
   ::OpenTelemetry::Instrumentation::Rack::Middlewares::TracerMiddleware.prepend(
     RackPatch::HeliosRackMiddleware
   )
+rescue StandardError => e
+  ::OpenTelemetry.logger.debug("Error patching rack: #{e}")
+end
+
+def patch_mongo
+  return unless defined?(::Mongo::Monitoring::Global)
+
+  require 'opentelemetry/instrumentation/mongo/subscriber'
+  min_version = ::OpenTelemetry::Instrumentation::Mongo::Instrumentation::MINIMUM_VERSION
+  mongo_version = Gem::Version.new(::Mongo::VERSION)
+  return unless mongo_version >= min_version
+
+  require_relative 'patches/mongo_patch'
+  ::OpenTelemetry::Instrumentation::Mongo::Subscriber.prepend(MongoPatch::Subscriber)
+  ::OpenTelemetry::Instrumentation::Mongo::CommandSerializer.prepend(MongoPatch::CommandSerializer)
+rescue StandardError => e
+  ::OpenTelemetry.logger.debug("Error patching mongo: #{e}")
 end
 
 def additional_patches
   patch_net_http
   patch_faraday
   patch_rack
+  patch_mongo
 end

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

@@ -17,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?
-    rescue StandardError
-      # Do nothing
+    rescue StandardError => e
+      ::OpenTelemetry.logger.debug("Error extracting faraday attributes: #{e}")
     end
   end
 end

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

@@ -0,0 +1,36 @@
+require 'json'
+require_relative '../../semantic_attributes'
+
+module MongoPatch
+  module Subscriber
+    def succeeded(event)
+      extract_query_result(event)
+      super(event)
+    end
+
+    def extract_query_result(event)
+      span = get_span(event)
+      return unless span
+
+      span.set_attribute(Helios::OpenTelemetry::SemanticAttributes::DB_QUERY_RESULT, event.reply.to_json)
+    rescue StandardError => e
+      ::OpenTelemetry.logger.debug("Error extracting mongo query result: #{e}")
+    end
+  end
+
+  module CommandSerializer
+    # Temp patch until the upstream fix is released
+    def mask(hash)
+      hash.each_with_object({}) do |(k, v), h|
+        value = if v.is_a?(Hash)
+                  mask(v)
+                elsif @obfuscate
+                  MASK_VALUE
+                else
+                  v
+                end
+        h[k] = value
+      end
+    end
+  end
+end

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

@@ -1,4 +1,5 @@
 require 'json'
+require 'opentelemetry/semantic_conventions'
 require_relative '../../semantic_attributes'
 
 module NetHttpPatch
@@ -6,17 +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))
-      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
 
@@ -30,21 +24,31 @@ module NetHttpPatch
     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
+
+      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
 
     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
+    rescue StandardError => e
+      ::OpenTelemetry.logger.debug("Error extracting net http response attributes: #{e}")
     end
   end
 end

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

@@ -23,8 +23,8 @@ module RackPatch
       request_body = env['rack.input']&.read
       env['rack.input']&.rewind
       res[semantic_attributes::HTTP_REQUEST_BODY] = request_body if request_body&.length&.positive?
-    rescue StandardError
-      # Do nothing
+    rescue StandardError => e
+      ::OpenTelemetry.logger.debug("Error extracting rack request attributes: #{e}")
     end
 
     def extract_response_attributes(span, headers, response)
@@ -33,8 +33,8 @@ module RackPatch
       if response.respond_to?(:first) && response.first&.length&.positive?
         span.set_attribute(semantic_attributes::HTTP_RESPONSE_BODY, response.first)
       end
-    rescue StandardError
-      # Do nothing
+    rescue StandardError => e
+      ::OpenTelemetry.logger.debug("Error extracting rack response attributes: #{e}")
     end
   end
 end

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

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

data/lib/helios/opentelemetry/semantic_attributes.rb

@@ -5,6 +5,7 @@ module Helios
       HTTP_REQUEST_HEADERS = 'http.request.headers'
       HTTP_RESPONSE_BODY = 'http.response.body'
       HTTP_RESPONSE_HEADERS = 'http.response.headers'
+      DB_QUERY_RESULT = 'db.query_result'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helios-opentelemetry-sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.20
 platform: ruby
 authors:
 - Team Helios
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-30 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,6 +131,7 @@ files:
 - lib/helios/opentelemetry/sdk.rb
 - lib/helios/opentelemetry/sdk/instrumentations.rb
 - lib/helios/opentelemetry/sdk/patches/faraday_patch.rb
+- lib/helios/opentelemetry/sdk/patches/mongo_patch.rb
 - lib/helios/opentelemetry/sdk/patches/net_http_patch.rb
 - lib/helios/opentelemetry/sdk/patches/rack_patch.rb
 - lib/helios/opentelemetry/sdk/version.rb