instana 1.210.1 → 1.211.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ebbf57e241468a0c39a150d3032f6d544c10263e54638a62e78b6b78bfcf176
-  data.tar.gz: a4a009b702fbb44d3769558edecc91305262bc0a08172ee0e6e6751cb6ded284
+  metadata.gz: 8d5a6d5f952c612a4409a7706048b48a09d315556598c9473485c6c558ba0239
+  data.tar.gz: 232ab891cd7f9096691c27bbcd290bcaf98d84c91cf433fa7d623d0824d5e572
 SHA512:
-  metadata.gz: '07957983e122595a1e8c0e54babe3c832dda10bab8e4ca138a02868854e8dca861767f82196f01ed184883ac82c9c322c1dcb288b56869a818a64f3af9e8b33b'
-  data.tar.gz: 17479e49ec7dcd01153c11c85186b6ef17056c3bd5a5fc81c86ce1e09569737994dedce8286d7815651fe060e3ae1003efc39af85a1eb60facc252a794cfa82a
+  metadata.gz: 54d13de299896779dc38c2e5d0e4dc07ba4aa9dfc49c3390cd5404bc074764c785c2c6c27c5738f2c32b8eead65127cc0c508c896ea2e6c9780e357f838ae274
+  data.tar.gz: e6b4c5f3dc57e0b8fb8cd39a473f17a37c1a403bd5fe745de11675001e0edff8e7410ee434f40a30ac38dbf764da7d028fb6459caf887ade9f332f5edb8ac73b

data/.circleci/config.yml

@@ -1,5 +1,42 @@
 version: 2.1
 
+library_gemfile: &library_gemfile
+  gemfile:
+    - "./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_02.gemfile"
+    - "./gemfiles/excon_079.gemfile"
+    - "./gemfiles/excon_100.gemfile"
+    - "./gemfiles/graphql_10.gemfile"
+    - "./gemfiles/graphql_20.gemfile"
+    - "./gemfiles/grpc_10.gemfile"
+    - "./gemfiles/net_http_01.gemfile"
+    - "./gemfiles/rack_16.gemfile"
+    - "./gemfiles/rack_20.gemfile"
+    - "./gemfiles/rack_30.gemfile"
+    - "./gemfiles/redis_40.gemfile"
+    - "./gemfiles/rest_client_16.gemfile"
+    - "./gemfiles/rest_client_20.gemfile"
+    - "./gemfiles/resque_122.gemfile"
+    - "./gemfiles/resque_20.gemfile"
+    - "./gemfiles/roda_20.gemfile"
+    - "./gemfiles/roda_30.gemfile"
+    - "./gemfiles/sidekiq_42.gemfile"
+    - "./gemfiles/sidekiq_50.gemfile"
+    - "./gemfiles/sidekiq_60.gemfile"
+    - "./gemfiles/sidekiq_70.gemfile"
+    - "./gemfiles/sinatra_14.gemfile"
+    - "./gemfiles/sinatra_22.gemfile"
+    - "./gemfiles/sinatra_30.gemfile"
+    - "./gemfiles/shoryuken_50.gemfile"
+    - "./gemfiles/shoryuken_60.gemfile"
+    - "./gemfiles/mongo_216.gemfile"
+    - "./gemfiles/mongo_219.gemfile"
 executors:
   ruby_27:
     docker:
@@ -210,6 +247,8 @@ commands:
             bundle exec rake
       - store_test_results:
           path: ~/project/_junit
+      - store_artifacts:
+          path: coverage
   run_rubocop:
     steps:
       - run:
@@ -290,46 +329,16 @@ workflows:
                 - ruby_30
                 - ruby_31
                 - ruby_32
-  libraries:
+  libraries_ruby_3:
     jobs:
       - test_apprisal:
           matrix:
             parameters:
               stack:
-                - ruby_27
                 - ruby_30
                 - ruby_31
                 - ruby_32
-              gemfile:
-                - "./gemfiles/aws_30.gemfile"
-                - "./gemfiles/cuba_30.gemfile"
-                - "./gemfiles/cuba_40.gemfile"
-                - "./gemfiles/dalli_20.gemfile"
-                - "./gemfiles/dalli_30.gemfile"
-                - "./gemfiles/dalli_32.gemfile"
-                - "./gemfiles/excon_02.gemfile"
-                - "./gemfiles/excon_079.gemfile"
-                - "./gemfiles/excon_100.gemfile"
-                - "./gemfiles/graphql_10.gemfile"
-                - "./gemfiles/graphql_20.gemfile"
-                - "./gemfiles/grpc_10.gemfile"
-                - "./gemfiles/net_http_01.gemfile"
-                - "./gemfiles/rack_16.gemfile"
-                - "./gemfiles/rack_20.gemfile"
-                - "./gemfiles/redis_40.gemfile"
-                - "./gemfiles/rest_client_16.gemfile"
-                - "./gemfiles/rest_client_20.gemfile"
-                - "./gemfiles/resque_122.gemfile"
-                - "./gemfiles/resque_20.gemfile"
-                - "./gemfiles/roda_20.gemfile"
-                - "./gemfiles/roda_30.gemfile"
-                - "./gemfiles/sidekiq_42.gemfile"
-                - "./gemfiles/sidekiq_50.gemfile"
-                - "./gemfiles/sidekiq_60.gemfile"
-                - "./gemfiles/sidekiq_70.gemfile"
-                - "./gemfiles/sinatra_14.gemfile"
-                - "./gemfiles/shoryuken_50.gemfile"
-                - "./gemfiles/mongo_216.gemfile"
+              <<: *library_gemfile
             exclude:
             # Currently rest-client 1.6 gemfile pulls in mime-types 2.99.3
             # and adaptation to mime-type 3.0 is only available in rest-client 2.0:
@@ -349,7 +358,14 @@ workflows:
             # https://www.ruby-lang.org/en/news/2022/11/11/ruby-3-2-0-preview3-released/
             - stack: ruby_32
               gemfile: "./gemfiles/sinatra_14.gemfile"
-
+  libraries_ruby_2:
+    jobs:
+      - test_apprisal:
+          matrix:
+            parameters:
+              stack:
+                - ruby_27
+              <<: *library_gemfile
   rails_ruby_2:
     jobs:
       - test_apprisal:

data/.github/ISSUE_TEMPLATE/bug.yml

@@ -6,7 +6,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thank you for taking the time to fill out this report. Remember that these issues are public and if you need to discuss implementation specific issues securely, please [use our support portal](https://support.instana.com/hc/en-us).
+        Thank you for taking the time to fill out this report. Remember that these issues are public and if you need to discuss implementation specific issues securely, please [use our support portal](https://www.ibm.com/mysupport).
   - type: textarea
     id: problem-description
     attributes:

data/.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: Instana Support Portal
-    url: https://support.instana.com
+    url: https://www.ibm.com/mysupport
     about: Please ask questions related to your installation there. 
   - name: Feature Requests
     url: https://automation-management.ideas.ibm.com/?project=INSTANA

data/.github/workflows/release-notification-on-slack.yml

@@ -0,0 +1,34 @@
+name: Slack Post
+on:
+  workflow_dispatch: # Manual trigger
+    inputs:
+      github_ref:
+        description: 'Manually provided value for GITHUB_RELEASE_TAG of a release'
+        required: true
+        type: string
+
+  # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#release
+  release:
+    types: [published]
+jobs:
+  build:
+    name: Slack Post
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout the needed file only ./bin/announce_release_on_slack.py'
+        uses: actions/checkout@v3
+      - run: |
+          if [[ ${{ github.event_name == 'workflow_dispatch' }} == true ]]; then
+            export GITHUB_RELEASE_TAG=${{ inputs.github_ref }}
+          else # release event
+            export GITHUB_RELEASE_TAG=$(basename ${GITHUB_REF})
+          fi
+          echo "New release published ${GITHUB_RELEASE_TAG}"
+          pip3 install PyGithub
+          echo $PWD
+          ls -lah
+          ./bin/announce_release_on_slack.py
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+          SLACK_CHANNEL_ID_RELEASES: ${{ secrets.SLACK_CHANNEL_ID_RELEASES }}

data/Gemfile

@@ -11,13 +11,8 @@ gem 'puma'
 
 gem 'rubocop', '~> 1.9'
 
-# Rack v2 dropped support for Ruby 2.2 and higher.
-if RUBY_VERSION < '2.2'
-  gem 'rack', '<3.0.0', '~> 1.6'
-else
-  gem 'rack', '<3.0.0'
-  # gem 'rackup'
-end
+gem 'rack'
+gem 'rackup'
 gem 'rack-test'
 
 gem 'simplecov', '~> 0.21.2'

data/README.md

@@ -60,7 +60,7 @@ You can find more documentation covering supported components and minimum versio
 
 Instana provides deep end user monitoring that links server side traces with browser events to give you a complete view from server to browser.
 
-See the [End User Monitoring](/products/website_monitoring/#configuration) page for more information.
+See the [End User Monitoring](https://www.ibm.com/docs/en/instana-observability/current?topic=instana-monitoring-websites) page for more information.
 
 ## Development
 

data/bin/announce_release_on_slack.py

@@ -0,0 +1,103 @@
+#!/usr/bin/env python3
+
+# (c) Copyright IBM Corp. 2023
+
+import json
+import logging
+import os
+import re
+import requests
+import sys
+
+from github import Github
+
+
+def ensure_environment_variables_are_present():
+    required_env_vars = ('GITHUB_RELEASE_TAG', 'GITHUB_TOKEN',
+                         'SLACK_BOT_TOKEN', 'SLACK_CHANNEL_ID_RELEASES')
+
+    for v in required_env_vars:
+        if not os.environ.get(v):
+            logging.fatal("A required environment variable is missing: %s", v)
+            sys.exit(1)
+
+
+def get_gh_release_info_text_with_token(release_tag, access_token):
+    g = Github(access_token)
+    repo_name = "instana/ruby-sensor"
+    repo = g.get_repo(repo_name)
+    release = repo.get_release(release_tag)
+
+    logging.info("GH Release fetched successfully %s", release)
+
+    msg = (
+        f":mega: :package: A new version is released in {repo_name}\n"
+        f"Name: {release.title}\n"
+        f"Tag: {release.tag_name}\n"
+        f"Created at: {release.created_at}\n"
+        f"Published at: {release.published_at}\n"
+        f"{release.body}\n")
+
+    logging.info(msg)
+    return msg
+
+
+def reformat_github_md_to_slack_markup(msg):
+    # Based on:
+    # https://github.com/atomist/slack-messages/blob
+    # /c938c67e957345ba6a0015ca3ace1fd779d0979c/lib/Markdown.ts#LL111C1-L116C44
+
+    msg = re.sub(r'^(\s*)[-*](\s+)', r'\1•\2', msg, flags=re.MULTILINE)
+    msg = re.sub(r'(\*|_)\1(\S|\S.*?\S)\1\1(?!\1)', r'<bdmkd>\2</bdmkd>', msg)
+    msg = re.sub(r'(\*|_)(?!\1)(\S|\S.*?\S)\1(?!\1)', r'<itmkd>\2</itmkd>', msg)
+    msg = msg.replace('<bdmkd>', '*').replace('<itmkd>', '_')
+    msg = re.sub(r'^([#]+)\s+([\S ]+)$', r'*\2*', msg, flags=re.MULTILINE)
+
+    # TODO: The message text has to have a partial entity encoding
+    # https://api.slack.com/reference/surfaces/formatting#escaping
+    # Validate it if we can?
+    # A naive replace like this is not enough, because
+    # it might already be encoded and then we would encode again.
+    #s = s.replace('&', '&amp;')
+    #s = s.replace('<', '&lt;')
+    #s = s.replace('>', '&gt;')
+
+    # Use the tester here:
+    # https://api.slack.com/methods/chat.postMessage/test
+    return msg
+
+
+def post_on_slack_channel(slack_token, slack_channel_id, message_text):
+    api_url = "https://slack.com/api/chat.postMessage"
+
+    headers = {"Authorization": f"Bearer {slack_token}",
+               "Content-Type": "application/json"}
+    body = {"channel": slack_channel_id, "text": message_text}
+
+    response = requests.post(api_url, headers=headers, data=json.dumps(body))
+    response_data = json.loads(response.text)
+
+    if response_data["ok"]:
+        logging.info("Message sent successfully!")
+    else:
+        logging.fatal("Error sending message: %s", response_data['error'])
+
+
+def main():
+    # Setting this globally to DEBUG will also debug PyGithub,
+    # which will produce even more log output
+    logging.basicConfig(level=logging.INFO)
+    ensure_environment_variables_are_present()
+
+    msg = get_gh_release_info_text_with_token(os.environ['GITHUB_RELEASE_TAG'],
+                                              os.environ['GITHUB_TOKEN'])
+
+    slack_formatted_msg = reformat_github_md_to_slack_markup(msg)
+
+    post_on_slack_channel(os.environ['SLACK_BOT_TOKEN'],
+                          os.environ['SLACK_CHANNEL_ID_RELEASES'],
+                          slack_formatted_msg)
+
+
+if __name__ == "__main__":
+    main()

data/gemfiles/aws_30.gemfile

@@ -6,17 +6,18 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
+gem "webrick"
 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"
-gem "aws-sdk-lambda", "~> 1.62"
+gem "aws-sdk-dynamodb", ">= 1.59", "< 1.99"
+gem "aws-sdk-s3", ">= 1.59", "< 1.60"
+gem "aws-sdk-sns", ">= 1.38", "< 1.59"
+gem "aws-sdk-sqs", ">= 1.36", "< 1.59"
+gem "aws-sdk-lambda", ">= 1.62", "< 1.80"
 
 gemspec path: "../"

data/gemfiles/aws_60.gemfile

@@ -0,0 +1,19 @@
+# (c) Copyright IBM Corp. 2023
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "minitest", "5.18.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.90"
+gem "aws-sdk-s3", ">= 1.127"
+gem "aws-sdk-sns", ">= 1.63"
+gem "aws-sdk-sqs", ">= 1.59"
+gem "aws-sdk-lambda", ">= 1.101"
+
+gemspec path: "../"

data/gemfiles/cuba_30.gemfile

@@ -7,7 +7,7 @@ source "https://rubygems.org"
 
 gem "rack", "<3.0.0"
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/cuba_40.gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "rack", ">=3.0.0"
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/dalli_20.gemfile

@@ -6,7 +6,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/dalli_30.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/dalli_32.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/excon_02.gemfile

@@ -5,9 +5,10 @@
 
 source "https://rubygems.org"
 
-gem "rack", "<3.0.0"
+gem "rack"
+gem "rackup"
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/excon_021.gemfile

@@ -5,8 +5,10 @@
 
 source "https://rubygems.org"
 
+gem "rack"
+gem "rackup"
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/excon_079.gemfile

@@ -5,9 +5,10 @@
 
 source "https://rubygems.org"
 
-gem "rack", "<3.0.0"
+gem "rack"
+gem "rackup"
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/excon_100.gemfile

@@ -2,9 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "rack", "<3.0.0"
+gem "rack"
+gem "rackup"
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/graphql_10.gemfile

@@ -6,7 +6,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/graphql_20.gemfile

@@ -6,7 +6,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/grpc_10.gemfile

@@ -6,7 +6,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/mongo_216.gemfile

@@ -6,13 +6,13 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"
 gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
-gem "mongo", ">= 2.16", "< 3"
+gem "mongo", ">= 2.16", "< 2.19"
 
 gemspec path: "../"

data/gemfiles/mongo_219.gemfile

@@ -0,0 +1,15 @@
+# (c) Copyright IBM Corp. 2023
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "minitest", "5.18.1"
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rubocop", "~> 1.9"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "mongo", ">= 2.19"
+
+gemspec path: "../"

data/gemfiles/net_http_01.gemfile

@@ -5,9 +5,10 @@
 
 source "https://rubygems.org"
 
-gem "rack", "<3.0.0"
+gem "rack"
+gem "rackup"
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/rack_16.gemfile

@@ -6,7 +6,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/rack_20.gemfile

@@ -6,7 +6,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/rack_30.gemfile

@@ -0,0 +1,16 @@
+# (c) Copyright IBM Corp. 2023
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "minitest", "5.18.1"
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rubocop", "~> 1.9"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "rack", ">= 3.0.8"
+gem "rackup", ">= 2.1.0"
+
+gemspec path: "../"

data/gemfiles/rails_42.gemfile

@@ -6,7 +6,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/rails_50.gemfile

@@ -6,7 +6,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/rails_52.gemfile

@@ -6,7 +6,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/rails_60.gemfile

@@ -6,7 +6,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/rails_61.gemfile

@@ -6,7 +6,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/rails_70.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/redis_40.gemfile

@@ -6,7 +6,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/resque_122.gemfile

@@ -6,7 +6,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/resque_20.gemfile

@@ -7,13 +7,13 @@ source "https://rubygems.org"
 
 gem "redis", "< 5.0.0"
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"
 gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
-gem "resque", ">= 2.0", "< 2.3.0"
+gem "resque", ">= 2.5.0"
 
 gemspec path: "../"

data/gemfiles/rest_client_16.gemfile

@@ -5,9 +5,10 @@
 
 source "https://rubygems.org"
 
-gem "rack", "<3.0.0"
+gem "rack"
+gem "rackup"
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/rest_client_20.gemfile

@@ -5,9 +5,10 @@
 
 source "https://rubygems.org"
 
-gem "rack", "<3.0.0"
+gem "rack"
+gem "rackup"
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/roda_20.gemfile

@@ -7,7 +7,7 @@ source "https://rubygems.org"
 
 gem "rack", "<3.0.0"
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/roda_30.gemfile

@@ -7,13 +7,13 @@ source "https://rubygems.org"
 
 gem "rack", "<3.0.0"
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"
 gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
-gem "roda", ">= 3.0", "< 4.0"
+gem "roda", ">= 3.69.0"
 
 gemspec path: "../"

data/gemfiles/shoryuken_50.gemfile

@@ -6,14 +6,14 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"
 gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
-gem "shoryuken", "~> 5.2"
+gem "shoryuken", ">= 5.2", "< 6.0"
 gem "aws-sdk-sqs", "~> 1.36"
 
 gemspec path: "../"

data/gemfiles/shoryuken_60.gemfile

@@ -0,0 +1,16 @@
+# (c) Copyright IBM Corp. 2023
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "minitest", "5.18.1"
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rubocop", "~> 1.9"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "shoryuken", ">= 6.0"
+gem "aws-sdk-sqs", "~> 1.59"
+
+gemspec path: "../"

data/gemfiles/sidekiq_42.gemfile

@@ -6,7 +6,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/sidekiq_50.gemfile

@@ -6,7 +6,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/sidekiq_60.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/sidekiq_70.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"

data/gemfiles/sinatra_14.gemfile

@@ -6,13 +6,13 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "minitest", "5.9.1"
+gem "minitest", "5.18.1"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"
 gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
-gem "sinatra", "1.4.7"
+gem "sinatra", ">= 1.4.8", "< 2.0"
 
 gemspec path: "../"

data/gemfiles/sinatra_22.gemfile

@@ -0,0 +1,15 @@
+# (c) Copyright IBM Corp. 2023
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "minitest", "5.18.1"
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rubocop", "~> 1.9"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "sinatra", ">= 2.2.4", "< 3.0"
+
+gemspec path: "../"

data/gemfiles/sinatra_30.gemfile

@@ -0,0 +1,15 @@
+# (c) Copyright IBM Corp. 2023
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "minitest", "5.18.1"
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rubocop", "~> 1.9"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "sinatra", ">= 3.0.6"
+
+gemspec path: "../"

data/lib/instana/activator.rb

@@ -43,16 +43,27 @@ module Instana
   end
 end
 
-Dir["#{__dir__}/activators/*.rb"]
-  .sort
-  .select do |f|
-  # :nocov:
+DIRECTORY_OF_ACTIVATORS = "#{__dir__}/activators/".freeze
+
+def activated_set
+  all_activators = Set.new(
+    Dir["*.rb", base: DIRECTORY_OF_ACTIVATORS].map do |f|
+      File.basename(f, '.rb')
+    end
+  )
+
   if ENV['INSTANA_ACTIVATE_SET']
-    base = File.basename(f, '.rb')
-    ENV.fetch('INSTANA_ACTIVATE_SET', '').split(',').include?(base)
+    selected_activators = Set.new(ENV.fetch('INSTANA_ACTIVATE_SET', '').split(','))
+    all_activators & selected_activators
   else
-    true
+    all_activators
   end
-  # :nocov:
 end
-  .each { |f| require(f) }
+
+def require_selected_activator_files
+  activated_set.each do |f|
+    require("#{DIRECTORY_OF_ACTIVATORS}#{f}.rb")
+  end
+end
+
+require_selected_activator_files

data/lib/instana/backend/serverless_agent.rb

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

data/lib/instana/version.rb

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

data/test/activator_test.rb

@@ -27,4 +27,24 @@ class ActivatorTest < Minitest::Test
     assert_equal 1, Instana::Activator.call.length
     assert subject.call
   end
+
+  def test_limited_activated_set
+    ENV['INSTANA_ACTIVATE_SET'] = 'rack,rails'
+    subject = activated_set
+    assert_instance_of Set, subject
+    assert_equal 2, subject.length
+    assert_includes subject, 'rack'
+    assert_includes subject, 'rails'
+  ensure
+    ENV.delete('INSTANA_ACTIVATE_SET')
+  end
+
+  def test_unlimited_activated_set
+    ENV.delete('INSTANA_ACTIVATE_SET')
+    subject = activated_set
+    assert_instance_of Set, subject
+    assert_equal 31, subject.length
+  ensure
+    ENV.delete('INSTANA_ACTIVATE_SET')
+  end
 end

data/test/instrumentation/aws_test.rb

@@ -36,17 +36,18 @@ class AwsTest < Minitest::Test
   end
 
   def test_s3
-    dynamo = Aws::S3::Client.new(
+    s3_client = Aws::S3::Client.new(
       region: "local",
       access_key_id: "minioadmin",
       secret_access_key: "minioadmin",
+      force_path_style: "true",
       endpoint: "http://localhost:9000"
     )
 
     assert_raises Aws::S3::Errors::NoSuchBucket do
       Instana::Tracer.start_or_continue_trace(:s3_test, {}) do
-        dynamo.get_object(
-          bucket: 'sample_bucket',
+        s3_client.get_object(
+          bucket: 'sample-bucket',
           key: 'sample_key'
         )
       end
@@ -59,7 +60,7 @@ class AwsTest < Minitest::Test
     assert_equal entry_span[:s], s3_span[:p]
     assert_equal :s3, s3_span[:n]
     assert_equal 'get', s3_span[:data][:s3][:op]
-    assert_equal 'sample_bucket', s3_span[:data][:s3][:bucket]
+    assert_equal 'sample-bucket', s3_span[:data][:s3][:bucket]
     assert_equal 'sample_key', s3_span[:data][:s3][:key]
   end
 

data/test/instrumentation/rack_test.rb

@@ -3,7 +3,13 @@
 
 require 'test_helper'
 require 'rack/test'
-require 'rack/lobster'
+
+framework_version = Gem::Specification.find_by_name('rack').version
+if framework_version < Gem::Version.new('3.0.0')
+  require 'rack/lobster'
+else
+  require 'rackup/lobster'
+end
 
 class RackTest < Minitest::Test
   include Rack::Test::Methods
@@ -34,11 +40,16 @@ class RackTest < Minitest::Test
   end
 
   def app
+    framework_version = Gem::Specification.find_by_name('rack').version
     @app = Rack::Builder.new do
       use Rack::CommonLogger
       use Rack::ShowExceptions
       use Instana::Rack
-      map("/mrlobster") { run Rack::Lobster.new }
+      if framework_version < Gem::Version.new('3.0.0')
+        map("/mrlobster") { run Rack::Lobster.new }
+      else
+        map("/mrlobster") { run Rackup::Lobster.new }
+      end
       map("/path_tpl") { run PathTemplateApp.new }
       map("/error") { run ErrorApp.new }
       map("/five_zero_one") { run FiveZeroOneApp.new }

data/test/support/apps/http_endpoint/boot.rb

@@ -22,7 +22,7 @@ Thread.new do
     end
   }
 
-  Rack::Handler::Puma.run(app, Host: '127.0.0.1', Port: 6511)
+  Rackup::Handler::Puma.run(app, Host: '127.0.0.1', Port: 6511)
 end
 
 sleep(2)

data/test/test_helper.rb

@@ -26,9 +26,12 @@ begin
       add_filter %r{lib/instana/(activators|frameworks|instrumentation)}
     end
 
-    if ENV['CI']
-      formatter SimpleCov::Formatter::JSONFormatter
-    end
+    formatter SimpleCov::Formatter::MultiFormatter.new(
+      [
+        SimpleCov::Formatter::HTMLFormatter,
+        SimpleCov::Formatter::JSONFormatter
+      ]
+    )
   end
 rescue LoadError => _e
   nil

data/test/tracing/custom_test.rb

@@ -42,6 +42,70 @@ class CustomTracingTest < Minitest::Test
     assert_equal ::Instana.agent.source, first_span[:f]
   end
 
+  # automagic (TM) as seen in the docs:
+  # https://www.ibm.com/docs/en/instana-observability/current?topic=ruby-tracing-sdk#the-instana-ruby-tracing-sdk
+  def test_custom_tracing_with_nested_automagic
+    clear_all!
+    assert_equal false, ::Instana.tracer.tracing?
+
+    kvs = {}
+    kvs[:on_entry_kv] = 1
+    kvs[:arguments] = [[1,2,3], "test_arg", :ok]
+    kvs[:return] = true
+
+    # Start tracing
+    ::Instana.tracer.log_start_or_continue(:rack, :on_trace_start => 1)
+    assert_equal true, ::Instana.tracer.tracing?
+
+    # Now the automagic
+    ::Instana.tracer.trace(:custom_span, kvs) do
+      answer = 42 * 1
+      active_span = ::Instana.tracer.current_span
+      active_span.set_tag(:answer, answer)
+
+      # And now nested automagic
+      ::Instana.tracer.trace(:custom_span2, kvs) do
+        was_here = 'stan'
+        active_span = ::Instana.tracer.current_span
+        active_span.set_tag(:was_here, was_here)
+      end
+    end
+
+    # End tracing
+    ::Instana.tracer.log_end(:rack, {:on_trace_end => 1})
+    assert_equal false, ::Instana.tracer.tracing?
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 3, spans.length
+
+    second_span = find_first_span_by_name(spans, :custom_span)
+    third_span = find_first_span_by_name(spans, :custom_span2)
+
+    assert_equal :sdk, second_span[:n]
+    assert second_span.key?(:data)
+    assert second_span[:data].key?(:sdk)
+    assert second_span[:data][:sdk].key?(:custom)
+    assert second_span[:data][:sdk][:custom].key?(:tags)
+    assert :custom_span, second_span[:data][:sdk][:name]
+    assert :unknown, second_span[:data][:sdk][:type]
+    assert [[1, 2, 3], "test_arg", :ok], second_span[:data][:sdk][:arguments]
+    assert true, second_span[:data][:sdk][:return]
+    assert_equal 1, second_span[:data][:sdk][:custom][:tags][:on_entry_kv]
+    assert_equal 42, second_span[:data][:sdk][:custom][:tags][:answer]
+
+    assert_equal :sdk, third_span[:n]
+    assert third_span.key?(:data)
+    assert third_span[:data].key?(:sdk)
+    assert third_span[:data][:sdk].key?(:custom)
+    assert third_span[:data][:sdk][:custom].key?(:tags)
+    assert :custom_span, third_span[:data][:sdk][:name]
+    assert :unknown, third_span[:data][:sdk][:type]
+    assert [[1, 2, 3], "test_arg", :ok], third_span[:data][:sdk][:arguments]
+    assert true, third_span[:data][:sdk][:return]
+    assert_equal 1, third_span[:data][:sdk][:custom][:tags][:on_entry_kv]
+    assert_equal 'stan', third_span[:data][:sdk][:custom][:tags][:was_here]
+  end
+
   def test_custom_tracing_with_args
     clear_all!
     assert_equal false, ::Instana.tracer.tracing?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.210.1
+  version: 1.211.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-23 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,6 +138,7 @@ files:
 - ".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"
@@ -148,6 +149,7 @@ files:
 - MAINTAINERS.md
 - README.md
 - Rakefile
+- bin/announce_release_on_slack.py
 - bin/console
 - bin/setup
 - docker-compose.yml
@@ -156,6 +158,7 @@ files:
 - 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
@@ -169,9 +172,11 @@ files:
 - 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
@@ -186,11 +191,14 @@ files:
 - gemfiles/roda_20.gemfile
 - gemfiles/roda_30.gemfile
 - gemfiles/shoryuken_50.gemfile
+- gemfiles/shoryuken_60.gemfile
 - gemfiles/sidekiq_42.gemfile
 - gemfiles/sidekiq_50.gemfile
 - gemfiles/sidekiq_60.gemfile
 - gemfiles/sidekiq_70.gemfile
 - gemfiles/sinatra_14.gemfile
+- gemfiles/sinatra_22.gemfile
+- gemfiles/sinatra_30.gemfile
 - instana.gemspec
 - lib/instana.rb
 - lib/instana/activator.rb