feat: python improvements and uv support

Author: pragmaticivan

.github/workflows/ci-python.yml

@@ -16,9 +16,6 @@ on:
 
 env:
   AWS_REGION: us-east-1
-  # Copied this CORE_REPO_SHA from
-  # https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/.github/workflows/test.yml#L9
-  CORE_REPO_SHA: v1.19.0
 
 permissions:
   contents: read
@@ -36,19 +33,17 @@ jobs:
     steps:
       - name: Checkout this repo
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+
       - name: Setup Python for OTel Python SDK
         uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
         with:
           python-version: ${{ matrix.python }}
-      - name: Install tox testing package
-        working-directory: python/src
+
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v7
+
+      - name: Run tests
+        working-directory: python/src/otel
         run: |
-          pip install tox
-          tox
-      - name: Set up Go for ADOT Collector
-        uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
-        with:
-          go-version: '^1.20.8'
-      - name: Build Python Layer which includes ADOT Collector
-        working-directory: python/src
-        run: ./run.sh -b
+          uv sync --extra test --extra instrumentation
+          uv run pytest tests

.github/workflows/release-layer-python.yml

@@ -37,8 +37,8 @@ jobs:
       - name: Save PYTHON_OPENTELEMETRY_SDK_VERSION
         id: save-python-opentelemetry-sdk-version
         run: |
-          cd python/src
-          echo "PYTHON_OPENTELEMETRY_SDK_VERSION=$(cat otel/otel_sdk/requirements.txt | grep opentelemetry-sdk | sed 's/.*==\([^ ]*\).*/\1/')" >> $GITHUB_ENV
+          cd python/src/otel
+          echo "PYTHON_OPENTELEMETRY_SDK_VERSION=$(grep 'opentelemetry-sdk' pyproject.toml | sed 's/.*==\([^"]*\).*/\1/')" >> $GITHUB_ENV
           echo "PYTHON_OPENTELEMETRY_SDK_VERSION=$PYTHON_OPENTELEMETRY_SDK_VERSION" >> $GITHUB_OUTPUT
         shell: bash
 
@@ -78,7 +78,7 @@ jobs:
     needs: build-layer
     strategy:
       matrix:
-        aws_region: 
+        aws_region:
           - ap-northeast-1
           - ap-northeast-2
           - ap-south-1

.gitignore

@@ -13,8 +13,10 @@ terraform.*
 .DS_Store
 
 .tox
-__pycache__/*
-.pyc
+.venv
+.pytest_cache/
+__pycache__/
+*.pyc
 build.toml
 
 *.zip

python/src/otel/Dockerfile

@@ -6,13 +6,13 @@ ADD . /workspace
 
 WORKDIR /workspace
 
+# Install uv
+RUN curl -LsSf https://astral.sh/uv/install.sh | sh && \
+  export PATH="/root/.local/bin:$PATH"
+
 RUN mkdir -p /build && \
-  python3 -m pip install -r otel_sdk/requirements.txt -t /build/python && \
-  python3 -m pip install -r otel_sdk/nodeps-requirements.txt -t /build/tmp --no-deps && \
-  # We need to use a `/build/tmp/` folder otherwise the instrumentation packages
-  # do not get fully downloaded to the `opentelemetry/instrumentation/` path.
-  cp -r /build/tmp/* /build/python/ && \
-  rm -rf /build/tmp && \
+  /root/.local/bin/uv venv /build/.venv && \
+  /root/.local/bin/uv pip install --python /build/.venv/bin/python '.[instrumentation]' --target /build/python && \
   mv otel_sdk/otel_wrapper.py /build/python && \
   mv otel_sdk/otel-instrument /build && \
   mv otel_sdk/otel-handler /build && \

python/src/otel/Makefile

@@ -0,0 +1,49 @@
+[project]
+name = "otel"
+version = "0.1.0"
+dependencies = [
+    "opentelemetry-sdk==1.39.0",
+    "opentelemetry-exporter-otlp-proto-http==1.39.0",
+    "opentelemetry-distro==0.60b0",
+    "opentelemetry-instrumentation==0.60b0",
+    "opentelemetry-semantic-conventions==0.60b0",
+    "opentelemetry-propagator-aws-xray==1.0.2",
+]
+
+[project.optional-dependencies]
+test = [
+    "opentelemetry-test-utils==0.60b0",
+    "pytest"
+]
+instrumentation = [
+    "opentelemetry-instrumentation-aiohttp-client==0.60b0",
+    "opentelemetry-util-http==0.60b0",
+    "opentelemetry-instrumentation-asgi==0.60b0",
+    "opentelemetry-instrumentation-asyncpg==0.60b0",
+    "opentelemetry-instrumentation-aws-lambda==0.60b0",
+    "opentelemetry-instrumentation-boto==0.60b0",
+    "opentelemetry-instrumentation-botocore==0.60b0",
+    "opentelemetry-instrumentation-boto3sqs==0.60b0",
+    "opentelemetry-instrumentation-celery==0.60b0",
+    "opentelemetry-instrumentation-dbapi==0.60b0",
+    "opentelemetry-instrumentation-django==0.60b0",
+    "opentelemetry-instrumentation-elasticsearch==0.60b0",
+    "opentelemetry-instrumentation-fastapi==0.60b0",
+    "opentelemetry-instrumentation-falcon==0.60b0",
+    "opentelemetry-instrumentation-flask==0.60b0",
+    "opentelemetry-instrumentation-grpc==0.60b0",
+    "opentelemetry-instrumentation-jinja2==0.60b0",
+    "opentelemetry-instrumentation-mysql==0.60b0",
+    "opentelemetry-instrumentation-psycopg2==0.60b0",
+    "opentelemetry-instrumentation-pymemcache==0.60b0",
+    "opentelemetry-instrumentation-pymongo==0.60b0",
+    "opentelemetry-instrumentation-pymysql==0.60b0",
+    "opentelemetry-instrumentation-pyramid==0.60b0",
+    "opentelemetry-instrumentation-redis==0.60b0",
+    "opentelemetry-instrumentation-requests==0.60b0",
+    "opentelemetry-instrumentation-sqlalchemy==0.60b0",
+    "opentelemetry-instrumentation-sqlite3==0.60b0",
+    "opentelemetry-instrumentation-starlette==0.60b0",
+    "opentelemetry-instrumentation-tornado==0.60b0",
+    "opentelemetry-instrumentation-wsgi==0.60b0",
+]