instana 1.214.1 → 1.214.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef0f66b536659d6dbfe42cc74441f7c18e599901cfbb9bbc90ba9a4bcf711cdc
-  data.tar.gz: 98b92de5fb14e66c75168e1c6c4a8420447498921dccf690ddb7d70a4754c2b5
+  metadata.gz: 3e1392f093e37988f8cb349c73f1314d81b4058f896c244382328e636a18bd83
+  data.tar.gz: 307c18d065c6618c544e6b3bc2f622c184cafdb8c98096e375b84a0018bd6c6b
 SHA512:
-  metadata.gz: 81b5f89a9ae1cb841c094270eb536f03a6b93da23c8cd82defc796f220db797d462860baf7e8c21fb8832a1bce573f257ea08c13a30603c51e3f0507d559d7b2
-  data.tar.gz: e08833db6248c228c51d8f03dffacca72936137b21b862cd79419fa17ae498c2303c78e1bea74fe6cfe61ff7b134d7aa60b34248ac0a4c4894c14912523bc825
+  metadata.gz: 1d895f1cc6dc321277f366a11040e6626c31e08b4486e662bdf407ea20e91d7c1927b04f7441a942e7392254a7d491c41c788bd0344109dee524514d31c3a074
+  data.tar.gz: 52f4e79e404d0ec0efe6f091f57cd09a9cfc8418d229a55324e5cf4e96a381b75a976a352b79c0659f03a805d5aab519df9b8c6a0b9d7e9ec7e99014601896fd

data/.tekton/github-interceptor-secret.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: github-interceptor-secret
+type: Opaque
+stringData:
+  # Always use a long, strong and random generated token
+  secretToken: "<--- TOKEN GOES HERE --->"

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

@@ -0,0 +1,102 @@
+apiVersion: triggers.tekton.dev/v1beta1
+kind: TriggerTemplate
+metadata:
+  name: github-pr-ruby-tracer-pipeline-template
+spec:
+  params:
+    - description: The git branch name
+      name: git-branch
+    - description: The git branch name shortened and converted to RFC 1123 subdomain names
+      name: git-branch-normalized
+    - description: The full sha of the git commit
+      name: git-commit-sha
+    - description: The short 7 digit sha of the git commit
+      name: git-commit-short-sha
+  resourcetemplates:
+    - apiVersion: tekton.dev/v1
+      kind: PipelineRun
+      metadata:
+        # After variable resolution, this has to be maximum 63 character long,
+        # lower case, RFC 1123 subdomain name. The regex used for validation is
+        # '[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:
+        params:
+        - name: revision
+          value: $(tt.params.git-branch)
+        - name: git-commit-sha
+          value: $(tt.params.git-commit-sha)
+        pipelineRef:
+          name: github-pr-ruby-tracer-ci-pipeline
+        workspaces:
+        - name: ruby-tracer-ci-pipeline-pvc
+          volumeClaimTemplate:
+            spec:
+              accessModes:
+                - ReadWriteOnce
+              resources:
+                requests:
+                  storage: 100Mi
+---
+apiVersion: triggers.tekton.dev/v1beta1
+kind: TriggerBinding
+metadata:
+  name: github-pr-ruby-tracer-binding
+spec:
+  params:
+    - name: git-branch
+      value: $(body.pull_request.head.ref)
+    - name: git-branch-normalized
+      value: $(extensions.git_branch_normalized)
+    - name: git-commit-sha
+      value: $(body.pull_request.head.sha)
+    - name: git-commit-short-sha
+      value: $(extensions.truncated_sha)
+---
+apiVersion: triggers.tekton.dev/v1beta1
+kind: EventListener
+metadata:
+  name: github-pr-ruby-eventlistener
+spec:
+  serviceAccountName: tekton-triggers-eventlistener-serviceaccount
+  triggers:
+    - name: github-pr-trigger
+      interceptors:
+        - name: receive-github-event
+          ref:
+            name: "github"
+          params:
+            - name: "secretRef"
+              value:
+                secretName: github-interceptor-secret
+                secretKey: secretToken
+            - name: "eventTypes"
+              value: ["pull_request"]
+        - name: filter-irrelevant-events
+          ref:
+            name: "cel"
+          params:
+            - name: "filter"
+              # We should not trigger on 'closed', 'assigned', 'unassigned', 'converted_to_draft'
+              value: "body.action in ['opened', 'synchronize', 'reopened']"
+        - name: add-truncated-sha
+          ref:
+            name: "cel"
+          params:
+            - name: "overlays"
+              value:
+              - key: truncated_sha
+                expression: "body.pull_request.head.sha.truncate(7)"
+        - name: add-normalized-branch-name
+          ref:
+            name: "cel"
+          params:
+            - name: "overlays"
+              value:
+              - key: git_branch_normalized
+                # The git branch name shortened and converted to RFC 1123 subdomain names
+                expression: 'body.pull_request.head.ref.truncate(38).lowerAscii().translate("_", "-")'
+      bindings:
+        - ref: github-pr-ruby-tracer-binding
+      template:
+        ref: github-pr-ruby-tracer-pipeline-template

data/.tekton/github-pr-pipeline.yaml.part

@@ -0,0 +1,38 @@
+apiVersion: tekton.dev/v1
+kind: Pipeline
+metadata:
+  name: github-pr-ruby-tracer-ci-pipeline
+spec:
+  params:
+  - name: revision
+    type: string
+  - name: git-commit-sha
+    type: string
+  workspaces:
+    - name: ruby-tracer-ci-pipeline-pvc
+  tasks:
+    - name: github-set-check-status-to-pending
+      taskRef:
+        kind: Task
+        name: github-set-status
+      params:
+      - name: SHA
+        value: $(params.git-commit-sha)
+      - name: STATE
+        value: pending
+      - name: REPO
+        value: instana/ruby-sensor
+    - name: github-set-check-status-to-success-or-failure
+      runAfter:
+      - github-set-check-status-to-pending
+      - unittest-rails-postgres
+      taskRef:
+        kind: Task
+        name: github-set-status
+      params:
+      - name: SHA
+        value: $(params.git-commit-sha)
+      - name: STATE
+        value: success
+      - name: REPO
+        value: instana/ruby-sensor

data/.tekton/github-set-status-task.yaml

@@ -0,0 +1,43 @@
+---
+apiVersion: tekton.dev/v1
+kind: Task
+metadata:
+  name: github-set-status
+spec:
+  params:
+  - name: SHA
+  - name: STATE
+  - name: REPO
+  volumes:
+  - name: githubtoken
+    secret:
+      secretName: githubtoken
+  steps:
+    - name: set-status
+      # curlimages/curl:8.6.0
+      image: curlimages/curl@sha256:f2237028bed58de91f62aea74260bb2a299cf12fbcabc23cfaf125fef276c884
+      env:
+      - name: SHA
+        value: $(params.SHA)
+      - name: STATE
+        value: $(params.STATE)
+      - name: REPO
+        value: $(params.REPO)
+      volumeMounts:
+        - name: githubtoken
+          mountPath: /etc/github-set-status
+      script: |
+        #!/bin/sh
+        curl -L \
+             -X POST \
+             -H "Accept: application/vnd.github+json" \
+             -H "Authorization: Bearer $(cat /etc/github-set-status/token)" \
+             -H "Content-Type: application/json" \
+             -H "X-GitHub-Api-Version: 2022-11-28" \
+             "https://api.github.com/repos/${REPO}/statuses/${SHA}" \
+             -d '{
+                   "state":"'${STATE}'",
+                   "target_url":"http://localhost:8001/api/v1/namespaces/tekton-pipelines/services/tekton-dashboard:http/proxy/#/namespaces/default/pipelineruns/",
+                   "description":"Tekton build is in state: '${STATE}'",
+                   "context":"Tekton"
+                 }'

data/.tekton/github-webhook-ingress.yaml

@@ -0,0 +1,20 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: github-pr-ruby-webhook-ingress
+spec:
+  ingressClassName: public-iks-k8s-nginx
+  tls:
+  - hosts:
+    - <ENTER_YOUR_DOMAIN_NAME_HERE>
+  rules:
+    - host: <ENTER_YOUR_DOMAIN_NAME_HERE>
+      http:
+        paths:
+          - path: /github-pr-ruby-hooks
+            pathType: Exact
+            backend:
+              service:
+                name: el-github-pr-ruby-eventlistener
+                port:
+                  number: 8080

data/.tekton/scheduled-eventlistener.yaml

@@ -0,0 +1,108 @@
+apiVersion: triggers.tekton.dev/v1beta1
+kind: TriggerTemplate
+metadata:
+  name: ruby-tracer-scheduled-ci-pipeline-template
+spec:
+  params:
+    - description: The ISO-8601 date and time converted to RFC 1123 subdomain names
+      name: date-time-normalized
+    - description: The full sha of the git commit
+      name: git-commit-sha
+    - description: The short 7 digit sha of the git commit
+      name: git-commit-short-sha
+  resourcetemplates:
+    - apiVersion: tekton.dev/v1
+      kind: PipelineRun
+      metadata:
+        # After variable resolution, this has to be maximum 63 character long,
+        # lower case, RFC 1123 subdomain name. The regex used for validation is
+        # '[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:
+        params:
+        - name: revision
+          value: master
+        - name: git-commit-sha
+          value: $(tt.params.git-commit-sha)
+        pipelineRef:
+          name: github-pr-ruby-tracer-ci-pipeline
+        workspaces:
+        - name: ruby-tracer-ci-pipeline-pvc
+          volumeClaimTemplate:
+            spec:
+              accessModes:
+                - ReadWriteOnce
+              resources:
+                requests:
+                  storage: 100Mi
+---
+apiVersion: triggers.tekton.dev/v1beta1
+kind: TriggerBinding
+metadata:
+  name: ruby-tracer-scheduled-binding
+spec:
+  params:
+    - name: date-time-normalized
+      value: $(extensions.normalized_date_time)
+    - name: git-commit-sha
+      value: $(body.git_master_head_commit_sha)
+    - name: git-commit-short-sha
+      value: $(extensions.truncated_sha)
+---
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: ruby-tracer-scheduled-ci-cronjob
+spec:
+  schedule: "5 1 * * Mon-Fri"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          containers:
+          - name: git
+            # alpine/git:2.43.0
+            image: alpine/git@sha256:6ff4de047dcc8f0c7d75d2efff63fbc189e87d2f458305f2cc8f165ff83309cf
+            command:
+            - sh
+            - -c
+            - |
+              wget -O- \
+                   --header 'Content-Type: application/json' \
+                   --post-data '{
+                                 "git_master_head_commit_sha":"'"$(git ls-remote https://github.com/instana/ruby-sensor master | cut -f1)"'",
+                                 "date_time":"'"$(date -u -Iminutes )"'"
+                                }' \
+                  'http://el-ruby-tracer-scheduled-pipeline-listener.default.svc.cluster.local:8080'
+          restartPolicy: OnFailure
+---
+apiVersion: triggers.tekton.dev/v1beta1
+kind: EventListener
+metadata:
+  name: ruby-tracer-scheduled-pipeline-listener
+spec:
+  serviceAccountName: tekton-triggers-eventlistener-serviceaccount
+  triggers:
+    - name: ruby-tracer-scheduled-pipeline-triggger
+      interceptors:
+        - name: add-truncated-sha
+          ref:
+            name: "cel"
+          params:
+            - name: "overlays"
+              value:
+              - key: truncated_sha
+                expression: "body.git_master_head_commit_sha.truncate(7)"
+        - name: add-normalized-date-time
+          ref:
+            name: "cel"
+          params:
+            - name: "overlays"
+              value:
+              - key: normalized_date_time
+                # The date-time converted to RFC 1123 subdomain names
+                expression: 'body.date_time.split("+")[0].lowerAscii().translate(":", "-")'
+      bindings:
+        - ref: ruby-tracer-scheduled-binding
+      template:
+        ref: ruby-tracer-scheduled-ci-pipeline-template

data/.tekton/tekton-triggers-eventlistener-serviceaccount.yaml

@@ -0,0 +1,29 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: tekton-triggers-eventlistener-serviceaccount
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: tekton-triggers-eventlistener-serviceaccount-binding
+subjects:
+- kind: ServiceAccount
+  name: tekton-triggers-eventlistener-serviceaccount
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: tekton-triggers-eventlistener-roles
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: tekton-triggers-eventlistener-serviceaccount-clusterbinding
+subjects:
+- kind: ServiceAccount
+  name: tekton-triggers-eventlistener-serviceaccount
+  namespace: default
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: tekton-triggers-eventlistener-clusterroles

data/gemfiles/aws_30.gemfile

@@ -11,6 +11,7 @@ gem "webrick"
 gem "puma"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
+gem "aws-sdk-core", "= 3.191.6"
 gem "aws-sdk-dynamodb", ">= 1.59", "< 1.99"
 gem "aws-sdk-s3", ">= 1.59", "< 1.60"
 gem "aws-sdk-sns", ">= 1.38", "< 1.59"

data/lib/instana/backend/request_client.rb

@@ -8,8 +8,10 @@ require 'json'
 # :nocov:
 begin
   require 'oj'
+  INSTANA_USE_OJ = true
 rescue LoadError => _e
   Instana.logger.warn("Unable to load Oj.")
+  INSTANA_USE_OJ = false
 end
 # :nocov:
 
@@ -66,7 +68,7 @@ module Instana
 
       def encode_body(data)
         # :nocov:
-        defined?(Oj) ? Oj.dump(data, mode: :strict) : JSON.dump(data)
+        INSTANA_USE_OJ ? Oj.dump(data, mode: :strict) : JSON.dump(data)
         # :nocov:
       end
     end

data/lib/instana/instrumentation/redis.rb

@@ -10,30 +10,27 @@ module Instana
         :multi => ::RedisClient.instance_method(:multi)
       }.freeze
 
-      def call_v(*args, &block)
+      def call_v(*args, **kwargs, &block)
         if skip_instrumentation?
-          super(*args, &block)
+          super(*args, **kwargs, &block)
         else
-          call_with_instana(args[0][0].to_s.upcase, ORIGINAL_METHODS[:call_v], *args, &block)
+          call_with_instana(args[0][0].to_s.upcase, ORIGINAL_METHODS[:call_v], args, kwargs, &block)
         end
       end
 
-      def pipelined(*args, &block)
+      def pipelined(*args, **kwargs, &block)
         if skip_instrumentation?
-          super(*args, &block)
+          super(*args, **kwargs, &block)
         else
-          call_with_instana('PIPELINE', ORIGINAL_METHODS[:pipelined], *args, &block)
+          call_with_instana('PIPELINE', ORIGINAL_METHODS[:pipelined], args, kwargs, &block)
         end
       end
 
-      # Since, starting with 5.1 redis/client.rb:114:multi takes an unused default argument `watch: nil`
-      # but calls redis_client.rb:442:multi, which doesn't take any argument,
-      # here we have to take arguments but we should not use it.
-      def multi(*_, &block)
+      def multi(*args, **kwargs, &block)
         if skip_instrumentation?
-          super(&block)
+          super(*args, **kwargs, &block)
         else
-          call_with_instana('MULTI', ORIGINAL_METHODS[:multi], &block)
+          call_with_instana('MULTI', ORIGINAL_METHODS[:multi], args, kwargs, &block)
         end
       end
 
@@ -43,19 +40,19 @@ module Instana
         :call_pipeline => ::Redis::Client.instance_method(:call_pipeline)
       }.freeze
 
-      def call(*args, &block)
+      def call(*args, **kwargs, &block)
         if skip_instrumentation?
-          super(*args, &block)
+          super(*args, **kwargs, &block)
         else
-          call_with_instana(args[0][0].to_s.upcase, ORIGINAL_METHODS[:call], *args, &block)
+          call_with_instana(args[0][0].to_s.upcase, ORIGINAL_METHODS[:call], args, kwargs, &block)
         end
       end
 
-      def call_pipeline(*args, &block)
+      def call_pipeline(*args, **kwargs, &block)
         if skip_instrumentation?
-          super(*args, &block)
+          super(*args, **kwargs, &block)
         else
-          call_with_instana(args.first.is_a?(::Redis::Pipeline::Multi) ? 'MULTI' : 'PIPELINE', ORIGINAL_METHODS[:call_pipeline], *args, &block)
+          call_with_instana(args.first.is_a?(::Redis::Pipeline::Multi) ? 'MULTI' : 'PIPELINE', ORIGINAL_METHODS[:call_pipeline], args, kwargs, &block)
         end
       end
     end
@@ -65,8 +62,7 @@ module Instana
       !Instana.tracer.tracing? || dnt_spans.include?(::Instana.tracer.current_span.name) || !Instana.config[:redis][:enabled]
     end
 
-    def call_with_instana(*args, &block)
-      command, original_super, *original_args = *args
+    def call_with_instana(command, original_super, args, kwargs, &block)
       kv_payload = { redis: {} }
 
       begin
@@ -79,7 +75,7 @@ module Instana
         rescue
           nil
         end
-        original_super.bind(self).call(*original_args, &block)
+        original_super.bind(self).call(*args, **kwargs, &block)
       rescue => e
         ::Instana.tracer.log_info({ redis: {error: true} })
         ::Instana.tracer.log_error(e)

data/lib/instana/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.214.1
+  version: 1.214.3
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-08 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,10 +142,17 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".tekton/github-interceptor-secret.yaml"
+- ".tekton/github-pr-eventlistener.yaml"
+- ".tekton/github-pr-pipeline.yaml.part"
+- ".tekton/github-set-status-task.yaml"
+- ".tekton/github-webhook-ingress.yaml"
 - ".tekton/pipeline.yaml"
 - ".tekton/pipelinerun.yaml"
 - ".tekton/run_unittests.sh"
+- ".tekton/scheduled-eventlistener.yaml"
 - ".tekton/task.yaml"
+- ".tekton/tekton-triggers-eventlistener-serviceaccount.yaml"
 - Appraisals
 - CONTRIBUTING.md
 - Gemfile
@@ -411,7 +418,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana