instana 1.214.3 → 1.214.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e1392f093e37988f8cb349c73f1314d81b4058f896c244382328e636a18bd83
-  data.tar.gz: 307c18d065c6618c544e6b3bc2f622c184cafdb8c98096e375b84a0018bd6c6b
+  metadata.gz: 424b7ef31ac74b0ba82b7c010fe21074ccf6851670b18efe98fdf2d01360b71f
+  data.tar.gz: eabcd2216cc6c209444ba2e9400a4b446fdd31933c462b300d7f3e6fcdb7ee02
 SHA512:
-  metadata.gz: 1d895f1cc6dc321277f366a11040e6626c31e08b4486e662bdf407ea20e91d7c1927b04f7441a942e7392254a7d491c41c788bd0344109dee524514d31c3a074
-  data.tar.gz: 52f4e79e404d0ec0efe6f091f57cd09a9cfc8418d229a55324e5cf4e96a381b75a976a352b79c0659f03a805d5aab519df9b8c6a0b9d7e9ec7e99014601896fd
+  metadata.gz: 166f7c5dbf87cbec5ad22690ad848be4fbd2a02d37514c57ca9fc560f4d98248749fb9894f07567fe4d4fdabe2750c703df86136b1c2cb9f773a97c016d36a90
+  data.tar.gz: ad43e911090d2e4cc107157a6bf052428a610dac4911c7c843de99e4770c926a80ccc92517378ec41d4a836cfbc584c133027cf58f6f3f1bbaea538b098e9c2b

data/.circleci/config.yml

@@ -189,15 +189,6 @@ executors:
 commands:
   setup:
     steps:
-      - run:
-          name: Install iproute2
-          command: |
-            sudo apt-get update
-            sudo apt-get install iproute2
-      - run:
-          name: Install Java
-          command: |
-            sudo apt-get install openjdk-11-jdk
       - run:
           name: Update RubyGems
           command: |
@@ -239,7 +230,7 @@ commands:
           environment:
             BUNDLE_GEMFILE: './Gemfile'
       - run:
-          name: Run SonarQube to capture coverage
+          name: Run SonarQube to report the coverage
           command: |
             wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.8.1.3023.zip
             unzip -d /tmp /tmp/sonar-scanner-cli.zip

data/.tekton/.currency/currency-pipeline.yaml

@@ -0,0 +1,36 @@
+apiVersion: tekton.dev/v1beta1
+kind: Pipeline
+metadata:
+  name: ruby-currency-pipeline
+spec:
+  params:
+  - name: revision
+    type: string
+  workspaces:
+    - name: ruby-currency-pvc
+  tasks:
+    - name: clone-repo
+      params:
+      - name: revision
+        value: $(params.revision)
+      taskRef:
+        name: ruby-git-clone-task
+      workspaces:
+        - name: task-pvc
+          workspace: ruby-currency-pvc
+    - name: generate-currency-report
+      runAfter:
+        - clone-repo
+      taskRef:
+        name: ruby-generate-currency-report-task
+      workspaces:
+        - name: task-pvc
+          workspace: ruby-currency-pvc
+    - name: upload-currency-report
+      runAfter:
+        - generate-currency-report
+      taskRef:
+        name: ruby-upload-currency-report-task
+      workspaces:
+        - name: task-pvc
+          workspace: ruby-currency-pvc

data/.tekton/.currency/currency-pipelinerun.yaml

@@ -0,0 +1,20 @@
+apiVersion: tekton.dev/v1beta1
+kind: PipelineRun
+metadata:
+  name: ruby-currency-pipelinerun
+spec:
+  params:
+  - name: revision
+    value: "master"
+  pipelineRef:
+    name: ruby-currency-pipeline
+  serviceAccountName: currency-serviceaccount
+  workspaces:
+  - name: ruby-currency-pvc
+    volumeClaimTemplate:
+      spec:
+        accessModes:
+          - ReadWriteOnce
+        resources:
+          requests:
+            storage: 100Mi

data/.tekton/.currency/currency-rbac.yaml

@@ -0,0 +1,29 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: currency-serviceaccount
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: currency-clusterrole
+rules:
+- apiGroups: [""]
+  resources: ["pods", "pods/log"]
+  verbs: ["get", "list"]
+- apiGroups: ["tekton.dev"]
+  resources: ["taskruns"]
+  verbs: ["get", "list"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: currency-clusterrolebinding
+subjects:
+- kind: ServiceAccount
+  name: currency-serviceaccount
+  namespace: default
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: currency-clusterrole

data/.tekton/.currency/currency-scheduled-eventlistener.yaml

@@ -0,0 +1,56 @@
+apiVersion: triggers.tekton.dev/v1beta1
+kind: EventListener
+metadata:
+  name: ruby-currency-cron-listener
+spec:
+  serviceAccountName: tekton-triggers-eventlistener-serviceaccount
+  triggers:
+    - name: currency-cron-trigger
+      template:
+        ref: ruby-currency-trigger-template
+---
+apiVersion: triggers.tekton.dev/v1beta1
+kind: TriggerTemplate
+metadata:
+  name: ruby-currency-trigger-template
+spec:
+  resourcetemplates:
+  - apiVersion: tekton.dev/v1beta1
+    kind: PipelineRun
+    metadata:
+      generateName: ruby-currency-
+    spec:
+      pipelineRef:
+        name: ruby-currency-pipeline
+      serviceAccountName: currency-serviceaccount
+      params:
+      - name: revision
+        value: "master"
+      workspaces:
+      - name: ruby-currency-pvc
+        volumeClaimTemplate:
+          spec:
+            accessModes:
+              - ReadWriteOnce
+            resources:
+              requests:
+                storage: 100Mi
+---
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: ruby-currency-cronjob
+spec:
+  schedule: "5 3 * * Mon-Fri"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          containers:
+          - name: http-request-to-el-svc
+            # curlimages/curl:8.6.0
+            image: curlimages/curl@sha256:f2237028bed58de91f62aea74260bb2a299cf12fbcabc23cfaf125fef276c884
+            imagePullPolicy: IfNotPresent
+            args: ["curl", "-X", "POST", "--data", "{}", "el-ruby-currency-cron-listener.default.svc.cluster.local:8080"]
+          restartPolicy: OnFailure
+---

data/.tekton/.currency/currency-tasks.yaml

@@ -0,0 +1,94 @@
+apiVersion: tekton.dev/v1beta1
+kind: Task
+metadata:
+  name: ruby-git-clone-task
+spec:
+  params:
+  - name: revision
+    type: string
+  workspaces:
+    - name: task-pvc
+      mountPath: /workspace
+  steps:
+    - name: clone-repo
+      # alpine/git:2.43.0
+      image: alpine/git@sha256:6ff4de047dcc8f0c7d75d2efff63fbc189e87d2f458305f2cc8f165ff83309cf
+      script: |
+        #!/bin/sh
+        echo "Cloning repo"
+        cd /workspace && git clone --filter=blob:none --sparse --depth 1 https://github.com/instana/ruby-sensor -b $(params.revision)
+        cd ruby-sensor
+        git sparse-checkout add .tekton/.currency
+        ls -lah /workspace/ruby-sensor
+---
+apiVersion: tekton.dev/v1beta1
+kind: Task
+metadata:
+  name: ruby-generate-currency-report-task
+spec:
+  workspaces:
+    - name: task-pvc
+      mountPath: /workspace
+  steps:
+    - name: generate-currency-report
+      # 3.10.13-bookworm
+      image: python@sha256:c970ff53939772f47b0672e380328afb50d8fd1c0568ed4f82c22effc54244fc
+      script: |
+        #!/usr/bin/env bash
+
+        cd /workspace/ruby-sensor/.tekton/.currency
+
+        python -m venv /tmp/venv
+        source /tmp/venv/bin/activate
+        pip install -r resources/requirements.txt
+
+        python scripts/generate_report.py
+        if [ $? -ne 0 ]; then
+            echo "Error occured while generating the ruby tracer currency report." >&2
+            exit 1
+        fi
+        cat docs/report.md
+---
+apiVersion: tekton.dev/v1beta1
+kind: Task
+metadata:
+  name: ruby-upload-currency-report-task
+spec:
+  params:
+    - name: github-token-secret
+      default: instanacd-github-api-token
+  workspaces:
+    - name: task-pvc
+      mountPath: /workspace
+  steps:
+    - name: upload-currency-report
+      # alpine/git:2.43.0
+      image: alpine/git@sha256:6ff4de047dcc8f0c7d75d2efff63fbc189e87d2f458305f2cc8f165ff83309cf
+      env:
+        - name: GH_ENTERPRISE_TOKEN
+          valueFrom:
+            secretKeyRef:
+              name: $(params.github-token-secret)
+              key: "GH_ENTERPRISE_TOKEN"
+      script: |
+        #!/bin/sh
+
+        cd /workspace        
+        git clone https://oauth2:$GH_ENTERPRISE_TOKEN@github.ibm.com/instana/tracer-reports.git
+
+        if [ $? -ne 0 ]; then
+            echo "The attempt to clone the tracer-reports repository failed, preventing the upload of ruby tracer currency report." >&2
+            exit 1
+        fi
+
+        cd tracer-reports
+
+        cp ../ruby-sensor/.tekton/.currency/docs/report.md ./automated/currency/ruby/report.md
+
+        git config user.name "Instanacd PAT for GitHub Enterprise"
+        git config user.email instana.ibm.github.enterprise@ibm.com
+        
+        git add .
+        
+        git commit -m "chore: Updated ruby currency report"
+        git push origin main

data/.tekton/.currency/docs/report.md

@@ -0,0 +1,19 @@
+##### This page is auto-generated. Any change will be overwritten after the next sync. Please apply changes directly to the files in the [ruby tracer](https://github.com/instana/ruby-sensor) repo.
+## Ruby supported packages and versions
+| Package name   | Support Policy   | Beta version   | Last Supported Version   | Latest version   | Up-to-date   | Cloud Native   |
+|:---------------|:-----------------|:---------------|:-------------------------|:-----------------|:-------------|:---------------|
+| Cuba           | On demand        | No             | 4.0.3                    | 4.0.3            | Yes          | No             |
+| Rack           | 0-day            | No             | 3.1.3                    | 3.1.3            | Yes          | No             |
+| Rails          | 30-days          | No             | 7.1.3.4                  | 7.1.3.4          | Yes          | No             |
+| Rails::API     | 30-days          | No             | 0.4.1                    | 0.4.1            | Yes          | No             |
+| Rails LTS      | On demand        | No             | 5.2                      | 5.2              | Yes          | No             |
+| Roda           | 30-days          | No             | 3.81.0                   | 3.81.0           | Yes          | No             |
+| Sinatra        | 30-days          | No             | 4.0.0                    | 4.0.0            | Yes          | No             |
+| Excon          | 30-days          | No             | 0.110.0                  | 0.110.0          | Yes          | Yes            |
+| gRPC           | 30-days          | No             | 1.64.0                   | 1.64.0           | Yes          | No             |
+| Net::HTTP      | 0-day            | No             | 0.4.1                    | 0.4.1            | Yes          | No             |
+| Rest-Client    | 30-days          | No             | 2.1.0                    | 2.1.0            | Yes          | No             |
+| Dalli          | 30-days          | No             | 3.2.8                    | 3.2.8            | Yes          | No             |
+| Resque         | 30-days          | No             | 2.6.0                    | 2.6.0            | Yes          | Yes            |
+| Sidekiq        | 30-days          | No             | 7.2.4                    | 7.2.4            | Yes          | Yes            |
+| GraphQL        | 30-days          | No             | 2.3.5                    | 2.3.5            | Yes          | Yes            |

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

@@ -0,0 +1,5 @@
+requests
+pandas
+beautifulsoup4
+tabulate
+kubernetes

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

@@ -0,0 +1,94 @@
+{
+    "table": [
+      {
+        "Package name": "Cuba",
+        "Support Policy": "On demand",
+        "Beta version": "No",
+        "Cloud Native": "No"
+      },
+      {
+        "Package name": "Rack",
+        "Support Policy": "0-day",
+        "Beta version": "No",
+        "Cloud Native": "No"
+      },
+      {
+        "Package name": "Rails",
+        "Support Policy": "30-days",
+        "Beta version": "No",
+        "Cloud Native": "No"
+      },
+      {
+        "Package name": "Rails::API",
+        "Support Policy": "30-days",
+        "Beta version": "No",
+        "Cloud Native": "No"
+      },
+      {
+        "Package name": "Rails LTS",
+        "Support Policy": "On demand",
+        "Beta version": "No",
+        "Cloud Native": "No"
+      },
+      {
+        "Package name": "Roda",
+        "Support Policy": "30-days",
+        "Beta version": "No",
+        "Cloud Native": "No"
+      },
+      {
+        "Package name": "Sinatra",
+        "Support Policy": "30-days",
+        "Beta version": "No",
+        "Cloud Native": "No"
+      },
+      {
+        "Package name": "Excon",
+        "Support Policy": "30-days",
+        "Beta version": "No",
+        "Cloud Native": "Yes"
+      },
+      {
+        "Package name": "gRPC",
+        "Support Policy": "30-days",
+        "Beta version": "No",
+        "Cloud Native": "No"
+      },
+      {
+        "Package name": "Net::HTTP",
+        "Support Policy": "0-day",
+        "Beta version": "No",
+        "Cloud Native": "No"
+      },
+      {
+        "Package name": "Rest-Client",
+        "Support Policy": "30-days",
+        "Beta version": "No",
+        "Cloud Native": "No"
+      },
+      {
+        "Package name": "Dalli",
+        "Support Policy": "30-days",
+        "Beta version": "No",
+        "Cloud Native": "No"
+      },
+      {
+        "Package name": "Resque",
+        "Support Policy": "30-days",
+        "Beta version": "No",
+        "Cloud Native": "Yes"
+      },
+      {
+        "Package name": "Sidekiq",
+        "Support Policy": "30-days",
+        "Beta version": "No",
+        "Cloud Native": "Yes"
+      },
+      {
+        "Package name": "GraphQL",
+        "Support Policy": "30-days",
+        "Beta version": "No",
+        "Cloud Native": "Yes"
+      }
+    ]
+}

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

@@ -0,0 +1,228 @@
+# Standard Libraries
+import re
+from json import load
+
+# Third Party
+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",
+    }
+
+    tekton_ci_output = ""
+    task_name = "ruby-tracer-unittest-default-libraries-task"
+    default_taskruns = get_taskruns(namespace, task_name)
+
+    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,
+        )
+
+    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",
+        },
+    }
+
+    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
+        )
+
+    return tekton_ci_output
+
+
+def get_upstream_version(dependency):
+    """get the latest version available upstream"""
+    if dependency != "rails lts":
+        response = get(f"{API_V1_ENDPOINT}/{dependency}/latest.json")
+        response_json = response.json()
+        latest_version = response_json["version"]
+    else:
+        url = "https://makandracards.com/railslts/16137-installing-rails-lts/read"
+        page = get(url)
+        soup = BeautifulSoup(page.text, "html.parser")
+        text = soup.findAll("li")[-1].text
+        pattern = "(\d+\.\d+\.?\d*)"
+        latest_version = re.search(pattern, text)[1]
+    return latest_version
+
+
+def get_last_supported_version(tekton_ci_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)
+
+    return last_supported_version[1]
+
+
+def isUptodate(last_supported_version, latest_version):
+    if last_supported_version == latest_version:
+        up_to_date = "Yes"
+    else:
+        up_to_date = "No"
+
+    return up_to_date
+
+def main():
+    # Read the JSON file
+    with open(JSON_FILE) as file:
+        data = load(file)
+
+    tekton_ci_output = get_tekton_ci_output()
+
+    items = data["table"]
+
+    for item in items:
+        package = item["Package name"]
+        package = package.lower().replace("::", "-")
+
+        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)
+        else:
+            last_supported_version = latest_version
+
+        up_to_date = isUptodate(last_supported_version, latest_version)
+
+        item.update(
+            {
+                "Last Supported Version": last_supported_version,
+                "Latest version": latest_version,
+                "Up-to-date": up_to_date,
+            },
+        )
+
+    # Create a DataFrame from the list of dictionaries
+    df = DataFrame(items)
+    df.insert(len(df.columns) - 1, "Cloud Native", df.pop("Cloud Native"))
+
+    # Convert dataframe to markdown
+    markdown_table = df.to_markdown(index=False)
+
+    disclaimer = "##### This page is auto-generated. Any change will be overwritten after the next sync. Please apply changes directly to the files in the [ruby tracer](https://github.com/instana/ruby-sensor) repo."
+    title = "## Ruby supported packages and versions"
+
+    # Combine disclaimer, title, and markdown table with line breaks
+    final_markdown = disclaimer + "\n" + title + "\n" + markdown_table
+
+    with open(REPORT_FILE, "w") as file:
+        file.write(final_markdown)
+
+if __name__ == "__main__":
+    main()

data/.tekton/github-pr-eventlistener.yaml

@@ -21,6 +21,8 @@ spec:
         # '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'
         name: ruby-tracer-pr-$(tt.params.git-branch-normalized)-$(tt.params.git-commit-short-sha)
       spec:
+        timeouts:
+          pipeline: "2h"
         params:
         - name: revision
           value: $(tt.params.git-branch)

data/.tekton/pipeline.yaml

@@ -25,19 +25,49 @@ spec:
         params:
           - name: imageDigest
             value:
-            # 3.3.0-bookworm
-            - "sha256:67ccb9c63d2a2ae9fcc7df5448800b740e140691ac74534f9fc687dbf5ce0da2"
+            # 3.3.1-bookworm
+            - "sha256:5cf0004738f54bd67e4c4316394208ca38a6726eda7a1b0586d95601aad86e5d"
           - name: gemfile
             value:
             - "gemfiles/rubocop_162.gemfile"
+          - name: configuration
+            value:
+            - "lint"
+      taskRef:
+        name: ruby-tracer-unittest-default-libraries-task
+      workspaces:
+        - name: task-pvc
+          workspace: ruby-tracer-ci-pipeline-pvc
+    - name: core
+      runAfter:
+        - clone
+      matrix:
+        params:
+          - name: imageDigest
+            value:
+            # 3.0.6-bullseye
+            - "sha256:3166618469ad8a3190d80f43b322818fafb4bfac0b4882255eee3346af2a0a35"
+            # 3.1.4-bookworm
+            - "sha256:ec69284bcbceb0a23ffc070ef2e0e8eb0fe495c20efbd51846b103338c3da1e4"
+            # 3.2.3-bookworm
+            - "sha256:007d2edd515f9cfc8c5c571486aca4fc4a25c903d004decee302961bb8c636ed"
+            # 3.3.1-bookworm
+            - "sha256:5cf0004738f54bd67e4c4316394208ca38a6726eda7a1b0586d95601aad86e5d"
+          - name: gemfile
+            value:
+            - "./Gemfile"
+          - name: configuration
+            value:
+            - "core"
       taskRef:
-        name: ruby-tracer-lint-task
+        name: ruby-tracer-unittest-default-libraries-task
       workspaces:
         - name: task-pvc
           workspace: ruby-tracer-ci-pipeline-pvc
     - name: unittest-default-ruby-30
       runAfter:
         - lint
+        - core
       matrix:
         params:
           - name: imageDigest
@@ -65,6 +95,9 @@ spec:
             - "./gemfiles/sinatra_40.gemfile"
             - "./gemfiles/shoryuken_50.gemfile"
             - "./gemfiles/shoryuken_60.gemfile"
+          - name: configuration
+            value:
+            - "libraries"
       taskRef:
         name: ruby-tracer-unittest-default-libraries-task
       workspaces:
@@ -100,6 +133,9 @@ spec:
             - "./gemfiles/sinatra_40.gemfile"
             - "./gemfiles/shoryuken_50.gemfile"
             - "./gemfiles/shoryuken_60.gemfile"
+          - name: configuration
+            value:
+            - "libraries"
       taskRef:
         name: ruby-tracer-unittest-default-libraries-task
       workspaces:
@@ -135,6 +171,9 @@ spec:
             - "./gemfiles/sinatra_40.gemfile"
             - "./gemfiles/shoryuken_50.gemfile"
             - "./gemfiles/shoryuken_60.gemfile"
+          - name: configuration
+            value:
+            - "libraries"
       taskRef:
         name: ruby-tracer-unittest-default-libraries-task
       workspaces:
@@ -147,8 +186,8 @@ spec:
         params:
           - name: imageDigest
             value:
-            # 3.3.0-bookworm
-            - "sha256:67ccb9c63d2a2ae9fcc7df5448800b740e140691ac74534f9fc687dbf5ce0da2"
+            # 3.3.1-bookworm
+            - "sha256:5cf0004738f54bd67e4c4316394208ca38a6726eda7a1b0586d95601aad86e5d"
           - name: gemfile
             value:
             - "./gemfiles/cuba_30.gemfile"
@@ -170,6 +209,9 @@ spec:
             - "./gemfiles/sinatra_40.gemfile"
             - "./gemfiles/shoryuken_50.gemfile"
             - "./gemfiles/shoryuken_60.gemfile"
+          - name: configuration
+            value:
+            - "libraries"
       taskRef:
         name: ruby-tracer-unittest-default-libraries-task
       workspaces:
@@ -188,8 +230,8 @@ spec:
             - "sha256:ec69284bcbceb0a23ffc070ef2e0e8eb0fe495c20efbd51846b103338c3da1e4"
             # 3.2.3-bookworm
             - "sha256:007d2edd515f9cfc8c5c571486aca4fc4a25c903d004decee302961bb8c636ed"
-            # 3.3.0-bookworm
-            - "sha256:67ccb9c63d2a2ae9fcc7df5448800b740e140691ac74534f9fc687dbf5ce0da2"
+            # 3.3.1-bookworm
+            - "sha256:5cf0004738f54bd67e4c4316394208ca38a6726eda7a1b0586d95601aad86e5d"
           - name: gemfile
             value:
             - "./gemfiles/mongo_216.gemfile"
@@ -212,8 +254,8 @@ spec:
             - "sha256:ec69284bcbceb0a23ffc070ef2e0e8eb0fe495c20efbd51846b103338c3da1e4"
             # 3.2.3-bookworm
             - "sha256:007d2edd515f9cfc8c5c571486aca4fc4a25c903d004decee302961bb8c636ed"
-            # 3.3.0-bookworm
-            - "sha256:67ccb9c63d2a2ae9fcc7df5448800b740e140691ac74534f9fc687dbf5ce0da2"
+            # 3.3.1-bookworm
+            - "sha256:5cf0004738f54bd67e4c4316394208ca38a6726eda7a1b0586d95601aad86e5d"
           - name: gemfile
             value:
             - "./gemfiles/dalli_20.gemfile"
@@ -237,8 +279,8 @@ spec:
             - "sha256:ec69284bcbceb0a23ffc070ef2e0e8eb0fe495c20efbd51846b103338c3da1e4"
             # 3.2.3-bookworm
             - "sha256:007d2edd515f9cfc8c5c571486aca4fc4a25c903d004decee302961bb8c636ed"
-            # 3.3.0-bookworm
-            - "sha256:67ccb9c63d2a2ae9fcc7df5448800b740e140691ac74534f9fc687dbf5ce0da2"
+            # 3.3.1-bookworm
+            - "sha256:5cf0004738f54bd67e4c4316394208ca38a6726eda7a1b0586d95601aad86e5d"
           - name: gemfile
             value:
             - "./gemfiles/aws_30.gemfile"
@@ -285,8 +327,8 @@ spec:
             value:
             # 3.2.3-bookworm
             - "sha256:007d2edd515f9cfc8c5c571486aca4fc4a25c903d004decee302961bb8c636ed"
-            # 3.3.0-bookworm
-            - "sha256:67ccb9c63d2a2ae9fcc7df5448800b740e140691ac74534f9fc687dbf5ce0da2"
+            # 3.3.1-bookworm
+            - "sha256:5cf0004738f54bd67e4c4316394208ca38a6726eda7a1b0586d95601aad86e5d"
           - name: gemfile
             value:
             - "./gemfiles/redis_40.gemfile"
@@ -317,8 +359,8 @@ spec:
             - "sha256:ec69284bcbceb0a23ffc070ef2e0e8eb0fe495c20efbd51846b103338c3da1e4"
             # 3.2.3-bookworm
             - "sha256:007d2edd515f9cfc8c5c571486aca4fc4a25c903d004decee302961bb8c636ed"
-            # 3.3.0-bookworm
-            - "sha256:67ccb9c63d2a2ae9fcc7df5448800b740e140691ac74534f9fc687dbf5ce0da2"
+            # 3.3.1-bookworm
+            - "sha256:5cf0004738f54bd67e4c4316394208ca38a6726eda7a1b0586d95601aad86e5d"
           - name: gemfile
             value:
             - "./gemfiles/rails_61.gemfile"
@@ -342,8 +384,8 @@ spec:
             - "sha256:ec69284bcbceb0a23ffc070ef2e0e8eb0fe495c20efbd51846b103338c3da1e4"
             # 3.2.3-bookworm
             - "sha256:007d2edd515f9cfc8c5c571486aca4fc4a25c903d004decee302961bb8c636ed"
-            # 3.3.0-bookworm
-            - "sha256:67ccb9c63d2a2ae9fcc7df5448800b740e140691ac74534f9fc687dbf5ce0da2"
+            # 3.3.1-bookworm
+            - "sha256:5cf0004738f54bd67e4c4316394208ca38a6726eda7a1b0586d95601aad86e5d"
           - name: gemfile
             value:
             - "./gemfiles/rails_61.gemfile"
@@ -367,8 +409,8 @@ spec:
             - "sha256:ec69284bcbceb0a23ffc070ef2e0e8eb0fe495c20efbd51846b103338c3da1e4"
             # 3.2.3-bookworm
             - "sha256:007d2edd515f9cfc8c5c571486aca4fc4a25c903d004decee302961bb8c636ed"
-            # 3.3.0-bookworm
-            - "sha256:67ccb9c63d2a2ae9fcc7df5448800b740e140691ac74534f9fc687dbf5ce0da2"
+            # 3.3.1-bookworm
+            - "sha256:5cf0004738f54bd67e4c4316394208ca38a6726eda7a1b0586d95601aad86e5d"
           - name: gemfile
             value:
             - "./gemfiles/rails_61.gemfile"

data/.tekton/pipelinerun.yaml

@@ -3,6 +3,8 @@ kind: PipelineRun
 metadata:
   name: ruby-tracer-ci-pipeline-run
 spec:
+  timeouts:
+    pipeline: "2h"
   params:
   - name: revision
     value: "tekton"

data/.tekton/ruby-tracer-prepuller.yaml

@@ -0,0 +1,83 @@
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: ruby-tracer-prepuller
+spec:
+  selector:
+    matchLabels:
+      name: ruby-tracer-prepuller
+  template:
+    metadata:
+      labels:
+        name: ruby-tracer-prepuller
+    spec:
+      # Configure an init container for each image you want to pull
+      initContainers:
+        - name: prepuller-git
+          # alpine/git:2.43.0
+          image: alpine/git@sha256:6ff4de047dcc8f0c7d75d2efff63fbc189e87d2f458305f2cc8f165ff83309cf
+          command: ["sh", "-c", "'true'"]
+        - name: prepuller-dynamodb
+          # amazon/dynamodb-local:2.3.0
+          image: amazon/dynamodb-local@sha256:0e42a967205042118277be031a59f7aa035c2f90b1695b1b3250d0ce03a7c8f0
+          command: ["sh", "-c", "'true'"]
+        - name: prepuller-s3
+          # minio/minio:RELEASE.2024-03-07T00-43-48Z
+          image: minio/minio@sha256:9224601c529f424e5efac79f95606f0c7e1fe234f3f45344a49deaccd66d5bf5
+          command: ["sh", "-c", "'true'"]
+        - name: prepuller-sns
+          # s12v/sns:latest
+          image: s12v/sns@sha256:a80f1cd6318d22419cab38650ee6824f72cc2dc902d2b38e4f997d0530fe4e07
+          command: ["sh", "-c", "'true'"]
+        - name: prepuller-sqs
+          # softwaremill/elasticmq-native:1.5.7
+          image: softwaremill/elasticmq-native@sha256:9183333a9ea4666686c37dc83a2b1f8cee9c15ffd161a219a131e171039f1ac3
+          command: ["sh", "-c", "'true'"]
+        - name: prepuller-memcached
+          # memcached:1.6.24-bookworm
+          image: memcached@sha256:b2b562323463b6cda240a148fb2a5b7ea86e8017a8509e10a3c7f1681f259193
+          command: ["sh", "-c", "'true'"]
+        - name: prepuller-redis
+          # redis:7.2.4-bookworm
+          image: redis@sha256:fe98b2d39d462d06a7360e2860dd6ceff930745e3731eccb3c1406dd0dd7f744
+          command: ["sh", "-c", "'true'"]
+        - name: prepuller-mongo
+          # mongo:5.0.25-focal
+          image: mongo@sha256:d1b8a7b77424347397653ab8ff500c66b1e9979b4cebf826951d37b0d3966721
+          command: ["sh", "-c", "'true'"]
+        - name: prepuller-mariadb
+          # mariadb:11.3.2
+          image: mariadb@sha256:851f05fe1e4cb290442c1b12b7108436a33fd8f6a733d4989950322d06d45c65
+          command: ["sh", "-c", "'true'"]
+        - name: prepuller-postgres
+          # postgres:16.2-bookworm
+          image: postgres@sha256:6b841c8f6a819884207402f1209a8116844365df15fca8cf556fc54a24c70800
+          command: ["sh", "-c", "'true'"]
+        - name: prepuller-30
+          # 3.0.6-bullseye
+          image: ruby@sha256:3166618469ad8a3190d80f43b322818fafb4bfac0b4882255eee3346af2a0a35
+          command: ["sh", "-c", "'true'"]
+        - name: prepuller-31
+          # 3.1.4-bookworm
+          image: ruby@sha256:ec69284bcbceb0a23ffc070ef2e0e8eb0fe495c20efbd51846b103338c3da1e4
+          command: ["sh", "-c", "'true'"]
+        - name: prepuller-32
+          # 3.2.3-bookworm
+          image: ruby@sha256:007d2edd515f9cfc8c5c571486aca4fc4a25c903d004decee302961bb8c636ed
+          command: ["sh", "-c", "'true'"]
+        - name: prepuller-33
+          # 3.3.1-bookworm
+          image: ruby@sha256:5cf0004738f54bd67e4c4316394208ca38a6726eda7a1b0586d95601aad86e5d
+          command: ["sh", "-c", "'true'"]
+      # Use the pause container to ensure the Pod goes into a `Running` phase
+      # but doesn't take up resource on the cluster
+      containers:
+        - name: pause
+          image: gcr.io/google_containers/pause:3.2
+          resources:
+            limits:
+              cpu: 1m
+              memory: 8Mi
+            requests:
+              cpu: 1m
+              memory: 8Mi

data/.tekton/scheduled-eventlistener.yaml

@@ -19,6 +19,8 @@ spec:
         # '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'
         name: ruby-tracer-scheduled-ci-pipeline-$(tt.params.date-time-normalized)-$(tt.params.git-commit-short-sha)
       spec:
+        timeouts:
+          pipeline: "2h"
         params:
         - name: revision
           value: master

data/.tekton/task.yaml

@@ -273,30 +273,7 @@ spec:
   params:
   - name: imageDigest
     type: string
-  - name: gemfile
-    type: string
-  workspaces:
-    - name: task-pvc
-      mountPath: /workspace
-  steps:
-    - name: unittest
-      image: ruby@$(params.imageDigest)
-      env:
-        - name: TEST_CONFIGURATION
-          value: libraries
-        - name: BUNDLE_GEMFILE
-          value: $(params.gemfile)
-      workingDir: /workspace/ruby-sensor/
-      command:
-      - /workspace/ruby-sensor/.tekton/run_unittests.sh
----
-apiVersion: tekton.dev/v1
-kind: Task
-metadata:
-  name: ruby-tracer-lint-task
-spec:
-  params:
-  - name: imageDigest
+  - name: configuration
     type: string
   - name: gemfile
     type: string
@@ -304,11 +281,11 @@ spec:
     - name: task-pvc
       mountPath: /workspace
   steps:
-    - name: lint
+    - name: unittest
       image: ruby@$(params.imageDigest)
       env:
         - name: TEST_CONFIGURATION
-          value: lint
+          value: $(params.configuration)
         - name: BUNDLE_GEMFILE
           value: $(params.gemfile)
       workingDir: /workspace/ruby-sensor/

data/gemfiles/net_http_01.gemfile

@@ -8,6 +8,7 @@ source "https://rubygems.org"
 gem "rack"
 gem "rackup"
 gem "minitest-reporters"
+gem "net-http"
 gem "webmock"
 gem "puma"
 gem "rack-test"

data/lib/instana/activators/action_view.rb

@@ -12,8 +12,11 @@ module Instana
         require 'instana/instrumentation/action_view'
 
         ::ActionView::PartialRenderer
-          .prepend(Instana::Instrumentation::ActionView)
-
+          .prepend(Instana::Instrumentation::ActionView::PartialRenderer)
+        if defined?(::ActionView::CollectionRenderer)
+          ::ActionView::CollectionRenderer
+            .prepend(Instrumentation::ActionView::CollectionRenderer)
+        end
         true
       end
     end

data/lib/instana/instrumentation/action_view.rb

@@ -4,26 +4,52 @@
 module Instana
   module Instrumentation
     module ActionView
-      def render_partial(*args)
-        call_payload = {
-          render: {
-            type: :partial,
-            name: @options.is_a?(Hash) ? @options[:partial].to_s : 'Unknown'
+      module PartialRenderer
+        def render_partial(*args)
+          call_payload = {
+            render: {
+              type: :partial,
+              name: @options.is_a?(Hash) ? @options[:partial].to_s : 'Unknown'
+            }
           }
-        }
 
-        ::Instana::Tracer.trace(:render, call_payload) { super(*args) }
+          ::Instana::Tracer.trace(:render, call_payload) { super(*args) }
+        end
+
+        def render_collection(*args)
+          call_payload = {
+            render: {
+              type: :collection,
+              name: @path.to_s
+            }
+          }
+
+          ::Instana::Tracer.trace(:render, call_payload) { super(*args) }
+        end
+
+        def render_partial_template(*args)
+          call_payload = {
+            render: {
+              type: :partial,
+              name: @options.is_a?(Hash) ? @options[:partial].to_s : 'Unknown'
+            }
+          }
+
+          ::Instana::Tracer.trace(:render, call_payload) { super(*args) }
+        end
       end
 
-      def render_collection(*args)
-        call_payload = {
-          render: {
-            type: :collection,
-            name: @path.to_s
+      module CollectionRenderer
+        def render_collection(*args)
+          call_payload = {
+            render: {
+              type: :collection,
+              name: @options.is_a?(Hash) ? @options[:partial].to_s : 'Unknown'
+            }
           }
-        }
 
-        ::Instana::Tracer.trace(:render, call_payload) { super(*args) }
+          ::Instana::Tracer.trace(:render, call_payload) { super(*args) }
+        end
       end
     end
   end

data/lib/instana/version.rb

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

data/test/backend/host_agent_test.rb

@@ -6,15 +6,27 @@ require 'test_helper'
 class HostAgentTest < Minitest::Test
   def test_spawn_background_thread
     ENV['INSTANA_TEST'] = nil
-    ::Instana.config[:agent_host] = '10.10.10.10'
+    agent_host = '10.10.10.10'
+    ::Instana.config[:agent_host] = agent_host
 
-    if File.exist?('/sbin/ip')
-      addr = `/sbin/ip route | awk '/default/ { print $3 }'`.strip
+    if File.exist?('/proc/net/route')
+      default_gateway_hex = lambda {
+        File.open('/proc/net/route', 'r') do |file|
+          file.each_line do |line|
+            columns = line.split("\t")
+            if columns[1] == '00000000' && columns[1] == columns[7]
+              return columns[2]
+            end
+          end
+        end
+      }.call
+
+      addr = default_gateway_hex.scan(/.{2}/).map(&:hex).reverse.join('.')
       stub_request(:get, "http://#{addr}:42699/")
         .to_timeout
     end
 
-    stub_request(:get, "http://10.10.10.10:42699/")
+    stub_request(:get, "http://#{agent_host}:42699/")
       .to_timeout.times(3).then
       .to_return(status: 200, body: "", headers: {})
 

data/test/instrumentation/net_http_test.rb

@@ -183,8 +183,8 @@ class NetHTTPTest < Minitest::Test
 
     assert_equal :sdk, sdk_span[:n]
     assert_equal :'net-http-error-test', sdk_span[:data][:sdk][:name]
-    assert_equal nil, sdk_span[:error]
-    assert_equal nil, sdk_span[:ec]
+    assert_nil sdk_span[:error]
+    assert_nil sdk_span[:ec]
 
     refute_nil http_span.key?(:data)
     refute_nil http_span[:data].key?(:http)

data/test/instrumentation/rails_action_view_test.rb

@@ -17,18 +17,6 @@ class RailsActionViewTest < Minitest::Test
 
   def setup
     clear_all!
-    @framework_version = Gem::Specification.find_by_name('rails').version
-    @supported_framework_version = @framework_version < Gem::Version.new('6.1')
-    @execute_test_if_framework_version_is_supported = lambda {
-      unless @supported_framework_version
-        skip "Skipping this test because Rails version #{@framework_version} is not yet supported!"
-      end
-    }
-    @execute_test_only_if_framework_version_is_not_supported = lambda {
-      if @supported_framework_version
-        skip "Skipping this test because Rails version #{@framework_version} is already supported!"
-      end
-    }
   end
 
   def test_config_defaults
@@ -37,25 +25,7 @@ class RailsActionViewTest < Minitest::Test
     assert_equal true, ::Instana.config[:action_view][:enabled]
   end
 
-  def test_no_tracing_if_unsupported_version_only_render_is_ok
-    @execute_test_only_if_framework_version_is_not_supported.call
-
-    ['/render_view', '/render_view_direct', '/render_partial', '/render_collection', '/render_file',
-     '/render_alternate_layout', '/render_json', '/render_xml',
-     '/render_rawbody', '/render_js'].each do |endpoint|
-      get endpoint
-      assert last_response.ok?
-    end
-
-    get '/render_partial_that_errors'
-    assert_equal false, last_response.ok?
-
-    spans = ::Instana.processor.queued_spans
-    assert_equal [], spans
-  end
-
   def test_render_view
-    @execute_test_if_framework_version_is_supported.call
     get '/render_view'
     assert last_response.ok?
 
@@ -66,7 +36,6 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_view_direct
-    @execute_test_if_framework_version_is_supported.call
     get '/render_view_direct'
     assert last_response.ok?
 
@@ -89,7 +58,6 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_file
-    @execute_test_if_framework_version_is_supported.call
     get '/render_file'
     assert last_response.ok?
 
@@ -100,7 +68,6 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_json
-    @execute_test_if_framework_version_is_supported.call
     get '/render_json'
     assert last_response.ok?
 
@@ -111,7 +78,6 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_xml
-    @execute_test_if_framework_version_is_supported.call
     get '/render_xml'
     assert last_response.ok?
 
@@ -122,7 +88,6 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_body
-    @execute_test_if_framework_version_is_supported.call
     get '/render_rawbody'
     assert last_response.ok?
 
@@ -133,7 +98,6 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_js
-    @execute_test_if_framework_version_is_supported.call
     get '/render_js'
     assert last_response.ok?
 
@@ -144,7 +108,6 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_alternate_layout
-    @execute_test_if_framework_version_is_supported.call
     get '/render_alternate_layout'
     assert last_response.ok?
 
@@ -155,7 +118,6 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_partial
-    @execute_test_if_framework_version_is_supported.call
     get '/render_partial'
     assert last_response.ok?
 
@@ -166,7 +128,6 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_partial_that_errors
-    @execute_test_if_framework_version_is_supported.call
     get '/render_partial_that_errors'
     refute last_response.ok?
 
@@ -182,13 +143,11 @@ class RailsActionViewTest < Minitest::Test
   end
 
   def test_render_collection
-    @execute_test_if_framework_version_is_supported.call
     get '/render_collection'
     assert last_response.ok?
 
     spans = ::Instana.processor.queued_spans
     span = find_first_span_by_name(spans, :render)
-
     assert_equal :collection, span[:data][:render][:type]
     assert_equal 'blocks/block', span[:data][:render][:name]
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.214.3
+  version: 1.214.4
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-30 00:00:00.000000000 Z
+date: 2024-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,6 +142,15 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".tekton/.currency/currency-pipeline.yaml"
+- ".tekton/.currency/currency-pipelinerun.yaml"
+- ".tekton/.currency/currency-rbac.yaml"
+- ".tekton/.currency/currency-scheduled-eventlistener.yaml"
+- ".tekton/.currency/currency-tasks.yaml"
+- ".tekton/.currency/docs/report.md"
+- ".tekton/.currency/resources/requirements.txt"
+- ".tekton/.currency/resources/table.json"
+- ".tekton/.currency/scripts/generate_report.py"
 - ".tekton/github-interceptor-secret.yaml"
 - ".tekton/github-pr-eventlistener.yaml"
 - ".tekton/github-pr-pipeline.yaml.part"
@@ -149,6 +158,7 @@ files:
 - ".tekton/github-webhook-ingress.yaml"
 - ".tekton/pipeline.yaml"
 - ".tekton/pipelinerun.yaml"
+- ".tekton/ruby-tracer-prepuller.yaml"
 - ".tekton/run_unittests.sh"
 - ".tekton/scheduled-eventlistener.yaml"
 - ".tekton/task.yaml"