instana 1.215.0 → 1.216.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18251267394e2bad33fbd75aec3a2c9a8c846ae7076ee101dc7aa58cdf4b12d1
-  data.tar.gz: 920422e3ad64902191910d428335ec984ff56ece4204a6f53ef709fc07dff166
+  metadata.gz: d537c1bb144d87403ff4f77159269e31e8af893fd31f6c942d5d6c00a2f89a4a
+  data.tar.gz: 81d978a21bd5bd84c1305851a34570a20c69dd794ccaef7081490db78037c5d4
 SHA512:
-  metadata.gz: bbd2324015660989cfdc10af661fc2416ffa473291affdfe06d0e2aa78a2f0de1accc570962166cd9cf7a6c50e9bd68e91efd483e0a69d68e93816f9fac59705
-  data.tar.gz: cfcd4bb472effa2ff81c04eb4b768cd91d70dcf56b59794c00644aacfb36872797e864bb5b60511ff2b1fca2409ce441226b9fe9bf5ff3b8f342da5f3e1762bc
+  metadata.gz: 423d36b04c2e7b6035b566d0bd9617dfd9c2d7700e8d0c8ae934ce2631703cdc4e875ac73a64b136aed2f511a07bb5cfdd257c881a293a2cb85b66bc1d347bd9
+  data.tar.gz: ef472837810e93803daef7776c0b0e664093ddb72cb44f149be2798c9f8ddc0d26eeefe25a9d01a5114e42fb578d050ddc75e03470d1735d1d34eecd5226baa5

data/.circleci/config.yml

@@ -183,6 +183,43 @@ executors:
         environment:
           POSTGRES_PASSWORD: 'test'
           POSTGRES_DB: 'ci_test'
+  ruby_34:
+    docker:
+      - image: ruby:3.4.0-preview1-bookworm
+        environment:
+          MEMCACHED_HOST: '127.0.0.1:11211'
+          REDIS_URL: 'redis://127.0.0.1:6379'
+          DATABASE_URL: 'sqlite3::memory:'
+      - image: memcached
+      - image: redis
+      - image: amazon/dynamodb-local
+      - image: minio/minio:latest
+        command: ["server", "/data"]
+      - image: s12v/sns
+      - image: softwaremill/elasticmq-native
+      - image: mongo:5-focal
+  ruby_34_mysql2:
+    docker:
+      - image: ruby:3.4.0-preview1-bookworm
+        environment:
+          DATABASE_URL: "mysql2://root@127.0.0.1:3306/ci_test"
+      - image: mariadb
+        environment:
+          MYSQL_DATABASE: 'ci_test'
+          MYSQL_USER: 'root'
+          MYSQL_PASSWORD: ''
+          MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
+          MYSQL_ROOT_PASSWORD: ''
+          MYSQL_ROOT_HOST: '%'
+  ruby_34_postgres:
+    docker:
+      - image: ruby:3.4.0-preview1-bookworm
+        environment:
+          DATABASE_URL: "postgres://postgres:test@127.0.0.1:5432/ci_test"
+      - image: postgres
+        environment:
+          POSTGRES_PASSWORD: 'test'
+          POSTGRES_DB: 'ci_test'
   ruby_33_lint:
     docker:
       - image: cimg/ruby:3.3-node
@@ -319,12 +356,12 @@ jobs:
             bundle check || bundle install
       - run_rubocop
   report_coverage:
-    executor: ruby_32
+    executor: ruby_33
     steps:
       - checkout
       - run_sonarqube
   publish:
-    executor: ruby_30
+    executor: ruby_33
     steps:
       - checkout
       - setup
@@ -350,7 +387,8 @@ workflows:
                 - ruby_31
                 - ruby_32
                 - ruby_33
-  libraries_ruby_3:
+                - ruby_34
+  libraries_ruby_30_32:
     jobs:
       - test_apprisal:
           matrix:
@@ -359,8 +397,26 @@ workflows:
                 - ruby_30
                 - ruby_31
                 - ruby_32
+              <<: *library_gemfile
+  libraries_ruby_33_34:
+    jobs:
+      - test_apprisal:
+          matrix:
+            parameters:
+              stack:
                 - ruby_33
+                - ruby_34
               <<: *library_gemfile
+            # Currently compiling the native extensions for `grpc`
+            # exceeds an internal RAM and/or CPU limit of CircleCI executor,
+            # and the job gets terminated with:
+            # `Received "killed" signal`
+            # Hence we exclude it here for the time being.
+            # TODO: Remove this exclusion as soon as pre-built binaries are available
+            # on https://rubygems.org/gems/grpc/versions
+            exclude:
+            - stack: ruby_34
+              gemfile: "./gemfiles/grpc_10.gemfile"
   rails_ruby_3:
     jobs:
       - test_apprisal:
@@ -376,12 +432,36 @@ workflows:
                 - ruby_32
                 - ruby_32_postgres
                 - ruby_32_mysql2
+                - ruby_33
                 - ruby_33_postgres
                 - ruby_33_mysql2
+                - ruby_34
+                - ruby_34_postgres
+                - ruby_34_mysql2
               gemfile:
                 - "./gemfiles/rails_61.gemfile"
                 - "./gemfiles/rails_70.gemfile"
                 - "./gemfiles/rails_71.gemfile"
+  sequel:
+      jobs:
+      - test_apprisal:
+          matrix:
+            parameters:
+              stack:
+                - ruby_30
+                - ruby_30_mysql2
+                - ruby_31
+                - ruby_31_mysql2
+                - ruby_32
+                - ruby_32_mysql2
+                - ruby_33
+                - ruby_33_mysql2
+                - ruby_34
+                - ruby_34_mysql2
+              gemfile:
+                - "./gemfiles/sequel_56.gemfile"
+                - "./gemfiles/sequel_57.gemfile"
+                - "./gemfiles/sequel_58.gemfile"
   report_coverage:
     jobs:
       - report_coverage

data/.tekton/.currency/resources/requirements.txt

@@ -2,4 +2,3 @@ requests
 pandas
 beautifulsoup4
 tabulate
-kubernetes

data/.tekton/.currency/resources/table.json

@@ -8,19 +8,19 @@
       },
       {
         "Package name": "Rack",
-        "Support Policy": "0-day",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "No"
       },
       {
         "Package name": "Rails",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "No"
       },
       {
         "Package name": "Rails::API",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "No"
       },
@@ -32,61 +32,61 @@
       },
       {
         "Package name": "Roda",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "No"
       },
       {
         "Package name": "Sinatra",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "No"
       },
       {
         "Package name": "Excon",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "Yes"
       },
       {
         "Package name": "gRPC",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "No"
       },
       {
         "Package name": "Net::HTTP",
         "Support Policy": "0-day",
-        "Beta version": "No",
+        "Beta version": "Yes",
         "Cloud Native": "No"
       },
       {
         "Package name": "Rest-Client",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "No"
       },
       {
         "Package name": "Dalli",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "No"
       },
       {
         "Package name": "Resque",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "Yes"
       },
       {
         "Package name": "Sidekiq",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "Yes"
       },
       {
         "Package name": "GraphQL",
-        "Support Policy": "30-days",
+        "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "Yes"
       }

data/.tekton/.currency/scripts/generate_report.py

@@ -1,4 +1,5 @@
 # Standard Libraries
+import glob
 import re
 from json import load
 
@@ -6,143 +7,49 @@ from json import load
 from requests import get
 from pandas import DataFrame
 from bs4 import BeautifulSoup
-from kubernetes import client, config
 
 JSON_FILE = "resources/table.json"
 REPORT_FILE = "docs/report.md"
 API_V1_ENDPOINT = "https://rubygems.org/api/v1/versions/"
 
-def filter_taskruns(taskrun_filter, taskruns):
-    filtered_taskruns = list(filter(taskrun_filter, taskruns))
-    filtered_taskruns.sort(
-        key=lambda tr: tr["metadata"]["creationTimestamp"], reverse=True
-    )
-
-    return filtered_taskruns
-
-
-def get_taskruns(namespace, task_name):
-    group = "tekton.dev"
-    version = "v1"
-    plural = "taskruns"
-
-    # access the custom resource from tekton
-    tektonV1 = client.CustomObjectsApi()
-    taskruns = tektonV1.list_namespaced_custom_object(
-        group,
-        version,
-        namespace,
-        plural,
-        label_selector=f"{group}/task={task_name}, triggers.tekton.dev/trigger=ruby-tracer-scheduled-pipeline-triggger",
-    )["items"]
-
-    return taskruns
-
-
-def process_taskrun_logs(
-    taskruns, core_v1_client, namespace, library, tekton_ci_output
-):
-    for tr in taskruns:
-        pod_name = tr["status"]["podName"]
-        taskrun_name = tr["metadata"]["name"]
-        logs = core_v1_client.read_namespaced_pod_log(
-            pod_name, namespace, container="step-unittest"
-        )
-        if "Installing" not in logs:
-            print(
-                f"Unable to retrieve logs from taskrun pod {pod_name} of taskrun {taskrun_name} for gem {library}."
-            )
-            continue
-
-        print(
-            f"Retrieving logs from taskrun pod {pod_name} of taskrun {taskrun_name} for gem {library}.."
-        )
-
-        match = re.search(f"Installing ({library} [^\s]+)", logs)
-        tekton_ci_output += f"{match[1]}\n"
-        break
-
-    return tekton_ci_output
-
-
-def get_tekton_ci_output():
-    config.load_incluster_config()
-
-    namespace = "default"
-    core_v1_client = client.CoreV1Api()
-
-    ruby_33_prefix = "unittest-default-ruby-33-"
-    ruby_31_prefix = "unittest-default-ruby-31-"
-
-    default_libraries_dict = {
-        "cuba": f"{ruby_33_prefix}1",
-        "excon": f"{ruby_33_prefix}4",
-        "graphql": f"{ruby_33_prefix}6",
-        "grpc": f"{ruby_33_prefix}7",
-        "rack": f"{ruby_33_prefix}10",
-        "rest-client": f"{ruby_33_prefix}11",
-        "roda": f"{ruby_33_prefix}13",
-        "sinatra": f"{ruby_33_prefix}16",
-        "net-http": f"{ruby_31_prefix}8",
+def get_bundle_install_output():
+
+    libraries_from_logs = {
+        "cuba": "cuba_40_ruby_3.3.",
+        "excon": "excon_100_ruby_3.3.",
+        "graphql": "graphql_20_ruby_3.3.",
+        "grpc": "grpc_10_ruby_3.3.",
+        "rack": "rack_30_ruby_3.3.",
+        "rest-client": "rest_client_20_ruby_3.3.",
+        "roda": "roda_30_ruby_3.3.",
+        "sinatra": "sinatra_40_ruby_3.3.",
+        "net-http": "net_http_01_ruby_3.1.",
+        "rails": "rails_71_sqlite3_ruby_3.3.",
+        "dalli": "dalli_32_ruby_3.3.",
+        "resque": "resque_20_ruby_3.3.",
+        "sidekiq": "sidekiq_70_ruby_3.3."
     }
 
-    tekton_ci_output = ""
-    task_name = "ruby-tracer-unittest-default-libraries-task"
-    default_taskruns = get_taskruns(namespace, task_name)
+    bundle_install_output = ""
 
-    for library, pattern in default_libraries_dict.items():
-        taskrun_filter = (
-            lambda tr: tr["metadata"]["name"].endswith(pattern)
-            and tr["status"]["conditions"][0]["type"] == "Succeeded"
-        )
-        filtered_default_taskruns = filter_taskruns(taskrun_filter, default_taskruns)
-
-        tekton_ci_output = process_taskrun_logs(
-            filtered_default_taskruns,
-            core_v1_client,
-            namespace,
-            library,
-            tekton_ci_output,
-        )
+    for library, pattern in libraries_from_logs.items():
+        glob_result = glob.glob(f"../../dep_{pattern}*")
+        if not glob_result:
+            print(f"Could not find bundle install log for gem '{library}'.")
+            continue
 
-    other_libraries_dict = {
-        "rails": {
-            "pattern": "rails-postgres-11",
-            "task_name": "ruby-tracer-unittest-rails-postgres-task",
-        },
-        "dalli": {
-            "pattern": "memcached-11",
-            "task_name": "ruby-tracer-unittest-memcached-libraries-task",
-        },
-        "resque": {
-            "pattern": "unittest-redis-ruby-32-33-9",
-            "task_name": "ruby-tracer-unittest-redis-libraries-task",
-        },
-        "sidekiq": {
-            "pattern": "unittest-redis-ruby-32-33-18",
-            "task_name": "ruby-tracer-unittest-redis-libraries-task",
-        },
-    }
+        with open(glob_result[0], 'r') as file:
+            logs = file.read().replace('\n', ' ')
 
-    for library, inner_dict in other_libraries_dict.items():
-        pattern = inner_dict["pattern"]
-        task_name = inner_dict["task_name"]
-        taskrun_filter = (
-            lambda tr: tr["metadata"]["name"].endswith(pattern)
-            and tr["status"]["conditions"][0]["type"] == "Succeeded"
-        )
-        other_taskruns = get_taskruns(namespace, task_name)
-        filtered_other_taskruns = filter_taskruns(taskrun_filter, other_taskruns)
-
-        tekton_ci_output = process_taskrun_logs(
-            filtered_other_taskruns,
-            core_v1_client,
-            namespace,
-            library,
-            tekton_ci_output
-        )
+        if "Installing" not in logs:
+            print( f"Unable to retrieve logs from for gem '{library}'.")
+            continue
+
+        print(f"Retrieving currency for gem '{library}'.")
+        match = re.search(f"Installing ({library} [^\s]+)", logs)
+        bundle_install_output += f"{match[1]}\n"
 
-    return tekton_ci_output
+    return bundle_install_output
 
 
 def get_upstream_version(dependency):
@@ -161,11 +68,11 @@ def get_upstream_version(dependency):
     return latest_version
 
 
-def get_last_supported_version(tekton_ci_output, dependency):
+def get_last_supported_version(bundle_install_output, dependency):
     """get up-to-date supported version"""
     pattern = r" ([^\s]+)"
 
-    last_supported_version = re.search(dependency + pattern, tekton_ci_output, flags=re.I | re.M)
+    last_supported_version = re.search(dependency + pattern, bundle_install_output, flags=re.I | re.M)
 
     return last_supported_version[1]
 
@@ -183,7 +90,7 @@ def main():
     with open(JSON_FILE) as file:
         data = load(file)
 
-    tekton_ci_output = get_tekton_ci_output()
+    bundle_install_output = get_bundle_install_output()
 
     items = data["table"]
 
@@ -194,7 +101,7 @@ def main():
         latest_version = get_upstream_version(package)
 
         if not package in ["rails lts", "rails-api"]:
-            last_supported_version = get_last_supported_version(tekton_ci_output, package)
+            last_supported_version = get_last_supported_version(bundle_install_output, package)
         else:
             last_supported_version = latest_version