instana 1.11.3 → 1.11.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 964de6b7e7cf62695558794bb80a056a87427f0fc67d6428eaaa1b3bd1e4d7f8
-  data.tar.gz: d9f7d98a110ef3a73024f26050af10f1fde12dda500ec665dfe28062579577dd
+  metadata.gz: 03473a7a2f7e8a5306869674ff671f1d5b66804e41bd1f687c512a33c0b07f3c
+  data.tar.gz: aaf1ada0116589a5d33e1f74558a6c32801971e5f5f4e512be56ff6524ab447b
 SHA512:
-  metadata.gz: bdb19c8b417c5d22918d3275a1bbfbe956ebd72b2672083b7045e941ea58dccf8d6fea00e5ec17ebf14a95de0e90ce68bbd936119d87f5632a824135f5afc722
-  data.tar.gz: 145abd6cfb3c1c267a3099fe715db07fe8e6d64dd6a0c47a29d7923d90ddfac2b7b7770b229034ef3e5d8c2a8e3b873dacf6ec47e6795690b9dee9625d37c17a
+  metadata.gz: 6993a2dcb47b648445c97fea1017bcc9392f889270613078fd32fb2881365d88260ae0082e23eed6f32f9d111f67021dc9f2485f5cb4777b6317b7541352d40d
+  data.tar.gz: 5c8c34a422def00edda43e613899a59b99bae6c1cf1323d79c135703b1c6ab5d565ece30f8b8f0497e0ea79a7cf1585912c17ddf5e8c363cb33f792e6f7a6903

data/.circleci/config.yml

@@ -0,0 +1,168 @@
+version: 2.1
+
+# More about orbs: https://circleci.com/docs/2.0/using-orbs/
+orbs:
+  ruby: circleci/ruby@1.1.2
+
+commands:
+  prelim-deps:
+    steps:
+      - run:
+          name: Preliminary Dependencies
+          command: |
+            gem update --system
+            gem --version
+            gem install bundler
+            bundler --version
+            bundle config set path './vendor/bundle'
+
+  run-tests:
+    steps:
+      - run:
+          name: Run the Tests
+          command: |
+            bundle exec rake test
+
+  save-stan-cache:
+    parameters:
+      gemfile:
+        default: "Gemfile"
+        type: string
+    steps:
+      - save_cache:
+          key: gem-cache-v1-{{ arch }}-{{ .Branch }}-{{ checksum "<<parameters.gemfile>>" }}
+          paths:
+            - vendor/bundle
+
+  restore-stan-cache:
+    parameters:
+      gemfile:
+        default: "Gemfile"
+        type: string
+    steps:
+      - restore_cache:
+          keys:
+            - gem-cache-v1-{{ arch }}-{{ .Branch }}-{{ checksum "<<parameters.gemfile>>" }}
+            - gem-cache-v1-{{ arch }}-{{ .Branch }}
+            - gem-cache-v1
+
+  bundle-install:
+    parameters:
+      gemfile:
+        default: "Gemfile"
+        type: string
+    steps:
+      - restore-stan-cache:
+          gemfile: <<parameters.gemfile>>
+      - run:
+          name: Bundle Installation
+          command: |
+            bundle install
+      - save-stan-cache:
+          gemfile: <<parameters.gemfile>>
+
+jobs:
+  ruby26:
+    parallelism: 3
+    docker:
+      - image: circleci/ruby:2.6.3-stretch-node
+    executor: ruby/default
+    environment:
+      BUNDLE_JOBS: "3"
+      BUNDLE_RETRY: "3"
+
+    steps:
+      - checkout
+      - prelim-deps
+      - bundle-install
+      - run-tests
+
+  rails50:
+    parallelism: 3
+    docker:
+      - image: circleci/ruby:2.6.3-stretch-node
+      - image: mariadb
+        environment:
+          MYSQL_DATABASE: 'travis_ci_test'
+          MYSQL_USER: 'root'
+          MYSQL_PASSWORD: ''
+          MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
+          MYSQL_ROOT_PASSWORD: ''
+          MYSQL_ROOT_HOST: '%'
+    executor: ruby/default
+    environment:
+      BUNDLE_JOBS: "3"
+      BUNDLE_RETRY: "3"
+      BUNDLE_GEMFILE: "./gemfiles/rails50.gemfile"
+
+    steps:
+      - checkout
+      - prelim-deps
+      - bundle-install:
+          gemfile: "./gemfiles/rails50.gemfile"
+      - run-tests
+
+  rails60:
+    parallelism: 3
+    docker:
+      - image: circleci/ruby:2.6.3-stretch-node
+      - image: mariadb
+        environment:
+          MYSQL_DATABASE: 'travis_ci_test'
+          MYSQL_USER: 'root'
+          MYSQL_PASSWORD: ''
+          MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
+          MYSQL_ROOT_PASSWORD: ''
+          MYSQL_ROOT_HOST: '%'
+    executor: ruby/default
+    environment:
+      BUNDLE_JOBS: "3"
+      BUNDLE_RETRY: "3"
+      BUNDLE_GEMFILE: "./gemfiles/rails60.gemfile"
+
+    steps:
+      - checkout
+      - prelim-deps
+      - bundle-install:
+          gemfile: "./gemfiles/rails60.gemfile"
+      - run-tests
+
+  libraries:
+    parallelism: 3
+    docker:
+      - image: circleci/ruby:2.6.3-stretch-node
+      - image: mariadb
+        environment:
+          MYSQL_DATABASE: 'travis_ci_test'
+          MYSQL_USER: 'root'
+          MYSQL_PASSWORD: ''
+          MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
+          MYSQL_ROOT_PASSWORD: ''
+          MYSQL_ROOT_HOST: '%'
+      - image: memcached
+      - image: postgres
+        environment:
+          POSTGRES_USER: 'stan'
+          POSTGRES_PASSWORD: 'stanlikesdata'
+      - image: redis
+    executor: ruby/default
+    environment:
+      BUNDLE_JOBS: "3"
+      BUNDLE_RETRY: "3"
+      BUNDLE_GEMFILE: "./gemfiles/libraries.gemfile"
+
+    steps:
+      - checkout
+      - prelim-deps
+      - bundle-install:
+          gemfile: "./gemfiles/libraries.gemfile"
+      - run-tests
+
+workflows:
+  version: 2
+  whole-enchilada-MRI26:
+    jobs:
+      - ruby26
+      - rails50
+      - rails60
+      - libraries

data/README.md

@@ -1,5 +1,5 @@
 <div align="center">
-<img src="http://www.instana.com/wp-content/uploads/2016/11/Instana-Infrastructure-Map-1-1024x551.png"/>
+<img src="https://disznc.s3.amazonaws.com/Ruby-Dashboard-2020-02-10-at-2.31.36-PM.png"/>
 </div>
 
 # Instana

data/Rakefile

@@ -12,7 +12,11 @@ Rake::TestTask.new(:test) do |t|
 
   if ENV.key?('BUNDLE_GEMFILE')
     case File.basename(ENV['BUNDLE_GEMFILE']).split('.').first
-    when /rails50/
+    when /rails6/
+      t.test_files = %w(test/frameworks/rails/activerecord_test.rb
+                        test/frameworks/rails/actioncontroller_test.rb
+                        test/frameworks/rails/actionview5_test.rb)
+    when /rails5/
       t.test_files = %w(test/frameworks/rails/activerecord_test.rb
                         test/frameworks/rails/actioncontroller_test.rb
                         test/frameworks/rails/actionview5_test.rb)

data/gemfiles/rails60.gemfile

@@ -0,0 +1,72 @@
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '~> 6.0.2', '>= 6.0.2.1'
+# Use sqlite3 as the database for Active Record
+gem 'sqlite3', '~> 1.4'
+# Use Puma as the app server
+gem 'puma', '~> 4.1'
+# Use SCSS for stylesheets
+gem 'sass-rails', '>= 6'
+# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
+gem 'webpacker', '~> 4.0'
+# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
+gem 'turbolinks', '~> 5'
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'jbuilder', '~> 2.7'
+# Use Redis adapter to run Action Cable in production
+# gem 'redis', '~> 4.0'
+# Use Active Model has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+
+gem 'mysql2', '0.4.10'
+
+# Use Active Storage variant
+# gem 'image_processing', '~> 1.2'
+
+# Reduces boot times through caching; required in config/boot.rb
+gem 'bootsnap', '>= 1.4.2', require: false
+
+group :development, :test do
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
+end
+
+group :development do
+  # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
+  gem 'web-console', '>= 3.3.0'
+  gem 'listen', '>= 3.0.5', '< 3.2'
+  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
+end
+
+group :test do
+  # Adds support for Capybara system testing and selenium driver
+  gem 'capybara', '>= 2.15'
+  gem 'selenium-webdriver'
+  # Easy installation and use of web drivers to run system tests with browsers
+  gem 'webdrivers'
+end
+
+group :development, :test do
+  gem 'rake'
+  gem 'minitest', '5.9.1'
+  gem 'minitest-reporters'
+  gem 'minitest-debugger', :require => false
+  gem 'rack-test'
+  gem 'webmock'
+  # public_suffix dropped support for Ruby 2.1 and earlier.
+  gem 'public_suffix', '< 3.0'
+end
+
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+# Include the Instana Ruby gem's base set of gems
+gemspec :path => File.expand_path(File.dirname(__FILE__) + '/../')
+
+
+# vim:syntax=ruby

data/lib/instana/frameworks/instrumentation/action_view.rb

@@ -6,13 +6,13 @@ module Instana
         ::Instana::Util.method_alias(klass, :render_collection)
       end
 
-      def render_partial_with_instana
+      def render_partial_with_instana(*args)
         kv_payload = { :render => {} }
         kv_payload[:render][:type] = :partial
         kv_payload[:render][:name] = @options[:partial].to_s if @options.is_a?(Hash)
 
         ::Instana.tracer.log_entry(:render, kv_payload)
-        render_partial_without_instana
+        render_partial_without_instana(*args)
       rescue Exception => e
         ::Instana.tracer.log_error(e)
         raise
@@ -20,13 +20,13 @@ module Instana
         ::Instana.tracer.log_exit(:render)
       end
 
-      def render_collection_with_instana
+      def render_collection_with_instana(*args)
         kv_payload = { :render => {} }
         kv_payload[:render][:type] = :collection
         kv_payload[:render][:name] = @path.to_s
 
         ::Instana.tracer.log_entry(:render, kv_payload)
-        render_collection_without_instana
+        render_collection_without_instana(*args)
       rescue Exception => e
         ::Instana.tracer.log_error(e)
         raise

data/lib/instana/instrumentation/rack.rb

@@ -8,8 +8,9 @@ module Instana
       @app = app
     end
 
-    def call(env)
-      kvs = { :http => {} }
+    def collect_kvs(env)
+      kvs = {}
+      kvs[:http] = {}
       kvs[:http][:method] = env['REQUEST_METHOD']
       kvs[:http][:url] = ::CGI.unescape(env['PATH_INFO'])
 
@@ -37,15 +38,27 @@ module Instana
           end
         }
       end
+      return kvs
+    end
 
+    def call(env)
       # Check incoming context
       incoming_context = {}
       if env.key?('HTTP_X_INSTANA_T')
         incoming_context[:trace_id]  = ::Instana::Util.header_to_id(env['HTTP_X_INSTANA_T'])
         incoming_context[:span_id]   = ::Instana::Util.header_to_id(env['HTTP_X_INSTANA_S']) if env.key?('HTTP_X_INSTANA_S')
         incoming_context[:level]     = env['HTTP_X_INSTANA_L'] if env.key?('HTTP_X_INSTANA_L')
+
+        # Honor X-Instana-L
+        if incoming_context[:level] and incoming_context[:level].length > 0
+          if incoming_context[:level][0] == "0"
+            return @app.call(env)
+          end
+        end
       end
 
+      kvs = collect_kvs(env)
+
       ::Instana.tracer.log_start_or_continue(:rack, {}, incoming_context)
 
       status, headers, response = @app.call(env)
@@ -78,8 +91,10 @@ module Instana
         # Set reponse headers; encode as hex string
         headers['X-Instana-T'] = ::Instana::Util.id_to_header(trace_id)
         headers['X-Instana-S'] = ::Instana::Util.id_to_header(span_id)
+        headers['X-Instana-L'] = '1'
+        headers['Server-Timing'] = "intid;desc=#{::Instana::Util.id_to_header(trace_id)}"
+        ::Instana.tracer.log_end(:rack, kvs)
       end
-      ::Instana.tracer.log_end(:rack, kvs)
     end
   end
 end

data/lib/instana/instrumentation/redis.rb

@@ -1,47 +1,32 @@
-module Instana
-  module Instrumentation
-    class Redis
-      def self.get_host(client)
-        client.host
-      end
-
-      def self.get_port(client)
-        client.port
-      end
-
-      def self.pipeline_command(pipeline)
-        pipeline.is_a?(::Redis::Pipeline::Multi) ? 'MULTI' : 'PIPELINE'
-      end
-    end
-  end
-end
-
 if defined?(::Redis) && ::Instana.config[:redis][:enabled]
   ::Redis::Client.class_eval do
     def call_with_instana(*args, &block)
       kv_payload = { redis: {} }
+      dnt_spans = [:redis, :'resque-client', :'sidekiq-client']
 
-      if !Instana.tracer.tracing?
+      if !Instana.tracer.tracing? || dnt_spans.include?(::Instana.tracer.current_span.name)
         return call_without_instana(*args, &block)
       end
 
-      host = ::Instana::Instrumentation::Redis.get_host(self)
-      port = ::Instana::Instrumentation::Redis.get_port(self)
-      kv_payload[:redis] = {
-        connection: "#{host}:#{port}",
-        db: db,
-        command: args[0][0].to_s.upcase
-      }
-      ::Instana.tracer.log_entry(:redis, kv_payload)
+      begin
+        ::Instana.tracer.log_entry(:redis)
+
+        begin
+          kv_payload[:redis][:connection] = "#{self.host}:#{self.port}"
+          kv_payload[:redis][:db] = db.to_s
+          kv_payload[:redis][:command] = args[0][0].to_s.upcase
+        rescue
+          nil
+        end
 
-      call_without_instana(*args, &block)
-    rescue => e
-      kv_payload[:redis][:error] = true
-      ::Instana.tracer.log_info(kv_payload)
-      ::Instana.tracer.log_error(e)
-      raise
-    ensure
-      ::Instana.tracer.log_exit(:redis, {})
+        call_without_instana(*args, &block)
+      rescue => e
+        ::Instana.tracer.log_info({ redis: {error: true} })
+        ::Instana.tracer.log_error(e)
+        raise
+      ensure
+        ::Instana.tracer.log_exit(:redis, kv_payload)
+      end
     end
 
     ::Instana.logger.debug "Instrumenting Redis"
@@ -51,29 +36,32 @@ if defined?(::Redis) && ::Instana.config[:redis][:enabled]
 
     def call_pipeline_with_instana(*args, &block)
       kv_payload = { redis: {} }
+      dnt_spans = [:redis, :'resque-client', :'sidekiq-client']
 
-      if !Instana.tracer.tracing?
+      if !Instana.tracer.tracing? || dnt_spans.include?(::Instana.tracer.current_span.name)
         return call_pipeline_without_instana(*args, &block)
       end
 
-      pipeline = args.first
-      host = ::Instana::Instrumentation::Redis.get_host(self)
-      port = ::Instana::Instrumentation::Redis.get_port(self)
-      kv_payload[:redis] = {
-        connection: "#{host}:#{port}",
-        db: db,
-        command: ::Instana::Instrumentation::Redis.pipeline_command(pipeline)
-      }
-      ::Instana.tracer.log_entry(:redis, kv_payload)
+      begin
+        ::Instana.tracer.log_entry(:redis)
+
+        pipeline = args.first
+        begin
+          kv_payload[:redis][:connection] = "#{self.host}:#{self.port}"
+          kv_payload[:redis][:db] = db.to_s
+          kv_payload[:redis][:command] = pipeline.is_a?(::Redis::Pipeline::Multi) ? 'MULTI' : 'PIPELINE'
+        rescue
+          nil
+        end
 
-      call_pipeline_without_instana(*args, &block)
-    rescue => e
-      kv_payload[:redis][:error] = true
-      ::Instana.tracer.log_info(kv_payload)
-      ::Instana.tracer.log_error(e)
-      raise
-    ensure
-      ::Instana.tracer.log_exit(:redis, {})
+        call_pipeline_without_instana(*args, &block)
+      rescue => e
+        ::Instana.tracer.log_info({ redis: {error: true} })
+        ::Instana.tracer.log_error(e)
+        raise
+      ensure
+        ::Instana.tracer.log_exit(:redis, kv_payload)
+      end
     end
 
     alias call_pipeline_without_instana call_pipeline