sentry-opentelemetry 5.7.0 → 5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aaffd9cda5f20379323be1ae47da2e64bc2ec9c1b27d514982925391c9b38c8
-  data.tar.gz: 7e4c3b121b94781318c914ee60f107bd371084edf77e438c14eab736278d02b3
+  metadata.gz: 37320f3a7032a8665fcbcf74cfc47b8cf5e9a52583827f682df55acb11f51411
+  data.tar.gz: 56975c8e8db60b5d942f0cf3ee61bc737e2b6749914586b0d76d9f5c1253102e
 SHA512:
-  metadata.gz: eda20f66ce75fd0e1457338d6bde1790f473b201801f93e4a81f998c9391c2f3d1a1e55f5702cc079914c05bd0ef613a95f917deea0bf5c8257c2bdbd5707edc
-  data.tar.gz: e8c7c44bcf9efac91692055bd9376cbe5f6ec36e8000f97f96bc32b08fe0a233caa5665e4ea0fd19d357ca9ece6ab177abc763a87284cf03d31de277dc154296
+  metadata.gz: bd069ea72e3c4cb0fd52374f15fdb484b9afb6acee7b92790ccdbdc469e3660f08e495ac7020c7aefef29090594cc69c49c8400504c7b2a720e32d11e9a0b147
+  data.tar.gz: 777ce885fa8019b6ce1817b87d243d24400e925f2b455628fcb3563711860701fc2dfae86996a4aa7786e672fcc0c8d1b7b2fdb5048734f6c95b3f0aca0d3ba4

data/lib/sentry/opentelemetry/span_processor.rb

@@ -18,6 +18,7 @@ module Sentry
 
       def initialize
         @span_map = {}
+        setup_event_processor
       end
 
       def on_start(otel_span, parent_context)
@@ -60,11 +61,8 @@ module Sentry
         sentry_span = @span_map.delete(otel_span.context.hex_span_id)
         return unless sentry_span
 
-        sentry_span.set_op(otel_span.name)
-
         if sentry_span.is_a?(Sentry::Transaction)
-          sentry_span.set_name(otel_span.name)
-          sentry_span.set_context(:otel, otel_context_hash(otel_span))
+          update_transaction_with_otel_data(sentry_span, otel_span)
         else
           update_span_with_otel_data(sentry_span, otel_span)
         end
@@ -123,10 +121,7 @@ module Sentry
         otel_context
       end
 
-      def update_span_with_otel_data(sentry_span, otel_span)
-        sentry_span.set_data('otel.kind', otel_span.kind)
-        otel_span.attributes&.each { |k, v| sentry_span.set_data(k, v) }
-
+      def parse_span_description(otel_span)
         op = otel_span.name
         description = otel_span.name
 
@@ -139,9 +134,6 @@ module Sentry
 
           target = otel_span.attributes[SEMANTIC_CONVENTIONS::HTTP_TARGET]
           description += target if target
-
-          status_code = otel_span.attributes[SEMANTIC_CONVENTIONS::HTTP_STATUS_CODE]
-          sentry_span.set_http_status(status_code) if status_code
         elsif otel_span.attributes[SEMANTIC_CONVENTIONS::DB_SYSTEM]
           op = "db"
 
@@ -149,9 +141,49 @@ module Sentry
           description = statement if statement
         end
 
+        [op, description]
+      end
+
+      def update_span_status(sentry_span, otel_span)
+        if (http_status_code = otel_span.attributes[SEMANTIC_CONVENTIONS::HTTP_STATUS_CODE])
+          sentry_span.set_http_status(http_status_code)
+        elsif (status_code = otel_span.status.code)
+          status = [0, 1].include?(status_code) ? 'ok' : 'unknown_error'
+          sentry_span.set_status(status)
+        end
+      end
+
+      def update_span_with_otel_data(sentry_span, otel_span)
+        update_span_status(sentry_span, otel_span)
+        sentry_span.set_data('otel.kind', otel_span.kind)
+        otel_span.attributes&.each { |k, v| sentry_span.set_data(k, v) }
+
+        op, description = parse_span_description(otel_span)
         sentry_span.set_op(op)
         sentry_span.set_description(description)
       end
+
+      def update_transaction_with_otel_data(transaction, otel_span)
+        update_span_status(transaction, otel_span)
+        transaction.set_context(:otel, otel_context_hash(otel_span))
+
+        op, _ = parse_span_description(otel_span)
+        transaction.set_op(op)
+        transaction.set_name(otel_span.name)
+      end
+
+      def setup_event_processor
+        Sentry.add_global_event_processor do |event, _hint|
+          span_context = ::OpenTelemetry::Trace.current_span.context
+          next event unless span_context.valid?
+
+          sentry_span = @span_map[span_context.hex_span_id]
+          next event unless sentry_span
+
+          event.contexts[:trace] ||= sentry_span.get_trace_context
+          event
+        end
+      end
     end
   end
 end

data/lib/sentry/opentelemetry/version.rb

@@ -2,6 +2,6 @@
 
 module Sentry
   module OpenTelemetry
-    VERSION = "5.7.0"
+    VERSION = "5.8.0"
   end
 end

data/sentry-opentelemetry.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "sentry-ruby", "~> 5.7.0"
+  spec.add_dependency "sentry-ruby", "~> 5.8.0"
   spec.add_dependency "opentelemetry-sdk", "~> 1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-opentelemetry
 version: !ruby/object:Gem::Version
-  version: 5.7.0
+  version: 5.8.0
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-01 00:00:00.000000000 Z
+date: 2023-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sentry-ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.7.0
+        version: 5.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.7.0
+        version: 5.8.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement