Adapt common utilities to OTel specifications

.circleci/config.yml

@@ -74,6 +74,7 @@ commands:
     steps:
       - store_test_results:
           path: test-results
+
   run_sonarqube:
     steps:
       - attach_workspace:
@@ -103,8 +104,8 @@ commands:
                 -Dsonar.login="${SONARQUBE_LOGIN}" \
                 -Dsonar.branch.name="${CIRCLE_BRANCH}"
             fi
-          store_artifacts:
-            path: htmlcov
+      - store_artifacts:
+          path: htmlcov
 
   store-coverage-report:
     steps:
@@ -114,7 +115,7 @@ commands:
 jobs:
   python38:
     docker:
-      - image: cimg/python:3.8.17
+      - image: cimg/python:3.8
       - image: cimg/postgres:9.6.24
         environment:
           POSTGRES_USER: root
@@ -138,7 +139,7 @@ jobs:
 
   python39:
     docker:
-      - image: cimg/python:3.9.17
+      - image: cimg/python:3.9
       - image: cimg/postgres:9.6.24
         environment:
           POSTGRES_USER: root
@@ -162,7 +163,7 @@ jobs:
 
   python310:
     docker:
-      - image: cimg/python:3.10.12
+      - image: cimg/python:3.10
       - image: cimg/postgres:9.6.24
         environment:
           POSTGRES_USER: root
@@ -187,7 +188,7 @@ jobs:
 
   python311:
     docker:
-      - image: cimg/python:3.11.4
+      - image: cimg/python:3.11
       - image: cimg/postgres:9.6.24
         environment:
           POSTGRES_USER: root
@@ -212,7 +213,7 @@ jobs:
 
   python312:
     docker:
-      - image: cimg/python:3.12.0
+      - image: cimg/python:3.12
       - image: cimg/postgres:9.6.24
         environment:
           POSTGRES_USER: root
@@ -235,9 +236,34 @@ jobs:
       - store-pytest-results
       - store-coverage-report
 
+  python313:
+    docker:
+      - image: python:3.13.0b2-bookworm
+      - image: cimg/postgres:9.6.24
+        environment:
+          POSTGRES_USER: root
+          POSTGRES_PASSWORD: passw0rd
+          POSTGRES_DB: instana_test_db
+      - image: cimg/mariadb:10.11.2
+        environment:
+          MYSQL_ROOT_PASSWORD: passw0rd
+          MYSQL_DATABASE: instana_test_db
+      - image: cimg/redis:5.0.14
+      - image: rabbitmq:3.9.13
+      - image: mongo:4.2.3
+      - image: vanmoof/pubsub-emulator
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - pip-install-deps:
+          requirements: "tests/requirements-313.txt"
+      - run-tests-with-coverage-report
+      - store-pytest-results
+      - store-coverage-report
+
   py39couchbase:
     docker:
-      - image: cimg/python:3.9.17
+      - image: cimg/python:3.9
       - image: couchbase/server-sandbox:5.5.0
     working_directory: ~/repo
     steps:
@@ -253,7 +279,7 @@ jobs:
 
   py39cassandra:
     docker:
-      - image: cimg/python:3.9.17
+      - image: cimg/python:3.9
       - image: cassandra:3.11
         environment:
           MAX_HEAP_SIZE: 2048m
@@ -303,16 +329,21 @@ workflows:
       - python310
       - python311
       - python312
-      - py39cassandra
-      - py39couchbase
-      - py39gevent_starlette
+      - python313
+      # - py39cassandra
+      # - py39couchbase
+      # - py39gevent_starlette
       - final_job:
           requires:
             - python38
             - python39
             - python310
             - python311
             - python312
-            - py39cassandra
-            - py39couchbase
-            - py39gevent_starlette
+            - python313
+            # - py39cassandra
+            # - py39couchbase
+            # - py39gevent_starlette
+          filters:
+            branches:
+              only: master

.tekton/.currency/resources/table.json

@@ -2,7 +2,7 @@
     "table": [
       {
         "Package name": "ASGI",
-        "Support Policy": "0-day",
+        "Support Policy": "30-days",
         "Beta version": "No",
         "Last Supported Version": "3.0",
         "Cloud Native": "No"
@@ -21,13 +21,13 @@
       },
       {
         "Package name": "FastAPI",
-        "Support Policy": "0-day",
+        "Support Policy": "30-days",
         "Beta version": "No",
         "Cloud Native": "No"
       },
       {
         "Package name": "Flask",
-        "Support Policy": "0-day",
+        "Support Policy": "30-days",
         "Beta version": "No",
         "Cloud Native": "No"
       },
@@ -66,7 +66,7 @@
       {
         "Package name": "WSGI",
         "Support Policy": "0-day",
-        "Beta version": "No",
+        "Beta version": "Yes",
         "Last Supported Version": "1.0.1",
         "Cloud Native": "No"
       },
@@ -85,7 +85,7 @@
       },
       {
         "Package name": "Boto3",
-        "Support Policy": "0-day",
+        "Support Policy": "30-days",
         "Beta version": "No",
         "Cloud Native": "Yes"
       },
@@ -145,7 +145,7 @@
       },
       {
         "Package name": "Requests",
-        "Support Policy": "0-day",
+        "Support Policy": "30-days",
         "Beta version": "No",
         "Cloud Native": "Yes"
       },
@@ -157,7 +157,7 @@
       },
       {
         "Package name": "Urllib3",
-        "Support Policy": "0-day",
+        "Support Policy": "30-days",
         "Beta version": "No",
         "Cloud Native": "No"
       }

.tekton/pipeline.yaml

@@ -25,16 +25,18 @@ spec:
         params:
           - name: imageDigest
             value:
-              # 3.8.18-bookworm
-              - "sha256:625008535504ab68868ca06d1bdd868dee92a9878d5b55fc240af7ceb38b7183"
-              # 3.9.18-bookworm
-              - "sha256:530d4ba717be787c0e2d011aa107edac6d721f8c06fe6d44708d4aa5e9bc5ec9"
-              # 3.10.13-bookworm
-              - "sha256:c970ff53939772f47b0672e380328afb50d8fd1c0568ed4f82c22effc54244fc"
-              # 3.11.8-bookworm
-              - "sha256:72afb375030b13c8c9cb72ba1d8c410f25307c2dbbd7d59f9c6ccea5cb152ff9"
-              # 3.12.2-bookworm
-              - "sha256:35eff340c0acd837b7962f77ee4b8869385dd6fe7d3928375a08f0a3bdd18beb"
+              # 3.8.19-bookworm
+              - "sha256:4d3590657cf443010b58ae94a09c59505a750744ed70d2028b35dac101df5e3a"
+              # 3.9.19-bookworm
+              - "sha256:e298e2e898691a938073f670dac8ef1a551c83344b67b5d8e32d1fbc8e0b57f8"
+              # 3.10.14-bookworm
+              - "sha256:c0352a2c64efe4cc08b198e90b97ed7e08897518c4bee99647e3eaf676e84951"
+              # 3.11.9-bookworm
+              - "sha256:0c2928128a96e544a1ee248e50ee8ecbe840bf48ef5a49065812e3d06b6e1bcc"
+              # 3.12.4-bookworm
+              - "sha256:83f5f8714b6881d3e0e91023d9fe9e43aa6ad5a04e9f9a94ee180b18b021c72a"
+              # 3.13.0b2-bookworm
+              - "sha256:6502f02f8a02313f582928ec7159623b54d7c3d627a7e355ca46f4aace406a6a"
       taskRef:
         name: python-tracer-unittest-default-task
       workspaces:
@@ -47,8 +49,8 @@ spec:
         params:
           - name: imageDigest
             value:
-              # 3.9.18-bookworm
-              - "sha256:530d4ba717be787c0e2d011aa107edac6d721f8c06fe6d44708d4aa5e9bc5ec9"
+              # 3.9.19-bookworm
+              - "sha256:e298e2e898691a938073f670dac8ef1a551c83344b67b5d8e32d1fbc8e0b57f8"
       taskRef:
         name: python-tracer-unittest-cassandra-task
       workspaces:
@@ -61,8 +63,8 @@ spec:
         params:
           - name: imageDigest
             value:
-              # 3.9.18-bookworm
-              - "sha256:530d4ba717be787c0e2d011aa107edac6d721f8c06fe6d44708d4aa5e9bc5ec9"
+              # 3.9.19-bookworm
+              - "sha256:e298e2e898691a938073f670dac8ef1a551c83344b67b5d8e32d1fbc8e0b57f8"
       taskRef:
         name: python-tracer-unittest-couchbase-task
       workspaces:

.tekton/python-tracer-prepuller.yaml

@@ -49,41 +49,29 @@ spec:
           # postgres:16.2-bookworm
           image: postgres@sha256:3bfb87432e26badf72d727a0c5f5bb7b81438cd9baec5be8531c70a42b07adc6
           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'"]
         - name: prepuller-38
-          # 3.8.18-bookworm
-          image: "python@sha256:625008535504ab68868ca06d1bdd868dee92a9878d5b55fc240af7ceb38b7183"
+          # 3.8.19-bookworm
+          image: "python@sha256:4d3590657cf443010b58ae94a09c59505a750744ed70d2028b35dac101df5e3a"
           command: ["sh", "-c", "'true'"]
         - name: prepuller-39
-          # 3.9.18-bookworm
-          image: "python@sha256:530d4ba717be787c0e2d011aa107edac6d721f8c06fe6d44708d4aa5e9bc5ec9"
+          # 3.9.19-bookworm
+          image: "python@sha256:e298e2e898691a938073f670dac8ef1a551c83344b67b5d8e32d1fbc8e0b57f8"
           command: ["sh", "-c", "'true'"]
         - name: prepuller-310
-          # 3.10.13-bookworm
-          image: "python@sha256:c970ff53939772f47b0672e380328afb50d8fd1c0568ed4f82c22effc54244fc"
+          # 3.10.14-bookworm
+          image: "python@sha256:c0352a2c64efe4cc08b198e90b97ed7e08897518c4bee99647e3eaf676e84951"
           command: ["sh", "-c", "'true'"]
         - name: prepuller-311
-          # 3.11.8-bookworm
-          image: "python@sha256:72afb375030b13c8c9cb72ba1d8c410f25307c2dbbd7d59f9c6ccea5cb152ff9"
+          # 3.11.9-bookworm
+          image: "python@sha256:0c2928128a96e544a1ee248e50ee8ecbe840bf48ef5a49065812e3d06b6e1bcc"
           command: ["sh", "-c", "'true'"]
         - name: prepuller-312
-          # 3.12.2-bookworm
-          image: "python@sha256:35eff340c0acd837b7962f77ee4b8869385dd6fe7d3928375a08f0a3bdd18beb"
+          # 3.12.4-bookworm
+          image: "python@sha256:83f5f8714b6881d3e0e91023d9fe9e43aa6ad5a04e9f9a94ee180b18b021c72a"
+          command: ["sh", "-c", "'true'"]
+        - name: prepuller-313
+          # 3.13.0b2-bookworm
+          image: "python@sha256:6502f02f8a02313f582928ec7159623b54d7c3d627a7e355ca46f4aace406a6a"
           command: ["sh", "-c", "'true'"]
 
       # Use the pause container to ensure the Pod goes into a `Running` phase

.tekton/run_unittests.sh

@@ -22,6 +22,8 @@ default)
       export REQUIREMENTS='requirements-310.txt' ;;
     12)
       export REQUIREMENTS='requirements-312.txt' ;;
+    13)
+      export REQUIREMENTS='requirements-313.txt' ;;
     *)
       export REQUIREMENTS='requirements.txt' ;;
   esac
@@ -59,6 +61,7 @@ if [[ -n "${COUCHBASE_TEST}" ]]; then
   apt update
   apt install libcouchbase-dev -y
 fi
+
 python -m venv /tmp/venv
 # shellcheck disable=SC1091
 source /tmp/venv/bin/activate

pyproject.toml

@@ -13,7 +13,7 @@ requires-python = ">=3.8"
 license = "MIT"
 keywords = [
     "performance",
-    "opentracing",
+    "opentelemetry",
     "metrics",
     "monitoring",
     "tracing",
@@ -44,13 +44,12 @@ classifiers = [
 ]
 dependencies = [
     "autowrapt>=1.0",
-    "basictracer>=3.1.0",
     "fysom>=2.1.2",
-    "opentracing>=2.3.0",
     "protobuf<5.0.0",
     "requests>=2.6.0",
     "six>=1.12.0",
     "urllib3>=1.26.5",
+    "opentelemetry-api>=1.23.0",
 ]
 
 [project.optional-dependencies]

pytest.ini

@@ -3,3 +3,4 @@ log_cli = 1
 log_cli_level = WARN
 log_cli_format = %(asctime)s %(levelname)s %(message)s
 log_cli_date_format = %H:%M:%S
+pythonpath = src

src/instana/collector/aws_eks_fargate.py

@@ -5,15 +5,17 @@
 """
 
 from time import time
-from instana.log import logger
+
 from instana.collector.base import BaseCollector
 from instana.collector.helpers.eks.process import EKSFargateProcessHelper
 from instana.collector.helpers.runtime import RuntimeHelper
+from instana.collector.utils import format_trace_and_span_ids
+from instana.log import logger
 from instana.util import DictionaryOfStan
 
 
 class EKSFargateCollector(BaseCollector):
-    """ Collector for EKS Pods on AWS Fargate """
+    """Collector for EKS Pods on AWS Fargate"""
 
     def __init__(self, agent):
         super(EKSFargateCollector, self).__init__(agent)
@@ -35,7 +37,7 @@ def prepare_payload(self):
 
         try:
             if not self.span_queue.empty():
-                payload["spans"] = self.queued_spans()
+                payload["spans"] = format_trace_and_span_ids(self.queued_spans())
 
             with_snapshot = self.should_send_snapshot_data()