instana 1.193.4 → 1.195.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6befc19ba40ede879670465a00d606a54c8c73766d053f61d45f75a1eb262f4
-  data.tar.gz: 914bc864f51b712d36871d6eae15a376a084b31c19b08b0cd3797f18f1d5d863
+  metadata.gz: 6ecd5d44386711b77f9063712fe05c1831771a9c6740c429d75244ed31594730
+  data.tar.gz: a9babf1b336a2502f0d0b9c1bacd5a8e1283519b02f5d32aea8e58523d50d766
 SHA512:
-  metadata.gz: b0dd55ef879f88b3c1439ce72bd3b86982c4c603e53ba581e6fec7417c657638c70cc7106e54843889f39b440871dbc2264baa684a896df1771fa20cfc97cabc
-  data.tar.gz: f32036f1e1cc61a3b452dedc0589b88f3579d3680b1479fc3c782a6508c64ba5cc3507e17f7a6bbe014c3dde0ce4e54e8e39d9a45e4450785eb3fb4c1cd4b4d7
+  metadata.gz: 84916aa5ce872b6d309a5b6b97b50e469b98f7a0cae67c29d2be4904e7f120aa464b85b88b4fac4329165d8f77ea7783066a766d69f5809fd85faa1ad989640f
+  data.tar.gz: c94e2ef1d5d72362c64355be70cef8a9835bbe23acd14da29a57c11918c1df0fffafa3ea494a4d87d9349318588d3bc0ee1c6ae5dc9a1b21c3a07271cf487b6f

data/.circleci/config.yml

@@ -10,6 +10,11 @@ executors:
           DATABASE_URL: 'sqlite3::memory:'
       - image: memcached
       - image: redis
+      - image: circleci/dynamodb
+      - image: minio/minio:latest
+        command: ["server", "/data"]
+      - image: s12v/sns
+      - image: softwaremill/elasticmq-native
   ruby_26:
     docker:
       - image: circleci/ruby:2.6-node
@@ -19,6 +24,11 @@ executors:
           DATABASE_URL: 'sqlite3::memory:'
       - image: memcached
       - image: redis
+      - image: circleci/dynamodb
+      - image: minio/minio:latest
+        command: ["server", "/data"]
+      - image: s12v/sns
+      - image: softwaremill/elasticmq-native
   ruby_27:
     docker:
       - image: circleci/ruby:2.7-node
@@ -28,6 +38,11 @@ executors:
           DATABASE_URL: 'sqlite3::memory:'
       - image: memcached
       - image: redis
+      - image: circleci/dynamodb
+      - image: minio/minio:latest
+        command: ["server", "/data"]
+      - image: s12v/sns
+      - image: softwaremill/elasticmq-native
   ruby_25_mysql2:
     docker:
       - image: circleci/ruby:2.5-node
@@ -156,10 +171,10 @@ jobs:
     parameters:
       stack:
         type: executor
-        default: ruby_27_postgres
+        default: ruby_27
       gemfile:
         type: string
-        default: "./gemfiles/rails_60.gemfile"
+        default: "./gemfiles/aws_30.gemfile"
     executor: << parameters.stack >>
     environment:
       APPRAISAL_INITIALIZED: "1"
@@ -196,9 +211,11 @@ workflows:
                 - ruby_26
                 - ruby_25
               gemfile:
+                - "./gemfiles/aws_30.gemfile"
                 - "./gemfiles/cuba_30.gemfile"
                 - "./gemfiles/dalli_20.gemfile"
                 - "./gemfiles/excon_02.gemfile"
+                - "./gemfiles/excon_079.gemfile"
                 - "./gemfiles/graphql_10.gemfile"
                 - "./gemfiles/grpc_10.gemfile"
                 - "./gemfiles/net_http_01.gemfile"
@@ -214,6 +231,7 @@ workflows:
                 - "./gemfiles/sidekiq_42.gemfile"
                 - "./gemfiles/sidekiq_50.gemfile"
                 - "./gemfiles/sinatra_14.gemfile"
+                - "./gemfiles/shoryuken_50.gemfile"
   rails:
     jobs:
       - test_apprisal:

data/.rubocop.yml

@@ -1,5 +1,12 @@
 inherit_from: .rubocop_todo.yml
 
+require:
+  - ./extras/license_header.rb
+
+# Remove when we remove .rubocop_todo.yml
+AllCops:
+  NewCops: disable
+
 # Broken on 1.9
 Style/HashSyntax:
   Enabled: false

data/Appraisals

@@ -1,3 +1,13 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+appraise 'aws-30' do
+  gem 'aws-sdk-dynamodb', '~> 1.59'
+  gem 'aws-sdk-s3', '~> 1.59'
+  gem 'aws-sdk-sns', '~> 1.38'
+  gem 'aws-sdk-sqs', '~> 1.36'
+end
+
 appraise 'cuba-30' do
   gem 'cuba', '>= 3.0', '< 4.0'
 end
@@ -6,10 +16,14 @@ appraise 'dalli-20' do
   gem 'dalli', '>= 2.0', '< 3.0'
 end
 
-appraise 'excon-02' do
+appraise 'excon-021' do
   gem 'excon', '>= 0.21.0', '< 1.0'
 end
 
+appraise 'excon-079' do
+  gem 'excon', '>= 0.79.0', '< 1.0'
+end
+
 appraise 'grpc-10' do
   gem 'grpc', '>= 1.0', '< 2.0'
 end
@@ -91,6 +105,11 @@ appraise 'sinatra-14' do
   gem 'sinatra', '1.4.7'
 end
 
+appraise 'shoryuken-50' do
+  gem 'shoryuken', '~> 5.2'
+  gem 'aws-sdk-sqs', '~> 1.36'
+end
+
 appraise 'sidekiq-42' do
   gem 'sidekiq', '~> 4.2.10'
 end

data/Gemfile

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 source 'https://rubygems.org'
 
 gem 'rake'

data/LICENSE

@@ -1,6 +1,7 @@
 MIT License
 
-Copyright (c) 2017 Instana
+Copyright (c) Copyright IBM Corp. 2021
+Copyright (c) 2017 Instana, Inc. https://www.instana.com/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Rakefile

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 

data/benchmarks/10k-rack-traces.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 require "bundler"
 
 require 'rack'

data/benchmarks/Gemfile

@@ -1,4 +1,8 @@
 # frozen_string_literal: true
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 source "https://rubygems.org"
 
 git_source(:github) {|repo_name| "https://github.com/instana/#{repo_name}" }

data/benchmarks/id_generation.rb

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 require "bundler"
 Bundler.require(:default)
 

data/benchmarks/opentracing.rb

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 require "bundler"
 Bundler.require(:default)
 

data/benchmarks/rack_vanilla_vs_traced.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 require "bundler"
 
 require 'rack'

data/benchmarks/stackprof_rack_tracing.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 require "bundler"
 require "stackprof"
 require 'rack'

data/benchmarks/time_processing.rb

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 require "bundler"
 Bundler.require(:default)
 

data/bin/console

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'irb'
 
 require 'bundler/setup'

data/docker-compose.yml

@@ -0,0 +1,20 @@
+version: '3'
+services:
+  sns:
+    image: s12v/sns
+    ports:
+      - "9911:9911"
+  s3:
+    image: minio/minio:latest
+    command: ["server", "/data"]
+    ports:
+      - "9000:9000"
+  dynamodb:
+    image: circleci/dynamodb
+    ports:
+      - "8000:8000"
+  sqs:
+    image: softwaremill/elasticmq-native
+    ports:
+      - "9324:9324"
+      - "9325:9325"

data/examples/opentracing.rb

@@ -4,6 +4,10 @@
 # to `OpenTracing.global_tracer`.  Once the gem is loaded, you can
 # immediately start making OpenTracing calls.
 #
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2018
+
 require "opentracing"
 
 entry_span = OpenTracing.start_span("HandMadeRackServer")

data/examples/tracing.rb

@@ -17,6 +17,10 @@
 # points in webservers (e.g. rack), it will initialize tracing and instrument the passed
 # block.  <incoming_id> is a hash for continuing remote traces (remote in terms
 # of service calls, or message queues).
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 Instana::Tracer.start_or_continue_trace(:my_block_name, {}, incoming_context) do
   # Code block
 end

data/extras/license_header.rb

@@ -0,0 +1,44 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'time'
+
+module RuboCop
+  module Cop
+    module Instana
+      # Ensures the license header is present in each ruby file
+      class LicenseHeader < Base
+        extend AutoCorrector
+
+        MSG = 'The license header should be present in each file.'.freeze
+        HEADER = '(c) Copyright IBM Corp.'.freeze
+        HEADER_TEMPLATE = <<~HERE.freeze
+          # (c) Copyright IBM Corp. %d
+          # (c) Copyright Instana Inc. %d
+        HERE
+
+        def on_new_investigation
+          first_statement = processed_source.tokens.detect { |t| t.type != :tCOMMENT }
+          file_name = first_statement.pos.source_buffer.name
+          header_comment = processed_source.comments.detect do |comment|
+            first_statement_line = first_statement.pos.line
+            comment_line = comment.loc.line
+
+            (comment_line < first_statement_line) && comment.text.include?(HEADER)
+          end
+
+          return if header_comment
+
+          add_offense(first_statement.pos) do |corrector|
+            current_year = Time.now.year
+            created_time = `git log --diff-filter=A --follow --format=%aD -1 -- #{file_name}`
+            created_year = created_time.empty? ? current_year : Time.parse(created_time).year
+
+            header_text = format(HEADER_TEMPLATE, current_year, created_year)
+            corrector.insert_before(first_statement.pos, "\n#{header_text}\n")
+          end
+        end
+      end
+    end
+  end
+end

data/gemfiles/aws_30.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "minitest", "5.9.1"
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rubocop", "~> 1.9"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "aws-sdk-dynamodb", "~> 1.59"
+gem "aws-sdk-s3", "~> 1.59"
+gem "aws-sdk-sns", "~> 1.38"
+gem "aws-sdk-sqs", "~> 1.36"
+
+gemspec path: "../"

data/gemfiles/cuba_30.gemfile

@@ -1,5 +1,8 @@
 # This file was generated by Appraisal
 
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
 source "https://rubygems.org"
 
 gem "rake"

data/gemfiles/dalli_20.gemfile

@@ -1,5 +1,8 @@
 # This file was generated by Appraisal
 
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
 source "https://rubygems.org"
 
 gem "rake"

data/gemfiles/excon_02.gemfile

@@ -1,5 +1,8 @@
 # This file was generated by Appraisal
 
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
 source "https://rubygems.org"
 
 gem "rake"

data/gemfiles/excon_021.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "minitest", "5.9.1"
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rubocop", "~> 1.9"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "excon", ">= 0.21.0", "< 1.0"
+
+gemspec path: "../"

data/gemfiles/excon_079.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "minitest", "5.9.1"
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rubocop", "~> 1.9"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "excon", ">= 0.79.0", "< 1.0"
+
+gemspec path: "../"

data/gemfiles/graphql_10.gemfile

@@ -1,5 +1,8 @@
 # This file was generated by Appraisal
 
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
 source "https://rubygems.org"
 
 gem "rake"

data/gemfiles/grpc_10.gemfile

@@ -1,5 +1,8 @@
 # This file was generated by Appraisal
 
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
 source "https://rubygems.org"
 
 gem "rake"

data/gemfiles/net_http_01.gemfile

@@ -1,5 +1,8 @@
 # This file was generated by Appraisal
 
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
 source "https://rubygems.org"
 
 gem "rake"