instana 2.0.0 → 2.2.0

data/lib/instana/span_filtering.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+# (c) Copyright IBM Corp. 2025
+
+require 'instana/span_filtering/configuration'
+require 'instana/span_filtering/filter_rule'
+require 'instana/span_filtering/condition'
+
+module Instana
+  # SpanFiltering module provides functionality to filter spans based on configured rules
+  module SpanFiltering
+    class << self
+      attr_reader :configuration
+
+      # Initialize the span filtering configuration
+      # @return [Configuration] The span filtering configuration
+      def initialize
+        @configuration = Configuration.new
+      end
+
+      # Check if span filtering is deactivated
+      # @return [Boolean] True if span filtering is deactivated
+      def deactivated?
+        @configuration&.deactivated || false
+      end
+
+      # Check if a span should be filtered out
+      # @param span [Hash] The span to check
+      # @return [Hash, nil] A result hash with filtered and suppression keys if filtered, nil if not filtered
+      def filter_span(span)
+        return nil if deactivated?
+        return nil unless @configuration
+
+        # Check include rules first (whitelist)
+        if @configuration.include_rules.any?
+          # If we have include rules, only keep spans that match at least one include rule
+          unless @configuration.include_rules.any? { |rule| rule.matches?(span) }
+            return { filtered: true, suppression: false }
+          end
+          # If it matches an include rule, continue to exclude rules
+        end
+
+        # Check exclude rules (blacklist)
+        @configuration.exclude_rules.each do |rule|
+          if rule.matches?(span)
+            return { filtered: true, suppression: rule.suppression }
+          end
+        end
+
+        nil # Keep the span if no rules match
+      end
+
+      # Reset the configuration (mainly for testing)
+      def reset
+        @configuration = nil
+      end
+    end
+
+    # Initialize on module load
+    initialize
+  end
+end

data/lib/instana/trace/span.rb

@@ -159,15 +159,17 @@ module Instana
     # @return [Span]
     #
     def close(end_time = ::Instana::Util.now_in_ms)
+      result = ::Instana::SpanFiltering.filter_span(self)
       if end_time.is_a?(Time)
         end_time = ::Instana::Util.time_to_ms(end_time)
       end
-
       @attributes[:d] = end_time - @attributes[:ts]
       @ended = true
-      # Add this span to the queue for reporting
-      ::Instana.processor.on_finish(self)
 
+      if result.nil?
+        # Add this span to the queue for reporting
+        ::Instana.processor.on_finish(self)
+      end
       self
     end
 

data/lib/instana/trace/span_context.rb

@@ -42,8 +42,16 @@ module Instana
     def trace_parent_header
       trace = (@baggage[:external_trace_id] || trace_id_header).rjust(32, '0')
       parent = span_id_header.rjust(16, '0')
-      flags = @level == 1 ? "01" : "00"
-
+      flags = if @baggage[:external_trace_flags]
+                # Parse external flags as 8-bit hex, clear LSB, then set LSB based on level
+                external_flags = @baggage[:external_trace_flags].to_i(16) & 0xFE # Clear LSB
+                combined_flags = external_flags | (@level == 1 ? 1 : 0) # Set LSB based on level
+                combined_flags = [combined_flags, 0xFF].min # Cap at 8-bit max
+                format('%02x', combined_flags)
+              else
+                @level == 1 ? "03" : "02"
+              end
+      flags = "03" if flags > "03"
       "00-#{trace}-#{parent}-#{flags}"
     end
 

data/lib/instana/trace/tracer.rb

@@ -307,27 +307,6 @@ module Instana
       self.current_span = nil
     end
 
-    # Creates a span that is active during the execution of the provided block.
-    # The span is automatically closed when the block completes, whether it completes
-    # normally or with an exception.
-    #
-    # @param name [String, Symbol] the name of the span to create
-    # @param attributes [Hash, nil] optional attributes to set on the span
-    # @param links [Array<Link>, nil] optional links to associate with the span
-    # @param start_timestamp [Integer, nil] optional start time for the span in milliseconds
-    # @param kind [Symbol, nil] optional span kind (e.g., :internal, :client, :server)
-    #
-    # @return [Object] the return value of the block
-    #
-    # @note This method is a wrapper around the parent class implementation and
-    #   will only create a span if the Instana agent is ready and tracing is enabled.
-    #
-    def in_span(name, attributes: nil, links: nil, start_timestamp: nil, kind: nil)
-      return if !::Instana.agent.ready? || !::Instana.config[:tracing][:enabled]
-
-      super
-    end
-
     # Starts a new span with the given parameters.
     #
     # @param name [String, Symbol] the name of the span to create (defaults to 'empty' if nil)

data/lib/instana/util.rb

@@ -181,6 +181,19 @@ module Instana
         timeout -= (timeout_timestamp - start_time)
         timeout.positive? ? timeout : 0
       end
+
+      def extra_header_tags(req_res_headers)
+        return {} if req_res_headers.nil?
+        return nil unless ::Instana.agent.extra_headers
+
+        headers = {}
+
+        ::Instana.agent.extra_headers.each do |custom_header|
+          headers[custom_header.to_sym] = req_res_headers[custom_header] if req_res_headers.key?(custom_header)
+        end
+
+        headers
+      end
     end
   end
 end

data/lib/instana/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -228,106 +228,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
-- ".codeclimate.yml"
-- ".editorconfig"
-- ".fasterer.yml"
-- ".github/ISSUE_TEMPLATE/bug.yml"
-- ".github/ISSUE_TEMPLATE/config.yml"
-- ".github/workflows/pr_commits_signed_off.yml"
-- ".github/workflows/release-notification-on-slack.yml"
-- ".gitignore"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".tekton/.currency/docs/report.md"
-- ".tekton/.currency/resources/requirements.txt"
-- ".tekton/.currency/resources/table.json"
-- ".tekton/.currency/scripts/generate_report.py"
-- ".tekton/README.md"
-- ".tekton/github-interceptor-secret.yaml"
-- ".tekton/github-pr-eventlistener.yaml"
-- ".tekton/github-pr-pipeline.yaml.part"
-- ".tekton/github-set-status-task.yaml"
-- ".tekton/github-webhook-ingress.yaml"
-- ".tekton/pipeline.yaml"
-- ".tekton/pipelinerun.yaml"
-- ".tekton/prepuller-restart-service-account.yaml"
-- ".tekton/ruby-tracer-prepuller-cronjob.yaml"
-- ".tekton/ruby-tracer-prepuller.yaml"
-- ".tekton/run_unittests.sh"
-- ".tekton/scheduled-eventlistener.yaml"
-- ".tekton/task.yaml"
-- ".tekton/tekton-triggers-eventlistener-serviceaccount.yaml"
-- Appraisals
-- CONTRIBUTING.md
-- Gemfile
-- LICENSE
-- MAINTAINERS.md
 - README.md
-- Rakefile
-- bin/announce_release_on_slack.py
 - bin/console
 - bin/setup
-- docker-compose.yml
-- download.sh
-- examples/otel.rb
-- examples/tracing.rb
-- extras/license_header.rb
-- gemfiles/.bundle/config
-- gemfiles/aws_30.gemfile
-- gemfiles/aws_60.gemfile
-- gemfiles/cuba_30.gemfile
-- gemfiles/cuba_40.gemfile
-- gemfiles/dalli_20.gemfile
-- gemfiles/dalli_30.gemfile
-- gemfiles/dalli_32.gemfile
-- gemfiles/excon_0100.gemfile
-- gemfiles/excon_021.gemfile
-- gemfiles/excon_079.gemfile
-- gemfiles/excon_100.gemfile
-- gemfiles/graphql_10.gemfile
-- gemfiles/graphql_20.gemfile
-- gemfiles/grpc_10.gemfile
-- gemfiles/mongo_216.gemfile
-- gemfiles/mongo_219.gemfile
-- gemfiles/net_http_01.gemfile
-- gemfiles/rack_16.gemfile
-- gemfiles/rack_20.gemfile
-- gemfiles/rack_30.gemfile
-- gemfiles/rails_42.gemfile
-- gemfiles/rails_50.gemfile
-- gemfiles/rails_52.gemfile
-- gemfiles/rails_60.gemfile
-- gemfiles/rails_61.gemfile
-- gemfiles/rails_70.gemfile
-- gemfiles/rails_71.gemfile
-- gemfiles/rails_80.gemfile
-- gemfiles/redis_40.gemfile
-- gemfiles/redis_50.gemfile
-- gemfiles/redis_51.gemfile
-- gemfiles/resque_122.gemfile
-- gemfiles/resque_1274_3scale.gemfile
-- gemfiles/resque_20.gemfile
-- gemfiles/rest_client_16.gemfile
-- gemfiles/rest_client_20.gemfile
-- gemfiles/roda_20.gemfile
-- gemfiles/roda_30.gemfile
-- gemfiles/rubocop_162.gemfile
-- gemfiles/sequel_56.gemfile
-- gemfiles/sequel_57.gemfile
-- gemfiles/sequel_58.gemfile
-- gemfiles/shoryuken_50.gemfile
-- gemfiles/shoryuken_60.gemfile
-- gemfiles/sidekiq_42.gemfile
-- gemfiles/sidekiq_50.gemfile
-- gemfiles/sidekiq_60.gemfile
-- gemfiles/sidekiq_65.gemfile
-- gemfiles/sidekiq_70.gemfile
-- gemfiles/sinatra_14.gemfile
-- gemfiles/sinatra_22.gemfile
-- gemfiles/sinatra_30.gemfile
-- gemfiles/sinatra_40.gemfile
-- instana.gemspec
 - lib/instana.rb
 - lib/instana/activator.rb
 - lib/instana/activators/action_cable.rb
@@ -420,6 +323,10 @@ files:
 - lib/instana/snapshot/google_cloud_run_process.rb
 - lib/instana/snapshot/lambda_function.rb
 - lib/instana/snapshot/ruby_process.rb
+- lib/instana/span_filtering.rb
+- lib/instana/span_filtering/condition.rb
+- lib/instana/span_filtering/configuration.rb
+- lib/instana/span_filtering/filter_rule.rb
 - lib/instana/trace.rb
 - lib/instana/trace/export.rb
 - lib/instana/trace/processor.rb
@@ -431,86 +338,6 @@ files:
 - lib/instana/trace/tracer_provider.rb
 - lib/instana/util.rb
 - lib/instana/version.rb
-- log/.keep
-- sonar-project.properties
-- test/activator_test.rb
-- test/backend/agent_test.rb
-- test/backend/gc_snapshot_test.rb
-- test/backend/host_agent_activation_observer_test.rb
-- test/backend/host_agent_lookup_test.rb
-- test/backend/host_agent_reporting_observer_test.rb
-- test/backend/host_agent_test.rb
-- test/backend/process_info_test.rb
-- test/backend/request_client_test.rb
-- test/backend/serverless_agent_test.rb
-- test/benchmarks/bench_id_generation.rb
-- test/benchmarks/bench_opentracing.rb
-- test/config_test.rb
-- test/frameworks/cuba_test.rb
-- test/frameworks/roda_test.rb
-- test/frameworks/sinatra_test.rb
-- test/instana_test.rb
-- test/instrumentation/aws_test.rb
-- test/instrumentation/dalli_test.rb
-- test/instrumentation/excon_test.rb
-- test/instrumentation/graphql_test.rb
-- test/instrumentation/grpc_test.rb
-- test/instrumentation/mongo_test.rb
-- test/instrumentation/net_http_test.rb
-- test/instrumentation/rack_instrumented_request_test.rb
-- test/instrumentation/rack_test.rb
-- test/instrumentation/rails_action_cable_test.rb
-- test/instrumentation/rails_action_controller_test.rb
-- test/instrumentation/rails_action_mailer_test.rb
-- test/instrumentation/rails_action_view_test.rb
-- test/instrumentation/rails_active_job_test.rb
-- test/instrumentation/rails_active_record_database_missing_test.rb
-- test/instrumentation/rails_active_record_test.rb
-- test/instrumentation/redis_test.rb
-- test/instrumentation/resque_test.rb
-- test/instrumentation/rest_client_test.rb
-- test/instrumentation/sequel_test.rb
-- test/instrumentation/shoryuken_test.rb
-- test/instrumentation/sidekiq-client_test.rb
-- test/instrumentation/sidekiq-worker_test.rb
-- test/secrets_test.rb
-- test/serverless_test.rb
-- test/snapshot/deltable_test.rb
-- test/snapshot/docker_container_test.rb
-- test/snapshot/fargate_container_test.rb
-- test/snapshot/fargate_process_test.rb
-- test/snapshot/fargate_task_test.rb
-- test/snapshot/google_cloud_run_instance_test.rb
-- test/snapshot/google_cloud_run_process_test.rb
-- test/snapshot/lambda_function_test.rb
-- test/snapshot/ruby_process_test.rb
-- test/support/apps/active_record/active_record.rb
-- test/support/apps/grpc/boot.rb
-- test/support/apps/grpc/grpc_server.rb
-- test/support/apps/http_endpoint/boot.rb
-- test/support/apps/rails/boot.rb
-- test/support/apps/rails/models/block.rb
-- test/support/apps/rails/models/block6.rb
-- test/support/apps/resque/boot.rb
-- test/support/apps/resque/jobs/resque_error_job.rb
-- test/support/apps/resque/jobs/resque_fast_job.rb
-- test/support/apps/sidekiq/boot.rb
-- test/support/apps/sidekiq/jobs/sidekiq_job_1.rb
-- test/support/apps/sidekiq/jobs/sidekiq_job_2.rb
-- test/support/apps/sidekiq/worker.rb
-- test/support/helpers.rb
-- test/support/mock_timer.rb
-- test/test_helper.rb
-- test/trace/custom_test.rb
-- test/trace/id_management_test.rb
-- test/trace/instrumented_logger_test.rb
-- test/trace/processor_test.rb
-- test/trace/span_context_test.rb
-- test/trace/span_test.rb
-- test/trace/tracer_async_test.rb
-- test/trace/tracer_provider_test.rb
-- test/trace/tracer_test.rb
-- test/util_test.rb
 homepage: https://www.instana.com/
 licenses:
 - MIT
@@ -533,85 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana
-test_files:
-- test/activator_test.rb
-- test/backend/agent_test.rb
-- test/backend/gc_snapshot_test.rb
-- test/backend/host_agent_activation_observer_test.rb
-- test/backend/host_agent_lookup_test.rb
-- test/backend/host_agent_reporting_observer_test.rb
-- test/backend/host_agent_test.rb
-- test/backend/process_info_test.rb
-- test/backend/request_client_test.rb
-- test/backend/serverless_agent_test.rb
-- test/benchmarks/bench_id_generation.rb
-- test/benchmarks/bench_opentracing.rb
-- test/config_test.rb
-- test/frameworks/cuba_test.rb
-- test/frameworks/roda_test.rb
-- test/frameworks/sinatra_test.rb
-- test/instana_test.rb
-- test/instrumentation/aws_test.rb
-- test/instrumentation/dalli_test.rb
-- test/instrumentation/excon_test.rb
-- test/instrumentation/graphql_test.rb
-- test/instrumentation/grpc_test.rb
-- test/instrumentation/mongo_test.rb
-- test/instrumentation/net_http_test.rb
-- test/instrumentation/rack_instrumented_request_test.rb
-- test/instrumentation/rack_test.rb
-- test/instrumentation/rails_action_cable_test.rb
-- test/instrumentation/rails_action_controller_test.rb
-- test/instrumentation/rails_action_mailer_test.rb
-- test/instrumentation/rails_action_view_test.rb
-- test/instrumentation/rails_active_job_test.rb
-- test/instrumentation/rails_active_record_database_missing_test.rb
-- test/instrumentation/rails_active_record_test.rb
-- test/instrumentation/redis_test.rb
-- test/instrumentation/resque_test.rb
-- test/instrumentation/rest_client_test.rb
-- test/instrumentation/sequel_test.rb
-- test/instrumentation/shoryuken_test.rb
-- test/instrumentation/sidekiq-client_test.rb
-- test/instrumentation/sidekiq-worker_test.rb
-- test/secrets_test.rb
-- test/serverless_test.rb
-- test/snapshot/deltable_test.rb
-- test/snapshot/docker_container_test.rb
-- test/snapshot/fargate_container_test.rb
-- test/snapshot/fargate_process_test.rb
-- test/snapshot/fargate_task_test.rb
-- test/snapshot/google_cloud_run_instance_test.rb
-- test/snapshot/google_cloud_run_process_test.rb
-- test/snapshot/lambda_function_test.rb
-- test/snapshot/ruby_process_test.rb
-- test/support/apps/active_record/active_record.rb
-- test/support/apps/grpc/boot.rb
-- test/support/apps/grpc/grpc_server.rb
-- test/support/apps/http_endpoint/boot.rb
-- test/support/apps/rails/boot.rb
-- test/support/apps/rails/models/block.rb
-- test/support/apps/rails/models/block6.rb
-- test/support/apps/resque/boot.rb
-- test/support/apps/resque/jobs/resque_error_job.rb
-- test/support/apps/resque/jobs/resque_fast_job.rb
-- test/support/apps/sidekiq/boot.rb
-- test/support/apps/sidekiq/jobs/sidekiq_job_1.rb
-- test/support/apps/sidekiq/jobs/sidekiq_job_2.rb
-- test/support/apps/sidekiq/worker.rb
-- test/support/helpers.rb
-- test/support/mock_timer.rb
-- test/test_helper.rb
-- test/trace/custom_test.rb
-- test/trace/id_management_test.rb
-- test/trace/instrumented_logger_test.rb
-- test/trace/processor_test.rb
-- test/trace/span_context_test.rb
-- test/trace/span_test.rb
-- test/trace/tracer_async_test.rb
-- test/trace/tracer_provider_test.rb
-- test/trace/tracer_test.rb
-- test/util_test.rb
+test_files: []