instana 1.216.0 → 1.217.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d537c1bb144d87403ff4f77159269e31e8af893fd31f6c942d5d6c00a2f89a4a
-  data.tar.gz: 81d978a21bd5bd84c1305851a34570a20c69dd794ccaef7081490db78037c5d4
+  metadata.gz: 93a8af58226aa905f51dfa17ead848e26e7fab57b3d605849a6255fb74787e79
+  data.tar.gz: 86af2549a8380102a88f383d139678a2e47b349e71947721476e14211e5942c0
 SHA512:
-  metadata.gz: 423d36b04c2e7b6035b566d0bd9617dfd9c2d7700e8d0c8ae934ce2631703cdc4e875ac73a64b136aed2f511a07bb5cfdd257c881a293a2cb85b66bc1d347bd9
-  data.tar.gz: ef472837810e93803daef7776c0b0e664093ddb72cb44f149be2798c9f8ddc0d26eeefe25a9d01a5114e42fb578d050ddc75e03470d1735d1d34eecd5226baa5
+  metadata.gz: d3393c184331fa59069375678300b463fd038cca1c2996f95e416723690f1f119f0d4940af90997161278649d6353ae0e28ae03b2791126bcaa42bd32cf3a06d
+  data.tar.gz: f246ad9e3c63431aab1a244fbb88e7e1146ec91c35749253b7630e9fc5032a91b0db14b86ae091dca9f3a2c462cb8f0a1c0fcc53aaec0e9feb9516dcb5d7657c

data/.circleci/config.yml

@@ -10,6 +10,7 @@ library_gemfile: &library_gemfile
     - "./gemfiles/dalli_30.gemfile"
     - "./gemfiles/dalli_32.gemfile"
     - "./gemfiles/excon_079.gemfile"
+    - "./gemfiles/excon_0100.gemfile"
     - "./gemfiles/excon_100.gemfile"
     - "./gemfiles/graphql_10.gemfile"
     - "./gemfiles/graphql_20.gemfile"
@@ -185,7 +186,7 @@ executors:
           POSTGRES_DB: 'ci_test'
   ruby_34:
     docker:
-      - image: ruby:3.4.0-preview1-bookworm
+      - image: ruby:3.4.0-preview2-bookworm
         environment:
           MEMCACHED_HOST: '127.0.0.1:11211'
           REDIS_URL: 'redis://127.0.0.1:6379'
@@ -200,7 +201,7 @@ executors:
       - image: mongo:5-focal
   ruby_34_mysql2:
     docker:
-      - image: ruby:3.4.0-preview1-bookworm
+      - image: ruby:3.4.0-preview2-bookworm
         environment:
           DATABASE_URL: "mysql2://root@127.0.0.1:3306/ci_test"
       - image: mariadb
@@ -213,7 +214,7 @@ executors:
           MYSQL_ROOT_HOST: '%'
   ruby_34_postgres:
     docker:
-      - image: ruby:3.4.0-preview1-bookworm
+      - image: ruby:3.4.0-preview2-bookworm
         environment:
           DATABASE_URL: "postgres://postgres:test@127.0.0.1:5432/ci_test"
       - image: postgres
@@ -359,7 +360,7 @@ jobs:
     executor: ruby_33
     steps:
       - checkout
-      - run_sonarqube
+      # - run_sonarqube
   publish:
     executor: ruby_33
     steps:
@@ -442,6 +443,23 @@ workflows:
                 - "./gemfiles/rails_61.gemfile"
                 - "./gemfiles/rails_70.gemfile"
                 - "./gemfiles/rails_71.gemfile"
+  rails8_ruby_33_34:
+    jobs:
+      - test_apprisal:
+          matrix:
+            parameters:
+              stack:
+                - 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_80.gemfile"
   sequel:
       jobs:
       - test_apprisal:

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

@@ -3,17 +3,18 @@
 | 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            |
+| Rack           | 45-days          | No             | 3.1.7                    | 3.1.7            | Yes          | No             |
+| Rails          | 45-days          | No             | 7.2.1                    | 7.2.1            | Yes          | No             |
+| Rails::API     | 45-days          | No             | 0.4.1                    | 0.4.1            | Yes          | No             |
+| Rails LTS      | On demand        | No             | 6.1                      | 6.1              | Yes          | No             |
+| Roda           | 45-days          | No             | 3.84.0                   | 3.84.0           | Yes          | No             |
+| Sinatra        | 45-days          | No             | 4.0.0                    | 4.0.0            | Yes          | No             |
+| Excon          | 45-days          | No             | 0.112.0                  | 0.112.0          | Yes          | Yes            |
+| gRPC           | 45-days          | No             | 1.66.0                   | 1.66.0           | Yes          | No             |
+| Net::HTTP      | 0-day            | Yes            | 0.4.1                    | 0.4.1            | Yes          | No             |
+| Rest-Client    | 45-days          | No             | 2.1.0                    | 2.1.0            | Yes          | No             |
+| Dalli          | 45-days          | No             | 3.2.8                    | 3.2.8            | Yes          | No             |
+| Resque         | 45-days          | No             | 2.6.0                    | 2.6.0            | Yes          | Yes            |
+| Sidekiq        | 45-days          | No             | 7.3.2                    | 7.3.2            | Yes          | Yes            |
+| GraphQL        | 45-days          | No             | 2.3.17                   | 2.3.17           | Yes          | Yes            |
+| Sequel         | 45-days          | No             | 5.60.0                   | 5.84.0           | Yes          | No             |

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

@@ -89,6 +89,12 @@
         "Support Policy": "45-days",
         "Beta version": "No",
         "Cloud Native": "Yes"
+      },
+      {
+        "Package name": "Sequel",
+        "Support Policy": "45-days",
+        "Beta version": "No",
+        "Cloud Native": "Yes"
       }
     ]
 }

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

@@ -27,7 +27,8 @@ def get_bundle_install_output():
         "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."
+        "sidekiq": "sidekiq_70_ruby_3.3.",
+        "sequel": "sequel_58_ruby_3.3."
     }
 
     bundle_install_output = ""

data/.tekton/README.md

@@ -199,8 +199,8 @@ https://github.com/tektoncd/triggers/blob/main/docs/interceptors.md#owners-valid
 After this ensure that there is a pod and a service created:
 
 ````bash
-   kubectl get pod | grep -i el-github-pr-eventlistener
-   kubectl get svc | grep -i el-github-pr-eventlistener
+   kubectl get pod | grep -i el-github-pr-ruby-eventlistener
+   kubectl get svc | grep -i el-github-pr-ruby-eventlistener
 ````
 
 Do not continue if any of these missing.

data/.tekton/pipeline.yaml

@@ -80,8 +80,8 @@ spec:
             value:
             - "./gemfiles/cuba_30.gemfile"
             - "./gemfiles/cuba_40.gemfile"
-            - "./gemfiles/excon_02.gemfile"
             - "./gemfiles/excon_079.gemfile"
+            - "./gemfiles/excon_0100.gemfile"
             - "./gemfiles/excon_100.gemfile"
             - "./gemfiles/graphql_10.gemfile"
             - "./gemfiles/graphql_20.gemfile"
@@ -118,8 +118,8 @@ spec:
             value:
             - "./gemfiles/cuba_30.gemfile"
             - "./gemfiles/cuba_40.gemfile"
-            - "./gemfiles/excon_02.gemfile"
             - "./gemfiles/excon_079.gemfile"
+            - "./gemfiles/excon_0100.gemfile"
             - "./gemfiles/excon_100.gemfile"
             - "./gemfiles/graphql_10.gemfile"
             - "./gemfiles/graphql_20.gemfile"
@@ -156,8 +156,8 @@ spec:
             value:
             - "./gemfiles/cuba_30.gemfile"
             - "./gemfiles/cuba_40.gemfile"
-            - "./gemfiles/excon_02.gemfile"
             - "./gemfiles/excon_079.gemfile"
+            - "./gemfiles/excon_0100.gemfile"
             - "./gemfiles/excon_100.gemfile"
             - "./gemfiles/graphql_10.gemfile"
             - "./gemfiles/graphql_20.gemfile"
@@ -194,8 +194,8 @@ spec:
             value:
             - "./gemfiles/cuba_30.gemfile"
             - "./gemfiles/cuba_40.gemfile"
-            - "./gemfiles/excon_02.gemfile"
             - "./gemfiles/excon_079.gemfile"
+            - "./gemfiles/excon_0100.gemfile"
             - "./gemfiles/excon_100.gemfile"
             - "./gemfiles/graphql_10.gemfile"
             - "./gemfiles/graphql_20.gemfile"
@@ -232,8 +232,8 @@ spec:
             value:
             - "./gemfiles/cuba_30.gemfile"
             - "./gemfiles/cuba_40.gemfile"
-            - "./gemfiles/excon_02.gemfile"
             - "./gemfiles/excon_079.gemfile"
+            - "./gemfiles/excon_0100.gemfile"
             - "./gemfiles/excon_100.gemfile"
             - "./gemfiles/graphql_10.gemfile"
             - "./gemfiles/graphql_20.gemfile"
@@ -499,9 +499,63 @@ spec:
       workspaces:
         - name: task-pvc
           workspace: ruby-tracer-ci-pipeline-pvc
-    - name: generate-currency-report
+    - name: unittest-sequel-sqlite3
       runAfter:
         - unittest-rails-postgres
+      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"
+            # 3.4.0-preview1-bookworm
+            - "sha256:2690af2a931469abe513b22a083b5ae0b56d4feffc0d3496eb6378723ab203e7"
+          - name: gemfile
+            value:
+            - "./gemfiles/sequel_56.gemfile"
+            - "./gemfiles/sequel_57.gemfile"
+            - "./gemfiles/sequel_58.gemfile"
+      taskRef:
+        name: ruby-tracer-unittest-sequel-sqlite3-task
+      workspaces:
+        - name: task-pvc
+          workspace: ruby-tracer-ci-pipeline-pvc
+    - name: unittest-sequel-mysql2
+      runAfter:
+        - unittest-sequel-sqlite3
+      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"
+            # 3.4.0-preview1-bookworm
+            - "sha256:2690af2a931469abe513b22a083b5ae0b56d4feffc0d3496eb6378723ab203e7"
+          - name: gemfile
+            value:
+            - "./gemfiles/sequel_56.gemfile"
+            - "./gemfiles/sequel_57.gemfile"
+            - "./gemfiles/sequel_58.gemfile"
+      taskRef:
+        name: ruby-tracer-unittest-sequel-mysql2-task
+      workspaces:
+        - name: task-pvc
+          workspace: ruby-tracer-ci-pipeline-pvc
+    - name: generate-currency-report
+      runAfter:
+        - unittest-sequel-mysql2
       taskRef:
         name: ruby-generate-currency-report-task
       workspaces:

data/.tekton/scheduled-eventlistener.yaml

@@ -24,10 +24,8 @@ spec:
         params:
         - name: revision
           value: master
-        - name: git-commit-sha
-          value: $(tt.params.git-commit-sha)
         pipelineRef:
-          name: github-pr-ruby-tracer-ci-pipeline
+          name: ruby-tracer-ci-pipeline
         workspaces:
         - name: ruby-tracer-ci-pipeline-pvc
           volumeClaimTemplate:

data/.tekton/task.yaml

@@ -57,6 +57,10 @@ spec:
   - name: mariadb
     # mariadb:11.3.2
     image: mariadb@sha256:851f05fe1e4cb290442c1b12b7108436a33fd8f6a733d4989950322d06d45c65
+    startupProbe:
+      initialDelaySeconds: 10
+      tcpSocket:
+        port: 3306
     env:
       - name: MYSQL_ROOT_PASSWORD # or MARIADB_ROOT_PASSWORD
         value: passw0rd
@@ -93,6 +97,10 @@ spec:
   - name: postgres
     # postgres:16.2-bookworm
     image: postgres@sha256:6b841c8f6a819884207402f1209a8116844365df15fca8cf556fc54a24c70800
+    startupProbe:
+      initialDelaySeconds: 10
+      tcpSocket:
+        port: 5432
     env:
       - name: POSTGRES_DB
         value: 'ci_test'
@@ -182,6 +190,10 @@ spec:
   - name: redis
     # redis:7.2.4-bookworm
     image: redis@sha256:fe98b2d39d462d06a7360e2860dd6ceff930745e3731eccb3c1406dd0dd7f744
+    startupProbe:
+      initialDelaySeconds: 10
+      tcpSocket:
+        port: 6379
   params:
   - name: imageDigest
     type: string
@@ -245,6 +257,10 @@ spec:
   - name: mongo
     # mongo:5.0.25-focal
     image: mongo@sha256:d1b8a7b77424347397653ab8ff500c66b1e9979b4cebf826951d37b0d3966721
+    startupProbe:
+      initialDelaySeconds: 10
+      tcpSocket:
+        port: 27017
   params:
   - name: imageDigest
     type: string
@@ -294,6 +310,74 @@ spec:
 ---
 apiVersion: tekton.dev/v1
 kind: Task
+metadata:
+  name: ruby-tracer-unittest-sequel-sqlite3-task
+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)
+        - name: DATABASE_URL
+          value: "sqlite3::memory:"
+      workingDir: /workspace/ruby-sensor/
+      command:
+      - /workspace/ruby-sensor/.tekton/run_unittests.sh
+---
+apiVersion: tekton.dev/v1
+kind: Task
+metadata:
+  name: ruby-tracer-unittest-sequel-mysql2-task
+spec:
+  sidecars:
+  # MySQL (compatible Mariadb)
+  - name: mariadb
+    # mariadb:11.3.2
+    image: mariadb@sha256:851f05fe1e4cb290442c1b12b7108436a33fd8f6a733d4989950322d06d45c65
+    startupProbe:
+      initialDelaySeconds: 10
+      tcpSocket:
+        port: 3306
+    env:
+      - name: MYSQL_ROOT_PASSWORD # or MARIADB_ROOT_PASSWORD
+        value: passw0rd
+      - name: MYSQL_DATABASE # or MARIADB_DATABASE
+        value: ci_test
+  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)
+        - name: DATABASE_URL
+          value: "mysql2://root:passw0rd@127.0.0.1:3306/ci_test"
+      workingDir: /workspace/ruby-sensor/
+      command:
+      - /workspace/ruby-sensor/.tekton/run_unittests.sh
+---
+apiVersion: tekton.dev/v1
+kind: Task
 metadata:
   name: ruby-generate-currency-report-task
 spec:

data/Rakefile

@@ -9,7 +9,7 @@ require 'json'
 Rake::TestTask.new(:test) do |t|
   t.verbose = false
   t.warning = false
-  t.ruby_opts = []
+  t.ruby_opts = ["--parser=parse.y"] if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('3.3')
 
   t.libs << "test"
   t.libs << "lib"

data/gemfiles/{excon_02.gemfile → excon_0100.gemfile}

@@ -1,7 +1,4 @@
-# This file was generated by Appraisal
-
-# (c) Copyright IBM Corp. 2021
-# (c) Copyright Instana Inc. 2021
+# (c) Copyright IBM Corp. 2023
 
 source "https://rubygems.org"
 
@@ -12,6 +9,6 @@ gem "webmock"
 gem "puma"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
-gem "excon", ">= 0.21.0", "< 1.0"
+gem "excon", ">= 0.100.0", "< 1.0"
 
 gemspec path: "../"

data/gemfiles/excon_021.gemfile

@@ -12,6 +12,6 @@ gem "webmock"
 gem "puma"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
-gem "excon", ">= 0.21.0", "< 1.0"
+gem "excon", "0.21.0"
 
 gemspec path: "../"

data/gemfiles/excon_079.gemfile

@@ -12,6 +12,6 @@ gem "webmock"
 gem "puma"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
-gem "excon", ">= 0.79.0", "< 1.0"
+gem "excon", "0.79.0"
 
 gemspec path: "../"

data/gemfiles/excon_100.gemfile

@@ -1,4 +1,4 @@
-# (c) Copyright IBM Corp. 2023
+# (c) Copyright IBM Corp. 2024
 
 source "https://rubygems.org"
 
@@ -9,6 +9,6 @@ gem "webmock"
 gem "puma"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
-gem "excon", ">= 0.100.0", "< 1.0"
+gem "excon", ">= 1.0.0", "< 2.0"
 
 gemspec path: "../"

data/gemfiles/rails_71.gemfile

@@ -9,7 +9,7 @@ gem "rack-test"
 gem "simplecov", "~> 0.21.2"
 gem "mail", ">= 2.8.1"
 gem "mutex_m" # mutex_m is not part of the default gems since Ruby 3.4.0
-gem "rails", ">= 7.1"
+gem "rails", "~> 7.1"
 gem "mysql2", "0.5.5"
 gem "pg"
 gem "sqlite3", "~> 1.4"

data/gemfiles/rails_80.gemfile

@@ -0,0 +1,17 @@
+# (c) Copyright IBM Corp. 2024
+
+source "https://rubygems.org"
+
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "mail", ">= 2.8.1"
+gem "mutex_m" # mutex_m is not part of the default gems since Ruby 3.4.0
+gem "rails", ">= 8.0"
+gem "mysql2", "0.5.5"
+gem "pg"
+gem "sqlite3", ">= 2.1"
+
+gemspec path: "../"

data/gemfiles/sequel_56.gemfile

@@ -9,7 +9,7 @@ gem "webmock"
 gem "puma"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
-gem "sequel", "~> 5.60"
+gem "sequel", "~> 5.60.0"
 gem "sqlite3", "~> 1.4"
 gem "mysql2", "0.5.5"
 

data/gemfiles/sequel_57.gemfile

@@ -9,7 +9,7 @@ gem "webmock"
 gem "puma"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
-gem "sequel", "~> 5.70"
+gem "sequel", "~> 5.70.0"
 gem "sqlite3", "~> 1.4"
 gem "mysql2", "0.5.5"
 

data/lib/instana/backend/host_agent.rb

@@ -12,6 +12,8 @@ module Instana
         @logger = logger
         @future = nil
         @client = nil
+        # Timer task to poll for agent liveliness
+        @agent_connection_task = Concurrent::TimerTask.new(execution_interval: 75) { announce }
       end
 
       def setup; end
@@ -27,7 +29,12 @@ module Instana
       alias start spawn_background_thread
 
       def announce
-        @client = until_not_nil { HostAgentLookup.new.call }
+        @client = with_timeout { HostAgentLookup.new.call }
+        # Shuts down the connection task based on agent connection client.
+        @client ? @agent_connection_task.shutdown : @agent_connection_task.execute
+        # Do not continue further if the agent is down/connection to the agent is unsuccessfull
+        return nil unless @client
+
         begin
           @discovery.send(:observers)&.send(:notify_and_delete_observers, Time.now, nil, nil)
         ensure
@@ -74,14 +81,16 @@ module Instana
 
       private
 
-      def until_not_nil
-        loop do
+      def with_timeout
+        15.times do
           result = yield
           return result unless result.nil?
 
           @logger.debug("Waiting on a connection to the agent.")
           sleep(1)
         end
+        @logger.info("Agent connection timed out retrying after 60 seconds")
+        nil
       end
 
       def discovery_value

data/lib/instana/instrumentation/active_job.rb

@@ -17,10 +17,9 @@ module Instana
 
           ::Instana::Tracer.trace(:activejob, tags) do
             context = ::Instana.tracer.context
-            job.arguments = [{
-              given_arguments: job.arguments,
-              instana_context: context ? context.to_hash : nil
-            }]
+            job.arguments.append({
+                                   instana_context: context ? context.to_hash : nil
+                                 })
 
             block.call
           end
@@ -35,10 +34,9 @@ module Instana
               job_id: job.job_id
             }
           }
-
-          incoming_context = if job.arguments.is_a?(Array) && job.arguments.first.is_a?(Hash)
-                               instana_context = job.arguments.first[:instana_context]
-                               job.arguments = job.arguments.first[:given_arguments]
+          incoming_context = if job.arguments.is_a?(Array) && job.arguments.last.is_a?(Hash) && job.arguments.last.key?(:instana_context)
+                               instana_context = job.arguments.last[:instana_context]
+                               job.arguments.pop
                                instana_context ? ::Instana::SpanContext.new(instana_context[:trace_id], instana_context[:span_id]) : nil
                              end
 

data/lib/instana/instrumentation/active_record.rb

@@ -6,7 +6,7 @@ module Instana
     module ActiveRecord
       IGNORED_NAMES = %w[SCHEMA EXPLAIN CACHE].freeze
       IGNORED_SQL = %w[BEGIN COMMIT SET].freeze
-      SANITIZE_REGEXP = /('[\s\S][^']*'|\d*\.\d+|\d+|NULL)/i.freeze
+      SANITIZE_REGEXP = /('[\s\S][^']*'|\d*\.\d+|\d+|NULL)/i
 
       def log(sql, name = 'SQL', binds = [], *args, **kwargs, &block)
         call_payload = {

data/lib/instana/instrumentation/instrumented_request.rb

@@ -9,8 +9,8 @@ require 'rack/request'
 
 module Instana
   class InstrumentedRequest < Rack::Request
-    W3C_TRACE_PARENT_FORMAT = /[0-9a-f][0-9a-e]-(?<trace>[0-9a-f]{32})-(?<parent>[0-9a-f]{16})-(?<flags>[0-9a-f]{2})/.freeze
-    INSTANA_TRACE_STATE = /in=(?<trace>[0-9a-f]+);(?<span>[0-9a-f]+)/.freeze
+    W3C_TRACE_PARENT_FORMAT = /[0-9a-f][0-9a-e]-(?<trace>[0-9a-f]{32})-(?<parent>[0-9a-f]{16})-(?<flags>[0-9a-f]{2})/
+    INSTANA_TRACE_STATE = /in=(?<trace>[0-9a-f]+);(?<span>[0-9a-f]+)/
 
     def skip_trace?
       # Honor X-Instana-L

data/lib/instana/instrumentation/sequel.rb

@@ -5,7 +5,7 @@ module Instana
     module Sequel
       IGNORED_SQL = %w[BEGIN COMMIT SET].freeze
       VERSION_SELECT_STATEMENT = "SELECT VERSION()".freeze
-      SANITIZE_REGEXP = /('[\s\S][^']*'|\d*\.\d+|\d+|NULL)/i.freeze
+      SANITIZE_REGEXP = /('[\s\S][^']*'|\d*\.\d+|\d+|NULL)/i
 
       def log_connection_yield(sql, conn, *args)
         call_payload = {

data/lib/instana/version.rb

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

data/lib/instana.rb

@@ -1,7 +1,8 @@
 # (c) Copyright IBM Corp. 2021
 # (c) Copyright Instana Inc. 2016
-
-require 'instana/setup'
+if ENV.fetch('INSTANA_DISABLE', false) && defined?(::Instana)
+  Object.send(:remove_const, :Instana)
+end
 
 # Boot the instana agent background thread.  If you wish to have greater
 # control on the where and which thread this is run in, instead use
@@ -14,6 +15,7 @@ require 'instana/setup'
 
 # :nocov:
 unless ENV.fetch('INSTANA_DISABLE', false)
+  require 'instana/setup'
   ::Instana::Activator.start
   ::Instana.agent.spawn_background_thread
 

data/test/frameworks/sinatra_test.rb

@@ -7,6 +7,7 @@ require 'rack/test'
 class SinatraTest < Minitest::Test
   include Rack::Test::Methods
   APP = Rack::Builder.parse_file('test/support/apps/sinatra/config.ru')
+
   sinatra_version = Gem::Specification.find_by_name('sinatra').version
   if sinatra_version < Gem::Version.new('4.0.0')
     APP = APP.first
@@ -18,8 +19,8 @@ class SinatraTest < Minitest::Test
 
   def test_basic_get
     clear_all!
-
     r = get '/'
+
     assert last_response.ok?
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.216.0
+  version: 1.217.1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-11 00:00:00.000000000 Z
+date: 2024-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -210,7 +210,7 @@ files:
 - gemfiles/dalli_20.gemfile
 - gemfiles/dalli_30.gemfile
 - gemfiles/dalli_32.gemfile
-- gemfiles/excon_02.gemfile
+- gemfiles/excon_0100.gemfile
 - gemfiles/excon_021.gemfile
 - gemfiles/excon_079.gemfile
 - gemfiles/excon_100.gemfile
@@ -230,6 +230,7 @@ files:
 - gemfiles/rails_61.gemfile
 - gemfiles/rails_70.gemfile
 - gemfiles/rails_71.gemfile
+- gemfiles/rails_80.gemfile
 - gemfiles/redis_40.gemfile
 - gemfiles/redis_50.gemfile
 - gemfiles/redis_51.gemfile
@@ -458,7 +459,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
+rubygems_version: 3.5.23
 signing_key: 
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana