Leverage new opentelemetry-api release

Author: kirs

instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/patches/client.rb

@@ -16,27 +16,29 @@ module Client
           def initialize(options = {})
             @connection_options = options # This is normally done by Trilogy#initialize
 
-            in_span(
+            tracer.in_span(
               'connect',
               attributes: client_attributes.merge!(OpenTelemetry::Instrumentation::Trilogy.attributes),
-              kind: :client
+              kind: :client,
+              record_exception: config[:record_exception]
             ) do
               super
             end
           end
 
           def ping(...)
-            in_span(
+            tracer.in_span(
               'ping',
               attributes: client_attributes.merge!(OpenTelemetry::Instrumentation::Trilogy.attributes),
-              kind: :client
+              kind: :client,
+              record_exception: config[:record_exception]
             ) do
               super
             end
           end
 
           def query(sql)
-            in_span(
+            tracer.in_span(
               OpenTelemetry::Helpers::MySQL.database_span_name(
                 sql,
                 OpenTelemetry::Instrumentation::Trilogy.attributes[
@@ -48,7 +50,8 @@ def query(sql)
               attributes: client_attributes(sql).merge!(
                 OpenTelemetry::Instrumentation::Trilogy.attributes
               ),
-              kind: :client
+              kind: :client,
+              record_exception: config[:record_exception]
             ) do |_span, context|
               if propagator && sql.frozen?
                 sql = +sql
@@ -64,19 +67,6 @@ def query(sql)
 
           private
 
-          def in_span(name, attributes: nil, kind: nil)
-            span = tracer.start_span(name, attributes: attributes, kind: kind)
-            OpenTelemetry::Trace.with_span(span) { |s, c| yield s, c }
-          rescue Exception => e # rubocop:disable Lint/RescueException
-            if config[:record_exception]
-              span&.record_exception(e)
-            end
-            span&.status = OpenTelemetry::Trace::Status.error("Exception of type: #{e.class}")
-            raise e
-          ensure
-            span&.finish
-          end
-
           def client_attributes(sql = nil)
             attributes = {
               ::OpenTelemetry::SemanticConventions::Trace::DB_SYSTEM => 'mysql',

instrumentation/trilogy/opentelemetry-instrumentation-trilogy.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = ">= #{File.read(File.expand_path('../../gemspecs/RUBY_REQUIREMENT', __dir__))}"
 
-  spec.add_dependency 'opentelemetry-api', '~> 1.0'
+  spec.add_dependency 'opentelemetry-api', '~> 1.7.0'
   spec.add_dependency 'opentelemetry-helpers-mysql'
   spec.add_dependency 'opentelemetry-helpers-sql'
   spec.add_dependency 'opentelemetry-helpers-sql-obfuscation'