instana 2.2.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a940d6791ca18a45f73ca949de0268cb4195ca269991d78683d1d89c3801919
-  data.tar.gz: c4a79bc94556b873ca0d2cb3cbe2b988914e2579d6fd124bbf4925142316dd85
+  metadata.gz: f3e1c637f9239bf92022943ba9bd659e92fce0a7030a37adc337754e06d08245
+  data.tar.gz: c17d71a2c480b163b37c3f18a4fa6a510a94b553d5777b8192535433835b56bc
 SHA512:
-  metadata.gz: f0c11ead2a6eb5e7cf4811a44b0edb6af0edbed588e712a080b5de07a704fbd28b91474e593b6342537459fe69cc0fcc60dfb83c18618e8e4ca5babea5096d6b
-  data.tar.gz: 5a22a83d6a6f930df189a914116398b372976d95f76ce86ae63b18c2f014eb4aa170a5415f5b6feb2f69b63bc9aff511d16e2d5e5bfb2682c369a0299cb5d2d3
+  metadata.gz: 02fd637038f974a35d42f52f52878ccb27f9dd7b177b07e2bfd92b53c7f176fc8dd3ecf4cd40d088023e571c5d6f0976901cc828a7c9e826781d7e361538bc0a
+  data.tar.gz: eab1b63483157aa3e58f1aef240e90de08faeaf0edddc5c9905ebaccc89630e27d22e5431c6b3f5be84e135b082e2da8ce1738fbe62bf8eef1561f3b93bc1e77

data/lib/instana/activators/bunny.rb

@@ -0,0 +1,23 @@
+# (c) Copyright IBM Corp. 2025
+
+module Instana
+  module Activators
+    class Bunny < Activator
+      def can_instrument?
+        defined?(::Bunny) &&
+          defined?(::Bunny::Queue) &&
+          defined?(::Bunny::Exchange) &&
+          ::Instana.config[:bunny][:enabled]
+      end
+
+      def instrument
+        require 'instana/instrumentation/bunny'
+
+        ::Bunny::Exchange.prepend(::Instana::Instrumentation::BunnyProducer)
+        ::Bunny::Queue.prepend(::Instana::Instrumentation::BunnyConsumer)
+
+        true
+      end
+    end
+  end
+end

data/lib/instana/config.rb

@@ -64,6 +64,7 @@ module Instana
       @config[:action_controller]  = { :enabled => true }
       @config[:action_view]        = { :enabled => true }
       @config[:active_record]      = { :enabled => true }
+      @config[:bunny]              = { :enabled => true }
       @config[:dalli]              = { :enabled => true }
       @config[:excon]              = { :enabled => true }
       @config[:grpc]               = { :enabled => true }

data/lib/instana/instrumentation/bunny.rb

@@ -0,0 +1,129 @@
+# (c) Copyright IBM Corp. 2025
+
+module Instana
+  module Instrumentation
+    module BunnyProducer
+      def publish(payload, options = {})
+        if ::Instana.tracer.tracing?
+          exchange_name = name.empty? ? 'default' : name
+          routing_key = options[:routing_key] || ''
+
+          kvs = {
+            rabbitmq: {
+              sort: 'publish',
+              address: channel.connection.host,
+              key: routing_key,
+              exchange: exchange_name
+            }
+          }
+
+          ::Instana.tracer.in_span(:rabbitmq, attributes: kvs) do |span|
+            # Inject trace context into message headers
+            options[:headers] ||= {}
+            options[:headers]['X-Instana-T'] = span.context.trace_id
+            options[:headers]['X-Instana-S'] = span.context.span_id
+            options[:headers]['X-Instana-L'] = span.context.level.to_s
+
+            super(payload, options)
+          end
+        else
+          super(payload, options)
+        end
+      rescue => e
+        ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
+        raise
+      end
+    end
+
+    module BunnyConsumer
+      def pop(options = {})
+        delivery_info, properties, payload = super(options)
+
+        return [delivery_info, properties, payload] unless delivery_info
+
+        trace_rabbitmq_consume(delivery_info, properties) do
+          [delivery_info, properties, payload]
+        end
+      rescue => e
+        log_error(e)
+        raise
+      end
+
+      def subscribe(options = {}, &block)
+        if block_given?
+          wrapped_block = lambda do |delivery_info, properties, payload|
+            trace_rabbitmq_consume(delivery_info, properties) do
+              block.call(delivery_info, properties, payload)
+            end
+          end
+
+          super(options, &wrapped_block)
+        else
+          super(options, &block)
+        end
+      rescue => e
+        log_error(e)
+        raise
+      end
+
+      private
+
+      def trace_rabbitmq_consume(delivery_info, properties, &block)
+        return yield unless ::Instana.tracer.tracing? || extract_context_from_headers(properties)
+
+        kvs = build_consume_attributes(delivery_info)
+        context = extract_context_from_headers(properties)
+
+        if context[:trace_id]
+          trace_with_context(context, kvs, &block)
+        else
+          ::Instana.tracer.in_span(:rabbitmq, attributes: kvs, &block)
+        end
+      end
+
+      def build_consume_attributes(delivery_info)
+        queue_name = name
+        exchange_name = delivery_info.exchange.empty? ? 'default' : delivery_info.exchange
+
+        {
+          rabbitmq: {
+            sort: 'consume',
+            address: channel.connection.host,
+            queue: queue_name,
+            exchange: exchange_name,
+            key: delivery_info.routing_key
+          }
+        }
+      end
+
+      def trace_with_context(context, kvs, &block)
+        instana_context = ::Instana::SpanContext.new(
+          trace_id: context[:trace_id],
+          span_id: context[:span_id],
+          level: context[:level]
+        )
+        span = OpenTelemetry::Trace.non_recording_span(instana_context)
+
+        Trace.with_span(span) do
+          ::Instana.tracer.in_span(:rabbitmq, attributes: kvs, &block)
+        end
+      end
+
+      def extract_context_from_headers(properties)
+        return {} unless properties && properties.headers
+
+        headers = properties.headers
+        {
+          trace_id: headers['X-Instana-T'],
+          span_id: headers['X-Instana-S'],
+          level: headers['X-Instana-L']&.to_i
+        }.reject { |_, v| v.nil? }
+      end
+
+      def log_error(error)
+        # Log errors on to console if INSTANA_DEBUG is enabled
+        ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{error.message}" }
+      end
+    end
+  end
+end

data/lib/instana/trace/span.rb

@@ -83,14 +83,14 @@ module Instana
 
       @attributes[:stack] = stack
                             .map do |call|
-        file, line, *method = call.split(':')
-
-        {
-          c: file,
-          n: line,
-          m: method.join(' ')
-        }
-      end.take(limit > 40 ? 40 : limit)
+                              file, line, *method = call.split(':')
+
+                              {
+                                c: file,
+                                n: line,
+                                m: method.join(' ')
+                              }
+      end.take([limit, 40].min)
     end
 
     # Log an error into the span

data/lib/instana/trace/span_kind.rb

@@ -9,13 +9,13 @@ module Instana
   module SpanKind
     # Instana specific spans
     REGISTERED_SPANS = [:actioncontroller, :actionview, :activerecord, :excon,
-                        :memcache, :'net-http', :rack, :render, :'rpc-client',
+                        :memcache, :'net-http', :rack, :rabbitmq, :render, :'rpc-client',
                         :'rpc-server', :'sidekiq-client', :'sidekiq-worker',
                         :redis, :'resque-client', :'resque-worker', :'graphql.server', :dynamodb, :s3, :sns, :sqs, :'aws.lambda.entry', :activejob, :log, :"mail.actionmailer",
                         :"aws.lambda.invoke", :mongo, :sequel].freeze
-    ENTRY_SPANS = [:rack, :'resque-worker', :'rpc-server', :'sidekiq-worker', :'graphql.server', :sqs,
+    ENTRY_SPANS = [:rack, :rabbitmq, :'resque-worker', :'rpc-server', :'sidekiq-worker', :'graphql.server', :sqs,
                    :'aws.lambda.entry'].freeze
-    EXIT_SPANS = [:activerecord, :excon, :'net-http', :'resque-client',
+    EXIT_SPANS = [:activerecord, :excon, :'net-http', :rabbitmq, :'resque-client',
                   :'rpc-client', :'sidekiq-client', :redis, :dynamodb, :s3, :sns, :sqs, :log, :"mail.actionmailer",
                   :"aws.lambda.invoke", :mongo, :sequel].freeze
     HTTP_SPANS = [:rack, :excon, :'net-http'].freeze

data/lib/instana/version.rb

@@ -2,6 +2,6 @@
 # (c) Copyright Instana Inc. 2016
 
 module Instana
-  VERSION = "2.2.0"
+  VERSION = "2.4.0"
   VERSION_FULL = "instana-#{VERSION}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,20 +9,6 @@ bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -205,6 +191,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cgi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -245,6 +245,7 @@ files:
 - lib/instana/activators/aws_sdk_s3.rb
 - lib/instana/activators/aws_sdk_sns.rb
 - lib/instana/activators/aws_sdk_sqs.rb
+- lib/instana/activators/bunny.rb
 - lib/instana/activators/cuba.rb
 - lib/instana/activators/dalli.rb
 - lib/instana/activators/excon.rb
@@ -291,6 +292,7 @@ files:
 - lib/instana/instrumentation/aws_sdk_s3.rb
 - lib/instana/instrumentation/aws_sdk_sns.rb
 - lib/instana/instrumentation/aws_sdk_sqs.rb
+- lib/instana/instrumentation/bunny.rb
 - lib/instana/instrumentation/dalli.rb
 - lib/instana/instrumentation/excon.rb
 - lib/instana/instrumentation/graphql.rb
@@ -360,7 +362,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.4
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana
 test_files: []