instana 1.200.0.pre1 → 1.200.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97f4147730556687389966d4b2403b5f12087b2479926bb671683ff6056b2f10
-  data.tar.gz: 64259bb574f226a81834402180083c4f04303a4d7db1cb6573645357dbb7b3aa
+  metadata.gz: 300da2a4ba4b62f11b6028d9c1482c896be48bf8e17d78f3053e0e54c9bbfa0d
+  data.tar.gz: 2956c4c1f541ed290aad66c937ef3700a8e5809062cb29c4badb24754fbcf2f1
 SHA512:
-  metadata.gz: 74fdc725df175bf8dce646c438851298515f1a73caa57b7de679295c8f05eb2abef81629b183ef231358c919646ca7d85fc63d5103e91a74916e4b1fb0ab5493
-  data.tar.gz: 9010fe9c2cdd2108bc2a7540bd1704981aaa81370c02847c83af8b177a4303a8ac23c1a990cab8fff141c32bc5a7621fda0c397e19338c4f50e166eece316dc6
+  metadata.gz: 8ac726cfb46337984d4a57e372b6a64dd39b8cbcfdd8b4c34bd03ab6a01013293526d52842709dee38b7dd657c27c8bf0634cc065bcc523b740bfa8377b601f5
+  data.tar.gz: 97c0442d0ce046cddef5b782d365b64d8b5b28501967541585b8859f45fe5266f95ac35a9a1ddd137c30818948515ae1f163cb565a5b6807273f01faccf26447

data/.rubocop.yml

@@ -2,11 +2,14 @@ inherit_from: .rubocop_todo.yml
 
 require:
   - ./extras/license_header.rb
-  
+
 # Remove when we remove .rubocop_todo.yml
 AllCops:
   NewCops: disable
 
+Metrics/PerceivedComplexity:
+  Max: 20
+
 # Broken on 1.9
 Style/HashSyntax:
   Enabled: false
@@ -19,7 +22,13 @@ Style/NilComparison:
 
 Style/SoleNestedConditional:
   Enabled: false
-  
+
 # Ruby 2.1 compatibility
 Style/SafeNavigation:
   Enabled: false
+
+Style/SymbolProc:
+  Enabled: false
+
+Style/MultilineBlockChain:
+  Enabled: false

data/lib/instana/activators/aws_sdk_dynamodb.rb

@@ -5,7 +5,7 @@ module Instana
   module Activators
     class AwsDynamoDB < Activator
       def can_instrument?
-        defined?(Aws::DynamoDB::Client)
+        defined?(::Aws::DynamoDB::Client) && ::Aws::DynamoDB::Client.respond_to?(:add_plugin)
       end
 
       def instrument

data/lib/instana/activators/aws_sdk_s3.rb

@@ -5,7 +5,7 @@ module Instana
   module Activators
     class AwsS3 < Activator
       def can_instrument?
-        defined?(Aws::S3::Client)
+        defined?(::Aws::S3::Client) && ::Aws::S3::Client.respond_to?(:add_plugin)
       end
 
       def instrument

data/lib/instana/activators/aws_sdk_sns.rb

@@ -5,7 +5,7 @@ module Instana
   module Activators
     class AwsSdkSns < Activator
       def can_instrument?
-        defined?(Aws::SNS::Client)
+        defined?(::Aws::SNS::Client) && ::Aws::SNS::Client.respond_to?(:add_plugin)
       end
 
       def instrument

data/lib/instana/activators/aws_sdk_sqs.rb

@@ -5,7 +5,7 @@ module Instana
   module Activators
     class AwsSdkSqs < Activator
       def can_instrument?
-        defined?(Aws::SQS::Client)
+        defined?(::Aws::SQS::Client) && ::Aws::SQS::Client.respond_to?(:add_plugin)
       end
 
       def instrument

data/lib/instana/activators/redis.rb

@@ -5,7 +5,7 @@ module Instana
   module Activators
     class Redis < Activator
       def can_instrument?
-        defined?(::Redis) && ::Instana.config[:redis][:enabled]
+        defined?(::Redis) && defined?(::Redis::Client) && ::Instana.config[:redis][:enabled]
       end
 
       def instrument

data/lib/instana/activators/sidekiq_client.rb

@@ -5,7 +5,7 @@ module Instana
   module Activators
     class SidekiqClient < Activator
       def can_instrument?
-        defined?(::Sidekiq) && ::Instana.config[:'sidekiq-client'][:enabled]
+        defined?(::Sidekiq) && ::Sidekiq.respond_to?(:configure_client) && ::Instana.config[:'sidekiq-client'][:enabled]
       end
 
       def instrument

data/lib/instana/activators/sidekiq_worker.rb

@@ -5,7 +5,7 @@ module Instana
   module Activators
     class SidekiqWorker < Activator
       def can_instrument?
-        defined?(::Sidekiq) && ::Instana.config[:'sidekiq-worker'][:enabled]
+        defined?(::Sidekiq) && ::Sidekiq.respond_to?(:configure_server) && ::Instana.config[:'sidekiq-worker'][:enabled]
       end
 
       def instrument

data/lib/instana/backend/host_agent.rb

@@ -49,7 +49,7 @@ module Instana
         {
           e: discovery_value['pid'],
           h: discovery_value['agentUuid']
-        }.compact
+        }.reject { |_, v| v.nil? }
       end
 
       # @return [Array] extra headers to include in the trace

data/lib/instana/backend/serverless_agent.rb

@@ -98,7 +98,7 @@ module Instana
             @logger.error(e.message)
             nil
           end
-        end.compact
+        end.reject { |_, v| v.nil? }
       end
 
       def host_name

data/lib/instana/frameworks/roda.rb

@@ -37,7 +37,7 @@ module Instana
             _, name = parameters.pop
             "{#{name}}"
           end
-        end.compact
+        end.reject { |v| v.nil? }
       end
     end
   end

data/lib/instana/instrumentation/aws_sdk_s3.rb

@@ -10,7 +10,7 @@ module Instana
             op: format_operation(context.operation_name),
             bucket: bucket_name_from(context),
             key: key_from_context(context)
-          }.compact
+          }.reject { |_, v| v.nil? }
 
           ::Instana.tracer.trace(:s3, {s3: s3_tags}) { @handler.call(context) }
         end

data/lib/instana/instrumentation/aws_sdk_sns.rb

@@ -11,7 +11,7 @@ module Instana
             target: context.params[:target_arn],
             phone: context.params[:phone_number],
             subject: context.params[:subject]
-          }.compact
+          }.reject { |_, v| v.nil? }
 
           if context.operation_name == :publish
             ::Instana.tracer.trace(:sns, {sns: sns_tags}) { @handler.call(context) }

data/lib/instana/instrumentation/aws_sdk_sqs.rb

@@ -13,7 +13,7 @@ module Instana
             return @handler.call(context)
           end
 
-          span_tags = tags_for(context.operation_name, context.params).compact
+          span_tags = tags_for(context.operation_name, context.params).reject { |_, v| v.nil? }
 
           ::Instana.tracer.trace(:sqs, {sqs: span_tags}) do |span|
             case context.operation_name

data/lib/instana/instrumentation/instrumented_request.rb

@@ -74,7 +74,7 @@ module Instana
         host: host_with_port,
         header: extra_header_tags,
         params: request_params
-      }.compact
+      }.reject { |_, v| v.nil? }
     end
 
     def correlation_data
@@ -123,7 +123,7 @@ module Instana
         external_trace_id: external_trace_id,
         external_state: @env['HTTP_TRACESTATE'],
         from_w3: false
-      }.compact
+      }.reject { |_, v| v.nil? }
     end
 
     def context_from_trace_parent
@@ -150,7 +150,7 @@ module Instana
         trace_id: state[:t],
         span_id: state[:p],
         from_w3: false
-      }.compact
+      }.reject { |_, v| v.nil? }
     end
 
     def parse_trace_state
@@ -179,7 +179,7 @@ module Instana
       {
         type: data['correlationType'],
         id: data['correlationId']
-      }.compact
+      }.reject { |_, v| v.nil? }
     end
   end
 end

data/lib/instana/instrumentation/rack.rb

@@ -15,7 +15,7 @@ module Instana
       kvs = {
         http: req.request_tags,
         service: ENV['INSTANA_SERVICE_NAME']
-      }.compact
+      }.reject { |_, v| v.nil? }
 
       current_span = ::Instana.tracer.log_start_or_continue(:rack, {}, req.incoming_context)
 

data/lib/instana/instrumentation/shoryuken.rb

@@ -29,7 +29,7 @@ module Instana
           trace_id: trace_id,
           span_id: span_id,
           level: level
-        }.compact
+        }.reject { |_, v| v.nil? }
       end
 
       def try(attributes, *args)

data/lib/instana/snapshot/docker_container.rb

@@ -56,7 +56,7 @@ module Instana
           blkio: blkio_stats(metrics),
           cpu: cpu_stats(metrics),
           network: network_stats(metrics)
-        }.compact
+        }.reject { |_, v| v.nil? }
       end
 
       def memory_stats(metrics)

data/lib/instana/snapshot/fargate_task.rb

@@ -31,7 +31,7 @@ module Instana
           pullStoppedAt: task_metadata['PullStoppedAt'],
           instanaZone: instana_zone,
           tags: instana_tags
-        }.compact
+        }.reject { |_, v| v.nil? }
       end
 
       def snapshot

data/lib/instana/snapshot/google_cloud_run_instance.rb

@@ -27,7 +27,7 @@ module Instana
           port: ENV['PORT'],
           numericProjectId: lookup('/computeMetadata/v1/project/numeric-project-id'),
           projectId: lookup('/computeMetadata/v1/project/project-id')
-        }.compact
+        }.reject { |_, v| v.nil? }
       end
 
       def snapshot

data/lib/instana/tracing/span_context.rb

@@ -47,7 +47,7 @@ module Instana
         state.unshift("in=#{trace_id_header};#{span_id_header}")
       end
 
-      state.compact.join(',')
+      state.reject { |v| v.nil? }.join(',')
     end
 
     def to_hash

data/lib/instana/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.200.0.pre1
+  version: 1.200.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -357,9 +357,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: