Merge branch 'main' into sonar-scan

arjun-rajappa · web-flow · commit 2c81ec1045b2 · 2025-08-22T13:10:00.000+05:30
diff --git a/.tekton/.currency/currency-scheduled-eventlistener.yaml b/.tekton/.currency/currency-scheduled-eventlistener.yaml
@@ -41,15 +41,14 @@ kind: CronJob
 metadata:
   name: python-currency-cronjob
 spec:
-  schedule: "35 0 * * Mon-Fri"
+  schedule: "35 1 * * Mon-Fri"
   jobTemplate:
     spec:
       template:
         spec:
           containers:
           - name: http-request-to-el-svc
-            # quay.io/curl/curl:8.11.0
-            image: quay.io/curl/curl@sha256:b90c4281fe1a4c6cc2b6a665c531d448bba078d75ffa98187e7d7e530fca5209
+            image: quay.io/curl/curl:latest
             imagePullPolicy: IfNotPresent
             args: ["curl", "-X", "POST", "--data", "{}", "el-python-currency-cron-listener.default.svc.cluster.local:8080"]
           restartPolicy: OnFailure
diff --git a/.tekton/.currency/currency-tasks.yaml b/.tekton/.currency/currency-tasks.yaml
@@ -11,8 +11,7 @@ spec:
       mountPath: /workspace
   steps:
     - name: clone-repo
-      # public.ecr.aws/docker/library/alpine:3.20.3
-      image: public.ecr.aws/docker/library/alpine@sha256:029a752048e32e843bd6defe3841186fb8d19a28dae8ec287f433bb9d6d1ad85
+      image: public.ecr.aws/docker/library/alpine:latest
       script: |
         #!/bin/sh
         echo "Installing git"
@@ -33,14 +32,14 @@ spec:
       mountPath: /workspace
   steps:
     - name: generate-currency-report
-      # public.ecr.aws/docker/library/python:3.12.10-bookworm
-      image: public.ecr.aws/docker/library/python@sha256:4ea730e54e2a87b716ffc58a426bd627baa182a3d4d5696d05c1bca2dde775aa
+      image: public.ecr.aws/docker/library/python:3.12-bookworm
       script: |
         #!/usr/bin/env bash
         cd /workspace/python-sensor/.tekton/.currency
 
         python -m venv /tmp/venv
         source /tmp/venv/bin/activate
+        pip install --upgrade pip
         pip install -r resources/requirements.txt
 
         python scripts/generate_report.py
@@ -63,8 +62,7 @@ spec:
       mountPath: /workspace
   steps:
     - name: upload-currency-report
-      # public.ecr.aws/docker/library/alpine:3.20.3
-      image: public.ecr.aws/docker/library/alpine@sha256:029a752048e32e843bd6defe3841186fb8d19a28dae8ec287f433bb9d6d1ad85
+      image: public.ecr.aws/docker/library/alpine:latest
       env:
         - name: GH_ENTERPRISE_TOKEN
           valueFrom:
diff --git a/.tekton/github-pr-pipeline.yaml.part b/.tekton/github-pr-pipeline.yaml.part
@@ -8,6 +8,27 @@ spec:
     type: string
   - name: git-commit-sha
     type: string
+  - name: py-38-imageDigest
+    type: string
+    default: public.ecr.aws/docker/library/python:3.8-bookworm
+  - name: py-39-imageDigest
+    type: string
+    default: public.ecr.aws/docker/library/python:3.9-bookworm
+  - name: py-310-imageDigest
+    type: string
+    default: public.ecr.aws/docker/library/python:3.10-bookworm
+  - name: py-311-imageDigest
+    type: string
+    default: public.ecr.aws/docker/library/python:3.11-bookworm
+  - name: py-312-imageDigest
+    type: string
+    default: public.ecr.aws/docker/library/python:3.12-bookworm
+  - name: py-313-imageDigest
+    type: string
+    default: public.ecr.aws/docker/library/python:3.13-bookworm
+  - name: py-314-imageDigest
+    type: string
+    default: public.ecr.aws/docker/library/python:3.14.0rc2
   workspaces:
     - name: python-tracer-ci-pipeline-pvc
   tasks:
@@ -28,6 +49,9 @@ spec:
       - unittest-default
       - unittest-cassandra
       - unittest-gevent-starlette
+      - unittest-aws
+      - unittest-kafka
+      - unittest-python-next
       taskRef:
         kind: Task
         name: github-set-status
diff --git a/.tekton/github-set-status-task.yaml b/.tekton/github-set-status-task.yaml
@@ -14,8 +14,7 @@ spec:
       secretName: githubtoken
   steps:
     - name: set-status
-      # quay.io/curl/curl:8.11.0
-      image: quay.io/curl/curl@sha256:b90c4281fe1a4c6cc2b6a665c531d448bba078d75ffa98187e7d7e530fca5209
+      image: quay.io/curl/curl:latest
       env:
       - name: SHA
         value: $(params.SHA)
diff --git a/.tekton/pipeline.yaml b/.tekton/pipeline.yaml
@@ -6,10 +6,32 @@ spec:
   params:
   - name: revision
     type: string
+  - name: py-38-imageDigest
+    type: string
+    default: public.ecr.aws/docker/library/python:3.8-bookworm
+  - name: py-39-imageDigest
+    type: string
+    default: public.ecr.aws/docker/library/python:3.9-bookworm
+  - name: py-310-imageDigest
+    type: string
+    default: public.ecr.aws/docker/library/python:3.10-bookworm
+  - name: py-311-imageDigest
+    type: string
+    default: public.ecr.aws/docker/library/python:3.11-bookworm
+  - name: py-312-imageDigest
+    type: string
+    default: public.ecr.aws/docker/library/python:3.12-bookworm
+  - name: py-313-imageDigest
+    type: string
+    default: public.ecr.aws/docker/library/python:3.13-bookworm
+  - name: py-314-imageDigest
+    type: string
+    default: public.ecr.aws/docker/library/python:3.14.0rc2
   workspaces:
     - name: python-tracer-ci-pipeline-pvc
   tasks:
     - name: clone
+      displayName: "clone $(params.revision)"
       params:
       - name: revision
         value: $(params.revision)
@@ -19,27 +41,20 @@ spec:
         - name: task-pvc
           workspace: python-tracer-ci-pipeline-pvc
     - name: unittest-default
-      displayName: "Platforms and Browsers: $(params.platform) and $(params.browser)"
+      displayName: "Python $(params.imageDigest)"
       runAfter:
         - clone
       matrix:
         params:
           - name: imageDigest
             value:
-              # public.ecr.aws/docker/library/python:3.8.20-bookworm
-              - "sha256:7aa279fb41dad2962d3c915aa6f6615134baa412ab5aafa9d4384dcaaa0af15d"
-              # public.ecr.aws/docker/library/python:3.9.22-bookworm
-              - "sha256:a847112640804ed2d03bb774d46bb1619bd37862fb2b7e48eebe425a168c153b"
-              # public.ecr.aws/docker/library/python:3.10.17-bookworm
-              - "sha256:e2c7fb05741c735679b26eda7dd34575151079f8c615875fbefe401972b14d85"
-              # public.ecr.aws/docker/library/python:3.11.12-bookworm
-              - "sha256:a3e280261e448b95d49423532ccd6e5329c39d171c10df1457891ff7c5e2301b"
-              # public.ecr.aws/docker/library/python:3.12.10-bookworm
-              - "sha256:4ea730e54e2a87b716ffc58a426bd627baa182a3d4d5696d05c1bca2dde775aa"
-              # public.ecr.aws/docker/library/python:3.13.3-bookworm
-              - "sha256:07bf1bd38e191e3ed18b5f3eb0006d5ab260cb8c967f49d3bf947e5c2e44d8a9"
-              # public.ecr.aws/docker/library/python:3.14.0b2-bookworm
-              - "sha256:4f8ae0a7847680b269d8ef51528053b2cfc9242377f349cbc3a36eacf579903f"
+            - $(params.py-38-imageDigest)
+            - $(params.py-39-imageDigest)
+            - $(params.py-310-imageDigest)
+            - $(params.py-311-imageDigest)
+            - $(params.py-312-imageDigest)
+            - $(params.py-313-imageDigest)
+            # - $(params.py-314-imageDigest)
       taskRef:
         name: python-tracer-unittest-default-task
       workspaces:
@@ -48,12 +63,9 @@ spec:
     - name: unittest-cassandra
       runAfter:
         - clone
-      matrix:
-        params:
-          - name: imageDigest
-            value:
-              # public.ecr.aws/docker/library/python:3.9.22-bookworm
-              - "sha256:a847112640804ed2d03bb774d46bb1619bd37862fb2b7e48eebe425a168c153b"
+      params:
+        - name: imageDigest
+          value: $(params.py-312-imageDigest)
       taskRef:
         name: python-tracer-unittest-cassandra-task
       workspaces:
@@ -62,12 +74,9 @@ spec:
     - name: unittest-gevent-starlette
       runAfter:
         - clone
-      matrix:
-        params:
-          - name: imageDigest
-            value:
-              # public.ecr.aws/docker/library/python:3.9.22-bookworm
-              - "sha256:a847112640804ed2d03bb774d46bb1619bd37862fb2b7e48eebe425a168c153b"
+      params:
+        - name: imageDigest
+          value: $(params.py-313-imageDigest)
       taskRef:
         name: python-tracer-unittest-gevent-starlette-task
       workspaces:
@@ -76,12 +85,9 @@ spec:
     - name: unittest-aws
       runAfter:
         - clone
-      matrix:
-        params:
-          - name: imageDigest
-            value:
-              # public.ecr.aws/docker/library/python:3.12.10-bookworm
-              - "sha256:4ea730e54e2a87b716ffc58a426bd627baa182a3d4d5696d05c1bca2dde775aa"
+      params:
+        - name: imageDigest
+          value: $(params.py-313-imageDigest)
       taskRef:
         name: python-tracer-unittest-aws-task
       workspaces:
@@ -90,14 +96,23 @@ spec:
     - name: unittest-kafka
       runAfter:
         - clone
-      matrix:
-        params:
-          - name: imageDigest
-            value:
-              # public.ecr.aws/docker/library/python:3.12.10-bookworm
-              - "sha256:4ea730e54e2a87b716ffc58a426bd627baa182a3d4d5696d05c1bca2dde775aa"
+      params:
+        - name: imageDigest
+          value: $(params.py-313-imageDigest)
       taskRef:
         name: python-tracer-unittest-kafka-task
       workspaces:
         - name: task-pvc
           workspace: python-tracer-ci-pipeline-pvc
+    - name: unittest-python-next
+      displayName: "Python next $(params.imageDigest)"
+      runAfter:
+        - clone
+      params:
+        - name: py-version
+          value: 3.14.0rc2
+      taskRef:
+        name: python-tracer-unittest-python-next-task
+      workspaces:
+        - name: task-pvc
+          workspace: python-tracer-ci-pipeline-pvc
diff --git a/.tekton/python-tracer-prepuller.yaml b/.tekton/python-tracer-prepuller.yaml
@@ -14,68 +14,52 @@ spec:
       # Configure an init container for each image you want to pull
       initContainers:
         - name: prepuller-git
-          # public.ecr.aws/docker/library/alpine:3.20.3
-          image: public.ecr.aws/docker/library/alpine@sha256:029a752048e32e843bd6defe3841186fb8d19a28dae8ec287f433bb9d6d1ad85
+          image: public.ecr.aws/docker/library/alpine:latest
           command: ["sh", "-c", "'true'"]
         - name: prepuller-google-cloud-pubsub
-          # quay.io/thekevjames/gcloud-pubsub-emulator:501.0.0
-          image: quay.io/thekevjames/gcloud-pubsub-emulator@sha256:9bad1f28e6a3d6cd5f462c654c736faa4cf49732d9422ddb427ad30f3037c0ff
+          image: quay.io/thekevjames/gcloud-pubsub-emulator:501.0.0
           command: ["sh", "-c", "'true'"]
         - name: prepuller-cassandra
-          # public.ecr.aws/docker/library/cassandra:3.11.16-jammy
-          image: public.ecr.aws/docker/library/cassandra@sha256:b175d99b80f8108594d00c705288fdb3186b9fc07b30b4c292c3592cddb5f0b5
+          image: public.ecr.aws/docker/library/cassandra:3.11.16-jammy
           command: ["sh", "-c", "'true'"]
         - name: prepuller-rabbitmq
-          # public.ecr.aws/docker/library/rabbitmq:3.13.0
-          image: public.ecr.aws/docker/library/rabbitmq@sha256:39de1a4fc6c72d12bd5dfa23e8576536fd1c0cc8418344cd5a51addfc9a1145d
+          image: public.ecr.aws/docker/library/rabbitmq:3.13.0
           command: ["sh", "-c", "'true'"]
         - name: prepuller-redis
-          # public.ecr.aws/docker/library/redis:7.2.4-bookworm
-          image: public.ecr.aws/docker/library/redis@sha256:9341b6548cc35b64a6de0085555264336e2f570e17ecff20190bf62222f2bd64
+          image: public.ecr.aws/docker/library/redis:7.2.4-bookworm
           command: ["sh", "-c", "'true'"]
         - name: prepuller-mongo
-          # public.ecr.aws/docker/library/mongo:7.0.6
-          image: public.ecr.aws/docker/library/mongo@sha256:3a023748ee30e915dd51642f1ef430c73c4e54937060054ca84c70417f510cc5
+          image: public.ecr.aws/docker/library/mongo:7.0.6
           command: ["sh", "-c", "'true'"]
         - name: prepuller-mariadb
-          # public.ecr.aws/docker/library/mariadb:11.3.2
-          image: public.ecr.aws/docker/library/mariadb@sha256:a4a81ab6d190db84b67f286fd0511cdea619a24b63790b3db4fb69d263a5cd37
+          image: public.ecr.aws/docker/library/mariadb:11.3.2
           command: ["sh", "-c", "'true'"]
         - name: prepuller-postgres
-          # public.ecr.aws/docker/library/postgres:16.2-bookworm
-          image: public.ecr.aws/docker/library/postgres@sha256:07572430dbcd821f9f978899c3ab3a727f5029be9298a41662e1b5404d5b73e0
+          image: public.ecr.aws/docker/library/postgres:16.2-bookworm
           command: ["sh", "-c", "'true'"]
         - name: prepuller-kafka
-          # public.ecr.aws/bitnami/kafka:3.9.0
-          image: public.ecr.aws/docker/library/kafka@sha256:d2890d68f96b36da3c8413fa94294f018b2f95d87cf108cbf71eab510572d9be
+          image: public.ecr.aws/bitnami/kafka:3.9.0
           command: ["sh", "-c", "'true'"]
         - name: prepuller-38
-          # public.ecr.aws/docker/library/python:3.8.20-bookworm
-          image: public.ecr.aws/docker/library/python@
+          image: public.ecr.aws/docker/library/python:3.8-bookworm
           command: ["sh", "-c", "'true'"]
         - name: prepuller-39
-          # public.ecr.aws/docker/library/python:3.9.22-bookworm
-          image: public.ecr.aws/docker/library/python@sha256:a847112640804ed2d03bb774d46bb1619bd37862fb2b7e48eebe425a168c153b
+          image: public.ecr.aws/docker/library/python:3.9-bookworm
           command: ["sh", "-c", "'true'"]
         - name: prepuller-310
-          # public.ecr.aws/docker/library/python:3.10.17-bookworm
-          image: public.ecr.aws/docker/library/python@sha256:e2c7fb05741c735679b26eda7dd34575151079f8c615875fbefe401972b14d85
+          image: public.ecr.aws/docker/library/python:3.10-bookworm
           command: ["sh", "-c", "'true'"]
         - name: prepuller-311
-          # public.ecr.aws/docker/library/python:3.11.12-bookworm
-          image: public.ecr.aws/docker/library/python@sha256:a3e280261e448b95d49423532ccd6e5329c39d171c10df1457891ff7c5e2301b
+          image: public.ecr.aws/docker/library/python:3.11-bookworm
           command: ["sh", "-c", "'true'"]
         - name: prepuller-312
-          # public.ecr.aws/docker/library/python:3.12.10-bookworm
-          image: public.ecr.aws/docker/library/python@sha256:4ea730e54e2a87b716ffc58a426bd627baa182a3d4d5696d05c1bca2dde775aa
+          image: public.ecr.aws/docker/library/python:3.12-bookworm
           command: ["sh", "-c", "'true'"]
         - name: prepuller-313
-          # public.ecr.aws/docker/library/python:3.13.3-bookworm
-          image: public.ecr.aws/docker/library/python@sha256:07bf1bd38e191e3ed18b5f3eb0006d5ab260cb8c967f49d3bf947e5c2e44d8a9
+          image: public.ecr.aws/docker/library/python:3.13-bookworm
           command: ["sh", "-c", "'true'"]
         - name: prepuller-314
-          # public.ecr.aws/docker/library/python:3.14.0b2-bookworm
-          image: public.ecr.aws/docker/library/python@sha256:4f8ae0a7847680b269d8ef51528053b2cfc9242377f349cbc3a36eacf579903f
+          image: public.ecr.aws/docker/library/python:3.14.0rc2
           command: ["sh", "-c", "'true'"]
 
       # Use the pause container to ensure the Pod goes into a `Running` phase
diff --git a/.tekton/scheduled-eventlistener.yaml b/.tekton/scheduled-eventlistener.yaml
@@ -61,8 +61,7 @@ spec:
         spec:
           containers:
           - name: git
-            # public.ecr.aws/docker/library/alpine:3.20.3
-            image: public.ecr.aws/docker/library/alpine@sha256:029a752048e32e843bd6defe3841186fb8d19a28dae8ec287f433bb9d6d1ad85
+            image: public.ecr.aws/docker/library/alpine:latest
             script: |
               #!/bin/sh
               echo "Installing git"
diff --git a/.tekton/task.yaml b/.tekton/task.yaml
diff --git a/src/instana/instrumentation/logging.py b/src/instana/instrumentation/logging.py
