instana 1.210.0 → 1.211.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0c28b91f8eb2d64963d01cf4a2368efbdb21ca9d9a8290324c382730d7a4785
-  data.tar.gz: b36132d8b22cf57151889f9955f58656cf8d02048c148bf3c7bc62b619926604
+  metadata.gz: 8d5a6d5f952c612a4409a7706048b48a09d315556598c9473485c6c558ba0239
+  data.tar.gz: 232ab891cd7f9096691c27bbcd290bcaf98d84c91cf433fa7d623d0824d5e572
 SHA512:
-  metadata.gz: b55ba81f80d1d99e79225cf611fe435b7db3ea64ff4dd2ce0044fa524d0ccf1618b52cf01de59daf9e60fc8d0c78caf6425f00c8a8983ad92eea505c5036e0a2
-  data.tar.gz: de69af23be0d789a7468f8927ed948ced66ebb7e3f49d78422d52dbc08988dfe2427c7690c06e105cb429d62447cd9bd863543ca9fd982864d8899cf38e3ca58
+  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,44 +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/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:
@@ -347,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

@@ -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 "dalli", "< 3.1.3"
+
+gemspec path: "../"

data/gemfiles/dalli_32.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 "dalli", ">= 3.2.5"
+
+gemspec path: "../"

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"