diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ebfe3c84e57..421c7dec606 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -128,7 +128,8 @@ tests/suitespec.py @DataDog/python-guild @DataDog/apm-core-pyt # API SDK ddtrace/_trace/ @DataDog/apm-sdk-api-python ddtrace/opentelemetry/ @DataDog/apm-sdk-api-python -ddtrace/opentracer/ @DataDog/apm-sdk-api-python +ddtrace/internal/opentelemetry @DataDog/apm-sdk-api-python +ddtrace/opentracer/ @DataDog/apm-sdk-api-python ddtrace/propagation/ @DataDog/apm-sdk-api-python ddtrace/filters.py @DataDog/apm-sdk-api-python ddtrace/pin.py @DataDog/apm-sdk-api-python diff --git a/.github/workflows/build_deploy.yml b/.github/workflows/build_deploy.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af870a89746..92ba77c0093 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,75 +1,74 @@ stages: - package - - deploy + - shared-pipeline + - dogfood - benchmarks - benchmarks-pr-comment - macrobenchmarks - dogfood include: - - remote: https://gitlab-templates.ddbuild.io/apm/packaging.yml + - remote: https://gitlab-templates.ddbuild.io/libdatadog/include/one-pipeline.yml - local: ".gitlab/benchmarks.yml" - local: ".gitlab/macrobenchmarks.yml" - local: ".gitlab/dogfood.yml" variables: - DOWNSTREAM_BRANCH: - value: "master" - description: "Run a specific datadog-reliability-env branch downstream" - DOWNSTREAM_MBP_BRANCH: - value: "dd-trace-py" - description: "Run a specific relenv-microbenchmarking-platform branch downstream" - PYTHON_PACKAGE_VERSION: - description: "Version to build for .deb and .rpm. Must be already published in PyPi" - -.common: &common - tags: [ "runner:main", "size:large" ] + REPO_LANG: python # "python" is used everywhere rather than "py" -package: - extends: .package - rules: - - if: $PYTHON_PACKAGE_VERSION - when: on_success - - if: '$CI_COMMIT_TAG =~ /^v.*/' - when: on_success +download_ddtrace_wheels: + image: registry.ddbuild.io/github-cli:v27480869-eafb11d-2.43.0 + tags: [ "arch:amd64" ] + stage: package script: - - ../.gitlab/build-deb-rpm.sh - - find . -iregex '.*\.\(deb\|rpm\)' -printf '%f\0' | xargs -0 dd-pkg lint + - aws ssm get-parameter --region us-east-1 --name ci.$CI_PROJECT_NAME.gh_token --with-decryption --query "Parameter.Value" --out text > token + - gh auth login --with-token < token + - rm token + - .gitlab/download-wheels-from-gh-actions.sh + artifacts: + paths: + - "pywheels/*.whl" -package-arm: - extends: .package-arm - rules: - - if: $PYTHON_PACKAGE_VERSION - when: on_success - - if: '$CI_COMMIT_TAG =~ /^v.*/' - when: on_success +download_dependency_wheels: + image: registry.ddbuild.io/images/mirror/python:$PYTHON_IMAGE_TAG + tags: [ "arch:amd64" ] + stage: package + needs: [ download_ddtrace_wheels ] + parallel: + matrix: # The image tags that are mirrored are in: https://github.com/DataDog/images/blob/master/mirror.yaml + - PYTHON_IMAGE_TAG: "3.7" + PYTHON_VERSION: "3.7" + - PYTHON_IMAGE_TAG: "3.8" + PYTHON_VERSION: "3.8" + - PYTHON_IMAGE_TAG: "3.9.13" + PYTHON_VERSION: "3.9" + - PYTHON_IMAGE_TAG: "3.10.13" + PYTHON_VERSION: "3.10" + - PYTHON_IMAGE_TAG: "3.11.6" + PYTHON_VERSION: "3.11" + - PYTHON_IMAGE_TAG: "3.12.0" + PYTHON_VERSION: "3.12" script: - - ../.gitlab/build-deb-rpm.sh - - find . -iregex '.*\.\(deb\|rpm\)' -printf '%f\0' | xargs -0 dd-pkg lint + - .gitlab/download-dependency-wheels.sh + artifacts: + paths: + - "pywheels-dep/" -.release-package: - stage: deploy - variables: - PRODUCT_NAME: auto_inject-python +package-oci: + needs: [ download_dependency_wheels, download_ddtrace_wheels ] -deploy_to_reliability_env: - stage: deploy +# no installer tests for python +onboarding_tests_installer: rules: - - if: $CI_PIPELINE_SOURCE == "schedule" - when: on_success - - when: manual - allow_failure: true - trigger: - project: DataDog/apm-reliability/datadog-reliability-env - branch: $DOWNSTREAM_BRANCH - variables: - UPSTREAM_PROJECT_ID: $CI_PROJECT_ID - UPSTREAM_PROJECT_NAME: $CI_PROJECT_NAME - UPSTREAM_BRANCH: $CI_COMMIT_REF_NAME - UPSTREAM_COMMIT_SHA: $CI_COMMIT_SHA + - when: never + +onboarding_tests_k8s_injection: + parallel: + matrix: + - WEBLOG_VARIANT: [dd-lib-python-init-test-django, dd-lib-python-init-test-django-gunicorn, dd-lib-python-init-test-django-uvicorn] deploy_to_di_backend:manual: - stage: deploy + stage: shared-pipeline rules: - when: manual allow_failure: true @@ -84,65 +83,3 @@ deploy_to_di_backend:manual: UPSTREAM_COMMIT_AUTHOR: $CI_COMMIT_AUTHOR UPSTREAM_TAG: $CI_COMMIT_TAG UPSTREAM_PACKAGE_JOB: build - -generate-lib-init-tag-values: - tags: ["arch:amd64"] - image: registry.ddbuild.io/ci/auto_inject/gitlab:current - stage: deploy - rules: - - if: '$POPULATE_CACHE' - when: never - # We don't tag prerelease versions - - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+$/' - when: on_success - - when: manual - allow_failure: true - variables: - IMG_DESTINATION_BASE: dd-lib-python-init - script: - - ./.gitlab/build-lib-init.sh - artifacts: - reports: - dotenv: build.env - -deploy-lib-init-trigger: - stage: deploy - # needs the version from the generate-tag-values job - needs: - - job: generate-lib-init-tag-values - artifacts: true - trigger: -# project: DataDog/dd-trace-dotnet-gitlab-test # can be used for testing - project: DataDog/public-images - branch: main - strategy: depend - variables: - IMG_SOURCES: ghcr.io/datadog/dd-trace-py/dd-lib-python-init:$CI_COMMIT_TAG - IMG_DESTINATIONS: $IMG_DESTINATIONS - IMG_SIGNING: "false" - # Wait 4 hours to trigger the downstream job. - # This is a work-around since there isn't a way to trigger - # Gitlab from the Github workflow (build_deploy.yml:upload_pypi). - # - # The caveat here is that if there is a failure to build to PyPI and it - # isn't fixed in the retry period then this job will fail and images will - # not be published. - RETRY_DELAY: 14400 - RETRY_COUNT: 3 - -package-oci: - stage: package - extends: .package-oci - rules: - - if: $PYTHON_PACKAGE_VERSION - when: on_success - - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-prerelease)?$/' - when: manual - allow_failure: false - script: - - ../.gitlab/build-oci.sh - parallel: - matrix: - - ARCH: - - arm64 - - amd64 diff --git a/.gitlab/build-deb-rpm.sh b/.gitlab/build-deb-rpm.sh deleted file mode 100755 index 894ee034341..00000000000 --- a/.gitlab/build-deb-rpm.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -if [ -n "$CI_COMMIT_TAG" ] && [ -z "$PYTHON_PACKAGE_VERSION" ]; then - PYTHON_PACKAGE_VERSION=${CI_COMMIT_TAG##v} -fi - -echo -n $PYTHON_PACKAGE_VERSION > auto_inject-python.version - -source common_build_functions.sh - -mkdir -p dd-trace.dir/lib - -# Install known compatible pip as default version shipped in Ubuntu (20.0.2) -# does not work. -python3 -m pip install -U "pip>=22.0" -python3 -m pip install packaging - -echo `pwd` - -../lib-injection/dl_wheels.py \ - --python-version=3.12 \ - --python-version=3.11 \ - --python-version=3.10 \ - --python-version=3.9 \ - --python-version=3.8 \ - --python-version=3.7 \ - --ddtrace-version=$PYTHON_PACKAGE_VERSION \ - --arch x86_64 \ - --arch aarch64 \ - --platform musllinux_1_1 \ - --platform manylinux2014 \ - --output-dir dd-trace.dir/lib/ddtrace_pkgs \ - --verbose - -cp ../lib-injection/sitecustomize.py dd-trace.dir/lib/ - -chmod -R o-w dd-trace.dir/lib -chmod -R g-w dd-trace.dir/lib - -cp auto_inject-python.version dd-trace.dir/lib/version - -fpm_wrapper "datadog-apm-library-python" "$PYTHON_PACKAGE_VERSION" \ - --input-type dir \ - --url "https://github.com/DataDog/dd-trace-py" \ - --description "Datadog APM client library for python" \ - --license "BSD-3-Clause" \ - --chdir=dd-trace.dir/lib \ - --prefix "$LIBRARIES_INSTALL_BASE/python" \ - .=. diff --git a/.gitlab/build-lib-init.sh b/.gitlab/build-lib-init.sh deleted file mode 100755 index 6f47cfaaee1..00000000000 --- a/.gitlab/build-lib-init.sh +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/bash - -set -e - -# Safety checks to make sure we have required values -if [ -z "$CI_COMMIT_TAG" ]; then - echo "Error: CI_COMMIT_TAG was not provided" - exit 1 -fi - -if [ -z "$CI_COMMIT_SHA" ]; then - echo "Error: CI_COMMIT_SHA was not provided" - exit 1 -fi - -if [ -z "$IMG_DESTINATION_BASE" ]; then - echo "Error: IMG_DESTINATION_BASE. This should be set to the destination docker image, excluding the tag name, e.g. dd-lib-dotnet-init" - exit 1 -fi - -# If this is a pre-release release, we don't publish -if echo "$CI_COMMIT_TAG" | grep -q "-" > /dev/null; then - echo "Error: This is a pre-release version, should not publish images: $CI_COMMIT_TAG" - exit 1 -fi - -# Calculate the tags we use for floating major and minor versions -MAJOR_MINOR_VERSION="$(sed -nE 's/^(v[0-9]+\.[0-9]+)\.[0-9]+$/\1/p' <<< ${CI_COMMIT_TAG})" -MAJOR_VERSION="$(sed -nE 's/^(v[0-9]+)\.[0-9]+\.[0-9]+$/\1/p' <<< ${CI_COMMIT_TAG})" - -# Make sure we have all the tags -git fetch --tags - -# We need to determine whether this is is the latest tag and whether it's the latest major or not -# So we fetch all tags and sort them to find both the latest, and the latest in this major. -# 'sort' technically gets prerelease versions in the wrong order here, but we explicitly -# exclude them anyway, as they're ignored for the purposes of determining the 'latest' tags. -LATEST_TAG="$(git tag | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V -r | head -n 1)" -LATEST_MAJOR_TAG="$(git tag -l "$MAJOR_VERSION.*" | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V -r | head -n 1)" -echo "This tag: $CI_COMMIT_TAG" -echo "Latest repository tag: $LATEST_TAG" -echo "Latest repository tag for this major: $LATEST_MAJOR_TAG" -echo "---------" - -# GNU sort -C (silent) reports via exit code whether the data is already in sorted order -# We use this to check whether the current tag is greater than (or equal to) the latest tag -if printf '%s\n' "$LATEST_TAG" "$CI_COMMIT_TAG" | sort -C -V; then - # The current tag is the latest in the repository - IS_LATEST_TAG=1 -else - IS_LATEST_TAG=0 -fi - -if printf '%s\n' "$LATEST_MAJOR_TAG" "$CI_COMMIT_TAG" | sort -C -V; then - # The current tag is the latest for this major version in the repository - IS_LATEST_MAJOR_TAG=1 -else - IS_LATEST_MAJOR_TAG=0 -fi - -# print everything for debugging purposes -echo "Calculated values:" -echo "MAJOR_MINOR_VERSION=${MAJOR_MINOR_VERSION}" -echo "MAJOR_VERSION=${MAJOR_VERSION}" -echo "IS_LATEST_TAG=${IS_LATEST_TAG}" -echo "IS_LATEST_MAJOR_TAG=${IS_LATEST_MAJOR_TAG}" -echo "---------" - -# Final check that everything is ok -# We should have a major_minor version -if [ -z "$MAJOR_MINOR_VERSION" ]; then - echo "Error: Could not determine major_minor version for stable release, this should not happen" - exit 1 -fi - -# if this is a latest major tag, we should have a major version -if [ "$IS_LATEST_MAJOR_TAG" -eq 1 ] && [ -z "$MAJOR_VERSION" ]; then - echo "Error: Could not determine major version for latest major release, this should not happen" - exit 1 -fi - -# Generate the final variables, and save them into build.env so they can be read by the trigger job -set_image_tags() { - SUFFIX="$1" - VARIABLE_SUFFIX="${SUFFIX:+_$SUFFIX}" # add a '_' prefix - TAG_SUFFIX="${SUFFIX:+-$SUFFIX}" # add a '-' prefix - - # We always add this tag, regardless of the version - DESTINATIONS="${IMG_DESTINATION_BASE}:${CI_COMMIT_TAG}${TAG_SUFFIX}" - - # We always add the major_minor tag (we never release 2.5.2 _after_ 2.5.3, for example) - DESTINATIONS="${DESTINATIONS},${IMG_DESTINATION_BASE}:${MAJOR_MINOR_VERSION}${TAG_SUFFIX}" - - # Only latest-major releases get the major tag - if [ "$IS_LATEST_MAJOR_TAG" -eq 1 ]; then - DESTINATIONS="${DESTINATIONS},${IMG_DESTINATION_BASE}:${MAJOR_VERSION}${TAG_SUFFIX}" - fi - - # Only latest releases get the latest tag - if [ "$IS_LATEST_TAG" -eq 1 ]; then - DESTINATIONS="${DESTINATIONS},${IMG_DESTINATION_BASE}:latest${TAG_SUFFIX}" - fi - - # Save the value to the build.env file - echo "IMG_DESTINATIONS${VARIABLE_SUFFIX}=${DESTINATIONS}" - echo "IMG_DESTINATIONS${VARIABLE_SUFFIX}=${DESTINATIONS}" >> build.env -} - -# Calculate the non-suffixed tags -set_image_tags - -# For each suffix, calculate the tags -for ADDITIONAL_TAG_SUFFIX in ${ADDITIONAL_TAG_SUFFIXES//,/ } -do - set_image_tags "$ADDITIONAL_TAG_SUFFIX" -done \ No newline at end of file diff --git a/.gitlab/build-oci.sh b/.gitlab/build-oci.sh deleted file mode 100755 index e68568c4972..00000000000 --- a/.gitlab/build-oci.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -source common_build_functions.sh - -if [ -n "$CI_COMMIT_TAG" ] && [ -z "$PYTHON_PACKAGE_VERSION" ]; then - PYTHON_PACKAGE_VERSION=${CI_COMMIT_TAG##v} -fi - -if [ -z "$ARCH" ]; then - ARCH=amd64 -fi - - -TMP_DIR=$(mktemp --dir) -BUILD_DIR=$TMP_DIR/datadog-python-apm.build -mkdir $TMP_DIR/datadog-python-apm.build - -# Install known compatible pip as default version shipped in Ubuntu (20.0.2) -# does not work. -python3 -m pip install -U "pip>=22.0" -python3 -m pip install packaging - -WHEEL_ARCH="x86_64" -if [ "$ARCH" = "arm64" ]; then - WHEEL_ARCH="aarch64" -fi - -../lib-injection/dl_wheels.py \ - --python-version=3.12 \ - --python-version=3.11 \ - --python-version=3.10 \ - --python-version=3.9 \ - --python-version=3.8 \ - --python-version=3.7 \ - --ddtrace-version=$PYTHON_PACKAGE_VERSION \ - --arch=$WHEEL_ARCH \ - --platform=musllinux_1_1 \ - --platform=manylinux2014 \ - --output-dir=$BUILD_DIR/ddtrace_pkgs \ - --verbose -echo -n $PYTHON_PACKAGE_VERSION > auto_inject-python.version -cp ../lib-injection/sitecustomize.py $BUILD_DIR/ -cp auto_inject-python.version $BUILD_DIR/version -cp ../min_compatible_versions.csv $BUILD_DIR/ -cp ../lib-injection/telemetry-forwarder.sh $BUILD_DIR/ -chmod -R o-w $BUILD_DIR -chmod -R g-w $BUILD_DIR - -# Build packages -datadog-package create \ - --version="$PYTHON_PACKAGE_VERSION" \ - --package="datadog-apm-library-python" \ - --archive=true \ - --archive-path="datadog-apm-library-python-$PYTHON_PACKAGE_VERSION-$ARCH.tar" \ - --arch "$ARCH" \ - --os "linux" \ - $BUILD_DIR diff --git a/.gitlab/download-dependency-wheels.sh b/.gitlab/download-dependency-wheels.sh new file mode 100755 index 00000000000..431e662e4c7 --- /dev/null +++ b/.gitlab/download-dependency-wheels.sh @@ -0,0 +1,26 @@ +#!/bin/bash +set -eo pipefail + +if [ -z "$CI_COMMIT_SHA" ]; then + echo "Error: CI_COMMIT_SHA was not provided" + exit 1 +fi + +python3 -m pip install -U "pip>=22.0" +python3 -m pip install packaging + +mkdir pywheels-dep + +cd pywheels + +export PYTHONUNBUFFERED=TRUE + +../lib-injection/dl_wheels.py \ + --python-version=$PYTHON_VERSION \ + --local-ddtrace \ + --arch x86_64 \ + --arch aarch64 \ + --platform musllinux_1_1 \ + --platform manylinux2014 \ + --output-dir ../pywheels-dep \ + --verbose diff --git a/.gitlab/download-wheels-from-gh-actions.sh b/.gitlab/download-wheels-from-gh-actions.sh new file mode 100755 index 00000000000..2803558d784 --- /dev/null +++ b/.gitlab/download-wheels-from-gh-actions.sh @@ -0,0 +1,50 @@ +#!/bin/bash +set -eo pipefail + +if [ -z "$CI_COMMIT_SHA" ]; then + echo "Error: CI_COMMIT_SHA was not provided" + exit 1 +fi + +echo "Querying for RUN_ID" + +timeout=600 # 10 minutes +start_time=$(date +%s) +end_time=$((start_time + timeout)) +# Loop for 10 minutes waiting for run to appear in github +while [ $(date +%s) -lt $end_time ]; do + RUN_ID=$(gh run ls --repo DataDog/dd-trace-py --commit=$CI_COMMIT_SHA --workflow=build_deploy.yml --json databaseId --jq "first (.[]) | .databaseId") + if [ -n "$RUN_ID" ]; then + break; + fi + echo "Waiting for RUN_ID" + sleep 20 +done + +if [ -z "$RUN_ID" ]; then + echo "RUN_ID not found" + exit 1 +fi + +echo "Found RUN_ID: $RUN_ID" +echo "Waiting for workflow to finish" + +# wait for run to finish +gh run watch $RUN_ID --interval 45 --exit-status 1 --repo DataDog/dd-trace-py + +mkdir pywheels +cd pywheels + +echo "Github workflow finished. Downloading wheels" + +# download all wheels +gh run download $RUN_ID --repo DataDog/dd-trace-py + +cd .. + +echo "Finished downloading wheels. Fixing directory structure" + +# Flatten directory structure so all wheels are top level +find pywheels -type f -exec mv {} pywheels \; + +echo "Done" diff --git a/.gitlab/prepare-oci-package.sh b/.gitlab/prepare-oci-package.sh new file mode 100755 index 00000000000..5b3380bd4d9 --- /dev/null +++ b/.gitlab/prepare-oci-package.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +if [ -n "$CI_COMMIT_TAG" ] && [ -z "$PYTHON_PACKAGE_VERSION" ]; then + PYTHON_PACKAGE_VERSION=${CI_COMMIT_TAG##v} +fi + +if [ -z "$PYTHON_PACKAGE_VERSION" ]; then + # Get the version from the filename of the first wheel + # wheels have the form: + # ddtrace-2.11.0.dev41+g50bf57680-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl + # the version is everything between the first and second "-" + WHEELS_LIST=(../pywheels/*.whl) + FIRST_WHEEL=${WHEELS_LIST[1]} + + #everything before - + WITHOUT_BEGINNING=${FIRST_WHEEL#*-} + + #strip after - + PYTHON_PACKAGE_VERSION=${WITHOUT_BEGINNING%%-*} +fi + +mkdir -p sources/ddtrace_pkgs + +BUILD_DIR=sources + +echo -n "$PYTHON_PACKAGE_VERSION" > sources/version + +cp -r ../pywheels-dep/site-packages* sources/ddtrace_pkgs + +cp ../lib-injection/sitecustomize.py sources/ +cp ../min_compatible_versions.csv sources/ +cp ../lib-injection/telemetry-forwarder.sh sources/ diff --git a/.riot/requirements/1029814.txt b/.riot/requirements/1029814.txt deleted file mode 100644 index b01d6616546..00000000000 --- a/.riot/requirements/1029814.txt +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.10 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/1029814.in -# -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -exceptiongroup==1.2.0 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -importlib-metadata==6.11.0 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.22.0 -opentelemetry-instrumentation==0.37b0 -opentelemetry-instrumentation-flask==0.37b0 -opentelemetry-instrumentation-wsgi==0.37b0 -opentelemetry-semantic-conventions==0.37b0 -opentelemetry-util-http==0.37b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -tomli==2.0.1 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zipp==3.17.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/104cf8b.txt b/.riot/requirements/104cf8b.txt deleted file mode 100644 index a35d26156fc..00000000000 --- a/.riot/requirements/104cf8b.txt +++ /dev/null @@ -1,52 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/104cf8b.in -# -asgiref==3.7.2 -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -exceptiongroup==1.2.0 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -importlib-metadata==7.0.0 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.3.0 -opentelemetry-instrumentation==0.22b0 -opentelemetry-instrumentation-flask==0.22b0 -opentelemetry-instrumentation-wsgi==0.22b0 -opentelemetry-semantic-conventions==0.22b0 -opentelemetry-util-http==0.22b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -tomli==2.0.1 -typing-extensions==4.9.0 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zipp==3.17.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/1677649.txt b/.riot/requirements/1153ad9.txt similarity index 77% rename from .riot/requirements/1677649.txt rename to .riot/requirements/1153ad9.txt index e4862279695..473438a3ec3 100644 --- a/.riot/requirements/1677649.txt +++ b/.riot/requirements/1153ad9.txt @@ -2,26 +2,23 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --no-annotate .riot/requirements/1677649.in +# pip-compile --no-annotate .riot/requirements/1153ad9.in # attrs==23.2.0 certifi==2024.7.4 charset-normalizer==3.3.2 click==7.1.2 coverage[toml]==7.6.0 -deprecated==1.2.14 flask==1.1.4 gunicorn==22.0.0 httpretty==1.0.5 hypothesis==6.45.0 idna==3.7 -importlib-metadata==7.0.0 iniconfig==2.0.0 itsdangerous==1.1.0 jinja2==2.11.3 markupsafe==1.1.1 mock==5.1.0 -opentelemetry-api==1.24.0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 @@ -33,5 +30,3 @@ requests==2.32.3 sortedcontainers==2.4.0 urllib3==2.2.2 werkzeug==1.0.1 -wrapt==1.16.0 -zipp==3.19.2 diff --git a/.riot/requirements/1a14242.txt b/.riot/requirements/118cb50.txt similarity index 78% rename from .riot/requirements/1a14242.txt rename to .riot/requirements/118cb50.txt index 024e32a631f..bd740ebe1b6 100644 --- a/.riot/requirements/1a14242.txt +++ b/.riot/requirements/118cb50.txt @@ -2,27 +2,24 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --no-annotate .riot/requirements/1a14242.in +# pip-compile --no-annotate .riot/requirements/118cb50.in # attrs==23.2.0 certifi==2024.7.4 charset-normalizer==3.3.2 click==7.1.2 coverage[toml]==7.6.0 -deprecated==1.2.14 exceptiongroup==1.2.2 flask==1.1.4 gunicorn==22.0.0 httpretty==1.0.5 hypothesis==6.45.0 idna==3.7 -importlib-metadata==7.0.0 iniconfig==2.0.0 itsdangerous==1.1.0 jinja2==2.11.3 markupsafe==1.1.1 mock==5.1.0 -opentelemetry-api==1.24.0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 @@ -35,5 +32,3 @@ sortedcontainers==2.4.0 tomli==2.0.1 urllib3==2.2.2 werkzeug==1.0.1 -wrapt==1.16.0 -zipp==3.19.2 diff --git a/.riot/requirements/11f8ba6.txt b/.riot/requirements/11f8ba6.txt deleted file mode 100644 index 96c1cc863b4..00000000000 --- a/.riot/requirements/11f8ba6.txt +++ /dev/null @@ -1,48 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.10 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/11f8ba6.in -# -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -exceptiongroup==1.2.0 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.11.1 -opentelemetry-instrumentation==0.32b0 -opentelemetry-instrumentation-flask==0.32b0 -opentelemetry-instrumentation-wsgi==0.32b0 -opentelemetry-semantic-conventions==0.32b0 -opentelemetry-util-http==0.32b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -tomli==2.0.1 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/13538ad.txt b/.riot/requirements/13538ad.txt deleted file mode 100644 index 71ea27e4bb0..00000000000 --- a/.riot/requirements/13538ad.txt +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/13538ad.in -# -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -exceptiongroup==1.2.0 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -importlib-metadata==7.0.0 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.4.1 -opentelemetry-instrumentation==0.32b0 -opentelemetry-instrumentation-flask==0.32b0 -opentelemetry-instrumentation-wsgi==0.32b0 -opentelemetry-semantic-conventions==0.32b0 -opentelemetry-util-http==0.32b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -tomli==2.0.1 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zipp==3.17.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/18589ec.txt b/.riot/requirements/135aac0.txt similarity index 80% rename from .riot/requirements/18589ec.txt rename to .riot/requirements/135aac0.txt index b57924b80f4..4f1e8112b93 100644 --- a/.riot/requirements/18589ec.txt +++ b/.riot/requirements/135aac0.txt @@ -2,27 +2,25 @@ # This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --no-annotate .riot/requirements/18589ec.in +# pip-compile --no-annotate .riot/requirements/135aac0.in # attrs==23.2.0 certifi==2024.7.4 charset-normalizer==3.3.2 click==7.1.2 coverage[toml]==7.6.0 -deprecated==1.2.14 exceptiongroup==1.2.2 flask==1.1.4 gunicorn==22.0.0 httpretty==1.0.5 hypothesis==6.45.0 idna==3.7 -importlib-metadata==7.0.0 +importlib-metadata==8.2.0 iniconfig==2.0.0 itsdangerous==1.1.0 jinja2==2.11.3 markupsafe==1.1.1 mock==5.1.0 -opentelemetry-api==1.24.0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 @@ -35,5 +33,4 @@ sortedcontainers==2.4.0 tomli==2.0.1 urllib3==2.2.2 werkzeug==1.0.1 -wrapt==1.16.0 zipp==3.19.2 diff --git a/.riot/requirements/1438a95.txt b/.riot/requirements/1438a95.txt new file mode 100644 index 00000000000..fc2e26f35fb --- /dev/null +++ b/.riot/requirements/1438a95.txt @@ -0,0 +1,50 @@ +# +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/1438a95.in +# +attrs==23.2.0 +certifi==2024.7.4 +charset-normalizer==2.1.1 +click==8.1.7 +coverage[toml]==7.6.0 +deprecated==1.2.14 +exceptiongroup==1.2.2 +flask==2.1.3 +gevent==24.2.1 +greenlet==3.0.3 +hypothesis==6.45.0 +idna==3.7 +importlib-metadata==8.0.0 +iniconfig==2.0.0 +itsdangerous==2.2.0 +jinja2==3.1.4 +markupsafe==2.0.1 +mock==5.1.0 +opentelemetry-api==1.26.0 +opentelemetry-instrumentation==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 +opentelemetry-semantic-conventions==0.47b0 +opentelemetry-util-http==0.47b0 +opentracing==2.4.0 +packaging==24.1 +pluggy==1.5.0 +pytest==8.3.2 +pytest-asyncio==0.21.1 +pytest-cov==5.0.0 +pytest-mock==3.14.0 +pytest-randomly==3.15.0 +requests==2.28.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +urllib3==1.26.19 +werkzeug==2.1.2 +wrapt==1.16.0 +zipp==3.19.2 +zope-event==5.0 +zope-interface==6.4.post2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/14a0494.txt b/.riot/requirements/14a0494.txt deleted file mode 100644 index 884ba62cce9..00000000000 --- a/.riot/requirements/14a0494.txt +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/14a0494.in -# -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -exceptiongroup==1.2.0 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -importlib-metadata==7.0.0 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.15.0 -opentelemetry-instrumentation==0.37b0 -opentelemetry-instrumentation-flask==0.37b0 -opentelemetry-instrumentation-wsgi==0.37b0 -opentelemetry-semantic-conventions==0.37b0 -opentelemetry-util-http==0.37b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -tomli==2.0.1 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zipp==3.17.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/1f35619.txt b/.riot/requirements/14f0b34.txt similarity index 58% rename from .riot/requirements/1f35619.txt rename to .riot/requirements/14f0b34.txt index e48ac8ccd52..85454fec178 100644 --- a/.riot/requirements/1f35619.txt +++ b/.riot/requirements/14f0b34.txt @@ -1,35 +1,36 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --no-annotate .riot/requirements/1f35619.in +# pip-compile --no-annotate .riot/requirements/14f0b34.in # attrs==23.2.0 -certifi==2024.6.2 +certifi==2024.7.4 charset-normalizer==2.1.1 click==8.1.7 -coverage[toml]==7.5.4 +coverage[toml]==7.6.0 deprecated==1.2.14 flask==2.1.3 gevent==24.2.1 greenlet==3.0.3 hypothesis==6.45.0 idna==3.7 +importlib-metadata==8.2.0 iniconfig==2.0.0 itsdangerous==2.2.0 jinja2==3.1.4 markupsafe==2.0.1 mock==5.1.0 -opentelemetry-api==1.4.1 -opentelemetry-instrumentation==0.32b0 -opentelemetry-instrumentation-flask==0.32b0 -opentelemetry-instrumentation-wsgi==0.32b0 -opentelemetry-semantic-conventions==0.32b0 -opentelemetry-util-http==0.32b0 +opentelemetry-api==1.15.0 +opentelemetry-instrumentation==0.45b0 +opentelemetry-instrumentation-flask==0.45b0 +opentelemetry-instrumentation-wsgi==0.45b0 +opentelemetry-semantic-conventions==0.45b0 +opentelemetry-util-http==0.45b0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pytest==8.2.2 +pytest==8.3.2 pytest-asyncio==0.21.1 pytest-cov==5.0.0 pytest-mock==3.14.0 @@ -39,6 +40,7 @@ sortedcontainers==2.4.0 urllib3==1.26.19 werkzeug==2.1.2 wrapt==1.16.0 +zipp==3.19.2 zope-event==5.0 zope-interface==6.4.post2 diff --git a/.riot/requirements/12974a3.txt b/.riot/requirements/15235b0.txt similarity index 80% rename from .riot/requirements/12974a3.txt rename to .riot/requirements/15235b0.txt index db272e2f553..4654e79a4c7 100644 --- a/.riot/requirements/12974a3.txt +++ b/.riot/requirements/15235b0.txt @@ -2,27 +2,25 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --no-annotate .riot/requirements/12974a3.in +# pip-compile --no-annotate .riot/requirements/15235b0.in # attrs==23.2.0 certifi==2024.7.4 charset-normalizer==3.3.2 click==7.1.2 coverage[toml]==7.6.0 -deprecated==1.2.14 exceptiongroup==1.2.2 flask==1.1.4 gunicorn==22.0.0 httpretty==1.0.5 hypothesis==6.45.0 idna==3.7 -importlib-metadata==7.0.0 +importlib-metadata==8.2.0 iniconfig==2.0.0 itsdangerous==1.1.0 jinja2==2.11.3 markupsafe==1.1.1 mock==5.1.0 -opentelemetry-api==1.24.0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 @@ -35,5 +33,4 @@ sortedcontainers==2.4.0 tomli==2.0.1 urllib3==2.2.2 werkzeug==1.0.1 -wrapt==1.16.0 zipp==3.19.2 diff --git a/.riot/requirements/16af7e0.txt b/.riot/requirements/16af7e0.txt index 227877d7758..df479a84c64 100644 --- a/.riot/requirements/16af7e0.txt +++ b/.riot/requirements/16af7e0.txt @@ -25,7 +25,7 @@ importlib-metadata==7.1.0 iniconfig==2.0.0 jmespath==1.0.1 mock==5.1.0 -opentelemetry-api==1.25.0 +opentelemetry-api==1.26.0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 diff --git a/.riot/requirements/17515f6.txt b/.riot/requirements/17515f6.txt deleted file mode 100644 index 4f8465e27b2..00000000000 --- a/.riot/requirements/17515f6.txt +++ /dev/null @@ -1,46 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/17515f6.in -# -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.8.0 -opentelemetry-instrumentation==0.32b0 -opentelemetry-instrumentation-flask==0.32b0 -opentelemetry-instrumentation-wsgi==0.32b0 -opentelemetry-semantic-conventions==0.32b0 -opentelemetry-util-http==0.32b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/1797885.txt b/.riot/requirements/1797885.txt deleted file mode 100644 index 1c64c30cda0..00000000000 --- a/.riot/requirements/1797885.txt +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/1797885.in -# -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -exceptiongroup==1.2.0 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -importlib-metadata==7.0.0 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.11.1 -opentelemetry-instrumentation==0.32b0 -opentelemetry-instrumentation-flask==0.32b0 -opentelemetry-instrumentation-wsgi==0.32b0 -opentelemetry-semantic-conventions==0.32b0 -opentelemetry-util-http==0.32b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -tomli==2.0.1 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zipp==3.17.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/5c0475c.txt b/.riot/requirements/17a929f.txt similarity index 77% rename from .riot/requirements/5c0475c.txt rename to .riot/requirements/17a929f.txt index e57d30b0c6c..246bfe9567f 100644 --- a/.riot/requirements/5c0475c.txt +++ b/.riot/requirements/17a929f.txt @@ -2,26 +2,23 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/5c0475c.in +# pip-compile --no-annotate .riot/requirements/17a929f.in # attrs==23.2.0 certifi==2024.7.4 charset-normalizer==3.3.2 click==7.1.2 coverage[toml]==7.6.0 -deprecated==1.2.14 flask==1.1.4 gunicorn==22.0.0 httpretty==1.0.5 hypothesis==6.45.0 idna==3.7 -importlib-metadata==7.0.0 iniconfig==2.0.0 itsdangerous==1.1.0 jinja2==2.11.3 markupsafe==1.1.1 mock==5.1.0 -opentelemetry-api==1.24.0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 @@ -33,5 +30,3 @@ requests==2.32.3 sortedcontainers==2.4.0 urllib3==2.2.2 werkzeug==1.0.1 -wrapt==1.16.0 -zipp==3.19.2 diff --git a/.riot/requirements/1891232.txt b/.riot/requirements/1891232.txt deleted file mode 100644 index 4a02e84735c..00000000000 --- a/.riot/requirements/1891232.txt +++ /dev/null @@ -1,48 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.10 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/1891232.in -# -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -exceptiongroup==1.2.0 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.8.0 -opentelemetry-instrumentation==0.32b0 -opentelemetry-instrumentation-flask==0.32b0 -opentelemetry-instrumentation-wsgi==0.32b0 -opentelemetry-semantic-conventions==0.32b0 -opentelemetry-util-http==0.32b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -tomli==2.0.1 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/1634a62.txt b/.riot/requirements/196d465.txt similarity index 65% rename from .riot/requirements/1634a62.txt rename to .riot/requirements/196d465.txt index 9f829aa76d8..2bc287d7e9f 100644 --- a/.riot/requirements/1634a62.txt +++ b/.riot/requirements/196d465.txt @@ -2,35 +2,35 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/1634a62.in +# pip-compile --no-annotate .riot/requirements/196d465.in # attrs==23.2.0 -certifi==2024.6.2 +certifi==2024.7.4 charset-normalizer==2.1.1 click==8.1.7 -coverage[toml]==7.5.4 +coverage[toml]==7.6.0 deprecated==1.2.14 flask==2.1.3 gevent==24.2.1 greenlet==3.0.3 hypothesis==6.45.0 idna==3.7 -importlib-metadata==7.1.0 +importlib-metadata==8.0.0 iniconfig==2.0.0 itsdangerous==2.2.0 jinja2==3.1.4 markupsafe==2.0.1 mock==5.1.0 -opentelemetry-api==1.25.0 -opentelemetry-instrumentation==0.37b0 -opentelemetry-instrumentation-flask==0.37b0 -opentelemetry-instrumentation-wsgi==0.37b0 -opentelemetry-semantic-conventions==0.37b0 -opentelemetry-util-http==0.37b0 +opentelemetry-api==1.26.0 +opentelemetry-instrumentation==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 +opentelemetry-semantic-conventions==0.47b0 +opentelemetry-util-http==0.47b0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pytest==8.2.2 +pytest==8.3.2 pytest-asyncio==0.21.1 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/59f93d3.txt b/.riot/requirements/1aa3044.txt similarity index 88% rename from .riot/requirements/59f93d3.txt rename to .riot/requirements/1aa3044.txt index 7ae946cace8..7bf52690f10 100644 --- a/.riot/requirements/59f93d3.txt +++ b/.riot/requirements/1aa3044.txt @@ -2,14 +2,14 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/59f93d3.in +# pip-compile --no-annotate .riot/requirements/1aa3044.in # asgiref==3.8.1 attrs==23.2.0 -certifi==2024.6.2 +certifi==2024.7.4 charset-normalizer==2.1.1 click==7.1.2 -coverage[toml]==7.5.4 +coverage[toml]==7.6.0 flask==1.1.4 gevent==24.2.1 greenlet==3.0.3 @@ -28,7 +28,7 @@ opentelemetry-util-http==0.19b0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pytest==8.2.2 +pytest==8.3.2 pytest-asyncio==0.21.1 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/1aaf6f6.txt b/.riot/requirements/1aaf6f6.txt index 6ca0b672a91..5c36c6f9871 100644 --- a/.riot/requirements/1aaf6f6.txt +++ b/.riot/requirements/1aaf6f6.txt @@ -25,7 +25,7 @@ importlib-metadata==7.1.0 iniconfig==2.0.0 jmespath==1.0.1 mock==5.1.0 -opentelemetry-api==1.25.0 +opentelemetry-api==1.26.0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 diff --git a/.riot/requirements/10f03b7.txt b/.riot/requirements/1c47005.txt similarity index 66% rename from .riot/requirements/10f03b7.txt rename to .riot/requirements/1c47005.txt index a96c7c7f070..7be57bbcc0d 100644 --- a/.riot/requirements/10f03b7.txt +++ b/.riot/requirements/1c47005.txt @@ -2,20 +2,20 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --no-annotate .riot/requirements/10f03b7.in +# pip-compile --no-annotate .riot/requirements/1c47005.in # -asgiref==3.7.2 -attrs==23.1.0 -certifi==2023.11.17 +asgiref==3.8.1 +attrs==23.2.0 +certifi==2024.7.4 charset-normalizer==2.1.1 click==7.1.2 -coverage[toml]==7.3.4 -exceptiongroup==1.2.0 +coverage[toml]==7.6.0 +exceptiongroup==1.2.2 flask==1.1.4 -gevent==23.9.1 -greenlet==3.0.2 +gevent==24.2.1 +greenlet==3.0.3 hypothesis==6.45.0 -idna==3.6 +idna==3.7 iniconfig==2.0.0 itsdangerous==1.1.0 jinja2==2.11.3 @@ -27,22 +27,22 @@ opentelemetry-instrumentation-flask==0.19b0 opentelemetry-instrumentation-wsgi==0.19b0 opentelemetry-util-http==0.19b0 opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 +packaging==24.1 +pluggy==1.5.0 +pytest==8.3.2 pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 +pytest-cov==5.0.0 +pytest-mock==3.14.0 pytest-randomly==3.15.0 requests==2.28.1 sortedcontainers==2.4.0 tomli==2.0.1 -typing-extensions==4.9.0 -urllib3==1.26.18 +typing-extensions==4.12.2 +urllib3==1.26.19 werkzeug==1.0.1 wrapt==1.16.0 zope-event==5.0 -zope-interface==6.1 +zope-interface==6.4.post2 # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/.riot/requirements/1c4ed0a.txt b/.riot/requirements/1c4ed0a.txt deleted file mode 100644 index b7908eace7c..00000000000 --- a/.riot/requirements/1c4ed0a.txt +++ /dev/null @@ -1,47 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/1c4ed0a.in -# -asgiref==3.7.2 -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.3.0 -opentelemetry-instrumentation==0.22b0 -opentelemetry-instrumentation-flask==0.22b0 -opentelemetry-instrumentation-wsgi==0.22b0 -opentelemetry-semantic-conventions==0.22b0 -opentelemetry-util-http==0.22b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/1cd9272.txt b/.riot/requirements/1cd9272.txt deleted file mode 100644 index 0e9a059f236..00000000000 --- a/.riot/requirements/1cd9272.txt +++ /dev/null @@ -1,46 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/1cd9272.in -# -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.4.1 -opentelemetry-instrumentation==0.32b0 -opentelemetry-instrumentation-flask==0.32b0 -opentelemetry-instrumentation-wsgi==0.32b0 -opentelemetry-semantic-conventions==0.32b0 -opentelemetry-util-http==0.32b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/1d3d6ad.txt b/.riot/requirements/1d3d6ad.txt deleted file mode 100644 index 5d23d57475c..00000000000 --- a/.riot/requirements/1d3d6ad.txt +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/1d3d6ad.in -# -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -exceptiongroup==1.2.0 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -importlib-metadata==7.0.0 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.15.0 -opentelemetry-instrumentation==0.37b0 -opentelemetry-instrumentation-flask==0.37b0 -opentelemetry-instrumentation-wsgi==0.37b0 -opentelemetry-semantic-conventions==0.37b0 -opentelemetry-util-http==0.37b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -tomli==2.0.1 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zipp==3.17.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/4de07e7.txt b/.riot/requirements/1e1ea62.txt similarity index 66% rename from .riot/requirements/4de07e7.txt rename to .riot/requirements/1e1ea62.txt index 5263f0bd9bb..b3150829b3b 100644 --- a/.riot/requirements/4de07e7.txt +++ b/.riot/requirements/1e1ea62.txt @@ -2,34 +2,35 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/4de07e7.in +# pip-compile --no-annotate .riot/requirements/1e1ea62.in # attrs==23.2.0 -certifi==2024.6.2 +certifi==2024.7.4 charset-normalizer==2.1.1 click==8.1.7 -coverage[toml]==7.5.4 +coverage[toml]==7.6.0 deprecated==1.2.14 flask==2.1.3 gevent==24.2.1 greenlet==3.0.3 hypothesis==6.45.0 idna==3.7 +importlib-metadata==8.2.0 iniconfig==2.0.0 itsdangerous==2.2.0 jinja2==3.1.4 markupsafe==2.0.1 mock==5.1.0 opentelemetry-api==1.15.0 -opentelemetry-instrumentation==0.37b0 -opentelemetry-instrumentation-flask==0.37b0 -opentelemetry-instrumentation-wsgi==0.37b0 -opentelemetry-semantic-conventions==0.37b0 -opentelemetry-util-http==0.37b0 +opentelemetry-instrumentation==0.45b0 +opentelemetry-instrumentation-flask==0.45b0 +opentelemetry-instrumentation-wsgi==0.45b0 +opentelemetry-semantic-conventions==0.45b0 +opentelemetry-util-http==0.45b0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pytest==8.2.2 +pytest==8.3.2 pytest-asyncio==0.21.1 pytest-cov==5.0.0 pytest-mock==3.14.0 @@ -39,6 +40,7 @@ sortedcontainers==2.4.0 urllib3==1.26.19 werkzeug==2.1.2 wrapt==1.16.0 +zipp==3.19.2 zope-event==5.0 zope-interface==6.4.post2 diff --git a/.riot/requirements/50d0377.txt b/.riot/requirements/1f3d2c7.txt similarity index 80% rename from .riot/requirements/50d0377.txt rename to .riot/requirements/1f3d2c7.txt index 0c69ed31b07..5d5a92ead13 100644 --- a/.riot/requirements/50d0377.txt +++ b/.riot/requirements/1f3d2c7.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --no-annotate .riot/requirements/50d0377.in +# pip-compile --no-annotate .riot/requirements/1f3d2c7.in # aiosqlite==0.17.0 annotated-types==0.7.0 @@ -14,20 +14,17 @@ certifi==2024.7.4 charset-normalizer==3.3.2 click==8.1.7 coverage[toml]==7.6.0 -deprecated==1.2.14 envier==0.5.2 flask==3.0.3 greenlet==3.0.3 hypothesis==6.45.0 idna==3.7 -importlib-metadata==7.1.0 iniconfig==2.0.0 iso8601==1.1.0 itsdangerous==2.2.0 jinja2==3.1.4 markupsafe==2.1.5 mock==5.1.0 -opentelemetry-api==1.25.0 opentracing==2.4.0 packaging==24.1 peewee==3.17.6 @@ -38,17 +35,15 @@ pycryptodome==3.20.0 pydantic==2.8.2 pydantic-core==2.20.1 pypika-tortoise==0.1.6 -pytest==8.2.2 +pytest==8.3.2 pytest-cov==5.0.0 pytest-mock==3.14.0 pytz==2024.1 requests==2.32.3 sortedcontainers==2.4.0 sqlalchemy==2.0.31 -tortoise-orm==0.21.4 +tortoise-orm==0.21.5 typing-extensions==4.12.2 urllib3==2.2.2 werkzeug==3.0.3 -wrapt==1.16.0 xmltodict==0.13.0 -zipp==3.19.2 diff --git a/.riot/requirements/1fa807e.txt b/.riot/requirements/1fa807e.txt index f03358a5be2..ca1c67d95b6 100644 --- a/.riot/requirements/1fa807e.txt +++ b/.riot/requirements/1fa807e.txt @@ -25,7 +25,7 @@ importlib-metadata==7.1.0 iniconfig==2.0.0 jmespath==1.0.1 mock==5.1.0 -opentelemetry-api==1.25.0 +opentelemetry-api==1.26.0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 diff --git a/.riot/requirements/ea8be54.txt b/.riot/requirements/1fbf1f2.txt similarity index 69% rename from .riot/requirements/ea8be54.txt rename to .riot/requirements/1fbf1f2.txt index 3d50c1e80e9..b2acee3ce55 100644 --- a/.riot/requirements/ea8be54.txt +++ b/.riot/requirements/1fbf1f2.txt @@ -2,19 +2,19 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --no-annotate .riot/requirements/ea8be54.in +# pip-compile --no-annotate .riot/requirements/1fbf1f2.in # -asgiref==3.7.2 -attrs==23.1.0 -certifi==2023.11.17 +asgiref==3.8.1 +attrs==23.2.0 +certifi==2024.7.4 charset-normalizer==2.1.1 click==7.1.2 -coverage[toml]==7.3.4 +coverage[toml]==7.6.0 flask==1.1.4 -gevent==23.9.1 -greenlet==3.0.2 +gevent==24.2.1 +greenlet==3.0.3 hypothesis==6.45.0 -idna==3.6 +idna==3.7 iniconfig==2.0.0 itsdangerous==1.1.0 jinja2==2.11.3 @@ -26,20 +26,20 @@ opentelemetry-instrumentation-flask==0.19b0 opentelemetry-instrumentation-wsgi==0.19b0 opentelemetry-util-http==0.19b0 opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 +packaging==24.1 +pluggy==1.5.0 +pytest==8.3.2 pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 +pytest-cov==5.0.0 +pytest-mock==3.14.0 pytest-randomly==3.15.0 requests==2.28.1 sortedcontainers==2.4.0 -urllib3==1.26.18 +urllib3==1.26.19 werkzeug==1.0.1 wrapt==1.16.0 zope-event==5.0 -zope-interface==6.1 +zope-interface==6.4.post2 # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/.riot/requirements/3e7be37.txt b/.riot/requirements/3e7be37.txt deleted file mode 100644 index d4967bd3287..00000000000 --- a/.riot/requirements/3e7be37.txt +++ /dev/null @@ -1,47 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/3e7be37.in -# -asgiref==3.8.1 -attrs==23.2.0 -certifi==2024.6.2 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.5.4 -deprecated==1.2.14 -flask==2.1.3 -gevent==24.2.1 -greenlet==3.0.3 -hypothesis==6.45.0 -idna==3.7 -iniconfig==2.0.0 -itsdangerous==2.2.0 -jinja2==3.1.4 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.3.0 -opentelemetry-instrumentation==0.22b0 -opentelemetry-instrumentation-flask==0.22b0 -opentelemetry-instrumentation-wsgi==0.22b0 -opentelemetry-semantic-conventions==0.22b0 -opentelemetry-util-http==0.22b0 -opentracing==2.4.0 -packaging==24.1 -pluggy==1.5.0 -pytest==8.2.2 -pytest-asyncio==0.21.1 -pytest-cov==5.0.0 -pytest-mock==3.14.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -urllib3==1.26.19 -werkzeug==2.1.2 -wrapt==1.16.0 -zope-event==5.0 -zope-interface==6.4.post2 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/17c4377.txt b/.riot/requirements/427c22a.txt similarity index 87% rename from .riot/requirements/17c4377.txt rename to .riot/requirements/427c22a.txt index 7ad55b82d7b..bd9057bd849 100644 --- a/.riot/requirements/17c4377.txt +++ b/.riot/requirements/427c22a.txt @@ -2,14 +2,13 @@ # This file is autogenerated by pip-compile with Python 3.7 # by the following command: # -# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/17c4377.in +# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/427c22a.in # attrs==23.2.0 certifi==2024.7.4 charset-normalizer==3.3.2 click==7.1.2 coverage[toml]==7.2.7 -deprecated==1.2.14 exceptiongroup==1.2.2 flask==1.1.4 gunicorn==22.0.0 @@ -22,7 +21,6 @@ itsdangerous==1.1.0 jinja2==2.11.3 markupsafe==1.1.1 mock==5.1.0 -opentelemetry-api==1.22.0 opentracing==2.4.0 packaging==24.0 pluggy==1.2.0 @@ -36,5 +34,4 @@ tomli==2.0.1 typing-extensions==4.7.1 urllib3==2.0.7 werkzeug==1.0.1 -wrapt==1.16.0 zipp==3.15.0 diff --git a/.riot/requirements/4bacb9c.txt b/.riot/requirements/4bacb9c.txt deleted file mode 100644 index 035e0040f70..00000000000 --- a/.riot/requirements/4bacb9c.txt +++ /dev/null @@ -1,46 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/4bacb9c.in -# -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.11.1 -opentelemetry-instrumentation==0.32b0 -opentelemetry-instrumentation-flask==0.32b0 -opentelemetry-instrumentation-wsgi==0.32b0 -opentelemetry-semantic-conventions==0.32b0 -opentelemetry-util-http==0.32b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/515d65f.txt b/.riot/requirements/515d65f.txt deleted file mode 100644 index 920bbea87d7..00000000000 --- a/.riot/requirements/515d65f.txt +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/515d65f.in -# -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -exceptiongroup==1.2.0 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -importlib-metadata==7.0.0 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.4.1 -opentelemetry-instrumentation==0.32b0 -opentelemetry-instrumentation-flask==0.32b0 -opentelemetry-instrumentation-wsgi==0.32b0 -opentelemetry-semantic-conventions==0.32b0 -opentelemetry-util-http==0.32b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -tomli==2.0.1 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zipp==3.17.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/82d4fd1.txt b/.riot/requirements/5be696d.txt similarity index 62% rename from .riot/requirements/82d4fd1.txt rename to .riot/requirements/5be696d.txt index 47c77a419b7..97812099d87 100644 --- a/.riot/requirements/82d4fd1.txt +++ b/.riot/requirements/5be696d.txt @@ -2,21 +2,21 @@ # This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --no-annotate .riot/requirements/82d4fd1.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/5be696d.in # -asgiref==3.7.2 -attrs==23.1.0 -certifi==2023.11.17 +asgiref==3.8.1 +attrs==23.2.0 +certifi==2024.7.4 charset-normalizer==2.1.1 click==7.1.2 -coverage[toml]==7.3.4 -exceptiongroup==1.2.0 +coverage[toml]==7.6.0 +exceptiongroup==1.2.2 flask==1.1.4 -gevent==23.9.1 -greenlet==3.0.2 +gevent==24.2.1 +greenlet==3.0.3 hypothesis==6.45.0 -idna==3.6 -importlib-metadata==7.0.0 +idna==3.7 +importlib-metadata==8.2.0 iniconfig==2.0.0 itsdangerous==1.1.0 jinja2==2.11.3 @@ -28,23 +28,23 @@ opentelemetry-instrumentation-flask==0.19b0 opentelemetry-instrumentation-wsgi==0.19b0 opentelemetry-util-http==0.19b0 opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 +packaging==24.1 +pluggy==1.5.0 +pytest==8.3.2 pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 +pytest-cov==5.0.0 +pytest-mock==3.14.0 pytest-randomly==3.15.0 requests==2.28.1 sortedcontainers==2.4.0 tomli==2.0.1 -typing-extensions==4.9.0 -urllib3==1.26.18 +typing-extensions==4.12.2 +urllib3==1.26.19 werkzeug==1.0.1 wrapt==1.16.0 -zipp==3.17.0 +zipp==3.19.2 zope-event==5.0 -zope-interface==6.1 +zope-interface==6.4.post2 # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/.riot/requirements/5d17c94.txt b/.riot/requirements/5d17c94.txt deleted file mode 100644 index 6fe09f28361..00000000000 --- a/.riot/requirements/5d17c94.txt +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/5d17c94.in -# -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -exceptiongroup==1.2.0 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -importlib-metadata==7.0.0 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.8.0 -opentelemetry-instrumentation==0.32b0 -opentelemetry-instrumentation-flask==0.32b0 -opentelemetry-instrumentation-wsgi==0.32b0 -opentelemetry-semantic-conventions==0.32b0 -opentelemetry-util-http==0.32b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -tomli==2.0.1 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zipp==3.17.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/1a30edd.txt b/.riot/requirements/5e63315.txt similarity index 58% rename from .riot/requirements/1a30edd.txt rename to .riot/requirements/5e63315.txt index 7f4c6d1649a..ff4304b6236 100644 --- a/.riot/requirements/1a30edd.txt +++ b/.riot/requirements/5e63315.txt @@ -1,35 +1,36 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --no-annotate .riot/requirements/1a30edd.in +# pip-compile --no-annotate .riot/requirements/5e63315.in # attrs==23.2.0 -certifi==2024.6.2 +certifi==2024.7.4 charset-normalizer==2.1.1 click==8.1.7 -coverage[toml]==7.5.4 +coverage[toml]==7.6.0 deprecated==1.2.14 flask==2.1.3 gevent==24.2.1 greenlet==3.0.3 hypothesis==6.45.0 idna==3.7 +importlib-metadata==8.0.0 iniconfig==2.0.0 itsdangerous==2.2.0 jinja2==3.1.4 markupsafe==2.0.1 mock==5.1.0 -opentelemetry-api==1.11.1 -opentelemetry-instrumentation==0.32b0 -opentelemetry-instrumentation-flask==0.32b0 -opentelemetry-instrumentation-wsgi==0.32b0 -opentelemetry-semantic-conventions==0.32b0 -opentelemetry-util-http==0.32b0 +opentelemetry-api==1.26.0 +opentelemetry-instrumentation==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 +opentelemetry-semantic-conventions==0.47b0 +opentelemetry-util-http==0.47b0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pytest==8.2.2 +pytest==8.3.2 pytest-asyncio==0.21.1 pytest-cov==5.0.0 pytest-mock==3.14.0 @@ -39,6 +40,7 @@ sortedcontainers==2.4.0 urllib3==1.26.19 werkzeug==2.1.2 wrapt==1.16.0 +zipp==3.19.2 zope-event==5.0 zope-interface==6.4.post2 diff --git a/.riot/requirements/622ac33.txt b/.riot/requirements/622ac33.txt deleted file mode 100644 index eceec5dfa68..00000000000 --- a/.riot/requirements/622ac33.txt +++ /dev/null @@ -1,52 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/622ac33.in -# -asgiref==3.7.2 -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -exceptiongroup==1.2.0 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -importlib-metadata==7.0.0 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.3.0 -opentelemetry-instrumentation==0.22b0 -opentelemetry-instrumentation-flask==0.22b0 -opentelemetry-instrumentation-wsgi==0.22b0 -opentelemetry-semantic-conventions==0.22b0 -opentelemetry-util-http==0.22b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -tomli==2.0.1 -typing-extensions==4.9.0 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zipp==3.17.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/6450b7c.txt b/.riot/requirements/6450b7c.txt deleted file mode 100644 index 36d0ee905b1..00000000000 --- a/.riot/requirements/6450b7c.txt +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/6450b7c.in -# -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -exceptiongroup==1.2.0 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -importlib-metadata==7.0.0 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.11.1 -opentelemetry-instrumentation==0.32b0 -opentelemetry-instrumentation-flask==0.32b0 -opentelemetry-instrumentation-wsgi==0.32b0 -opentelemetry-semantic-conventions==0.32b0 -opentelemetry-util-http==0.32b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -tomli==2.0.1 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zipp==3.17.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/69997b1.txt b/.riot/requirements/69997b1.txt new file mode 100644 index 00000000000..8646147a375 --- /dev/null +++ b/.riot/requirements/69997b1.txt @@ -0,0 +1,50 @@ +# +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/69997b1.in +# +attrs==23.2.0 +certifi==2024.7.4 +charset-normalizer==2.1.1 +click==8.1.7 +coverage[toml]==7.6.0 +deprecated==1.2.14 +exceptiongroup==1.2.2 +flask==2.1.3 +gevent==24.2.1 +greenlet==3.0.3 +hypothesis==6.45.0 +idna==3.7 +importlib-metadata==8.2.0 +iniconfig==2.0.0 +itsdangerous==2.2.0 +jinja2==3.1.4 +markupsafe==2.0.1 +mock==5.1.0 +opentelemetry-api==1.15.0 +opentelemetry-instrumentation==0.45b0 +opentelemetry-instrumentation-flask==0.45b0 +opentelemetry-instrumentation-wsgi==0.45b0 +opentelemetry-semantic-conventions==0.45b0 +opentelemetry-util-http==0.45b0 +opentracing==2.4.0 +packaging==24.1 +pluggy==1.5.0 +pytest==8.3.2 +pytest-asyncio==0.21.1 +pytest-cov==5.0.0 +pytest-mock==3.14.0 +pytest-randomly==3.15.0 +requests==2.28.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +urllib3==1.26.19 +werkzeug==2.1.2 +wrapt==1.16.0 +zipp==3.19.2 +zope-event==5.0 +zope-interface==6.4.post2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/7c104f7.txt b/.riot/requirements/7c104f7.txt new file mode 100644 index 00000000000..00f0556139d --- /dev/null +++ b/.riot/requirements/7c104f7.txt @@ -0,0 +1,50 @@ +# +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/7c104f7.in +# +attrs==23.2.0 +certifi==2024.7.4 +charset-normalizer==2.1.1 +click==8.1.7 +coverage[toml]==7.6.0 +deprecated==1.2.14 +exceptiongroup==1.2.2 +flask==2.1.3 +gevent==24.2.1 +greenlet==3.0.3 +hypothesis==6.45.0 +idna==3.7 +importlib-metadata==8.0.0 +iniconfig==2.0.0 +itsdangerous==2.2.0 +jinja2==3.1.4 +markupsafe==2.0.1 +mock==5.1.0 +opentelemetry-api==1.26.0 +opentelemetry-instrumentation==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 +opentelemetry-semantic-conventions==0.47b0 +opentelemetry-util-http==0.47b0 +opentracing==2.4.0 +packaging==24.1 +pluggy==1.5.0 +pytest==8.3.2 +pytest-asyncio==0.21.1 +pytest-cov==5.0.0 +pytest-mock==3.14.0 +pytest-randomly==3.15.0 +requests==2.28.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +urllib3==1.26.19 +werkzeug==2.1.2 +wrapt==1.16.0 +zipp==3.19.2 +zope-event==5.0 +zope-interface==6.4.post2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/a16e5c1.txt b/.riot/requirements/85c90b4.txt similarity index 64% rename from .riot/requirements/a16e5c1.txt rename to .riot/requirements/85c90b4.txt index ac4c1da7858..d79e99702c8 100644 --- a/.riot/requirements/a16e5c1.txt +++ b/.riot/requirements/85c90b4.txt @@ -2,21 +2,21 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --no-annotate .riot/requirements/a16e5c1.in +# pip-compile --no-annotate .riot/requirements/85c90b4.in # -asgiref==3.7.2 -attrs==23.1.0 -certifi==2023.11.17 +asgiref==3.8.1 +attrs==23.2.0 +certifi==2024.7.4 charset-normalizer==2.1.1 click==7.1.2 -coverage[toml]==7.3.4 -exceptiongroup==1.2.0 +coverage[toml]==7.6.0 +exceptiongroup==1.2.2 flask==1.1.4 -gevent==23.9.1 -greenlet==3.0.2 +gevent==24.2.1 +greenlet==3.0.3 hypothesis==6.45.0 -idna==3.6 -importlib-metadata==7.0.0 +idna==3.7 +importlib-metadata==8.2.0 iniconfig==2.0.0 itsdangerous==1.1.0 jinja2==2.11.3 @@ -28,23 +28,23 @@ opentelemetry-instrumentation-flask==0.19b0 opentelemetry-instrumentation-wsgi==0.19b0 opentelemetry-util-http==0.19b0 opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 +packaging==24.1 +pluggy==1.5.0 +pytest==8.3.2 pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 +pytest-cov==5.0.0 +pytest-mock==3.14.0 pytest-randomly==3.15.0 requests==2.28.1 sortedcontainers==2.4.0 tomli==2.0.1 -typing-extensions==4.9.0 -urllib3==1.26.18 +typing-extensions==4.12.2 +urllib3==1.26.19 werkzeug==1.0.1 wrapt==1.16.0 -zipp==3.17.0 +zipp==3.19.2 zope-event==5.0 -zope-interface==6.1 +zope-interface==6.4.post2 # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/.riot/requirements/8dea090.txt b/.riot/requirements/8dea090.txt new file mode 100644 index 00000000000..7f81ab7c9d1 --- /dev/null +++ b/.riot/requirements/8dea090.txt @@ -0,0 +1,50 @@ +# +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/8dea090.in +# +attrs==23.2.0 +certifi==2024.7.4 +charset-normalizer==2.1.1 +click==8.1.7 +coverage[toml]==7.6.0 +deprecated==1.2.14 +exceptiongroup==1.2.2 +flask==2.1.3 +gevent==24.2.1 +greenlet==3.0.3 +hypothesis==6.45.0 +idna==3.7 +importlib-metadata==8.0.0 +iniconfig==2.0.0 +itsdangerous==2.2.0 +jinja2==3.1.4 +markupsafe==2.0.1 +mock==5.1.0 +opentelemetry-api==1.26.0 +opentelemetry-instrumentation==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 +opentelemetry-semantic-conventions==0.47b0 +opentelemetry-util-http==0.47b0 +opentracing==2.4.0 +packaging==24.1 +pluggy==1.5.0 +pytest==8.3.2 +pytest-asyncio==0.21.1 +pytest-cov==5.0.0 +pytest-mock==3.14.0 +pytest-randomly==3.15.0 +requests==2.28.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +urllib3==1.26.19 +werkzeug==2.1.2 +wrapt==1.16.0 +zipp==3.19.2 +zope-event==5.0 +zope-interface==6.4.post2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/9b3b6c2.txt b/.riot/requirements/9b3b6c2.txt new file mode 100644 index 00000000000..e53415f4941 --- /dev/null +++ b/.riot/requirements/9b3b6c2.txt @@ -0,0 +1,48 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/9b3b6c2.in +# +attrs==23.2.0 +certifi==2024.7.4 +charset-normalizer==2.1.1 +click==8.1.7 +coverage[toml]==7.6.0 +deprecated==1.2.14 +flask==2.1.3 +gevent==24.2.1 +greenlet==3.0.3 +hypothesis==6.45.0 +idna==3.7 +importlib-metadata==8.0.0 +iniconfig==2.0.0 +itsdangerous==2.2.0 +jinja2==3.1.4 +markupsafe==2.0.1 +mock==5.1.0 +opentelemetry-api==1.26.0 +opentelemetry-instrumentation==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 +opentelemetry-semantic-conventions==0.47b0 +opentelemetry-util-http==0.47b0 +opentracing==2.4.0 +packaging==24.1 +pluggy==1.5.0 +pytest==8.3.2 +pytest-asyncio==0.21.1 +pytest-cov==5.0.0 +pytest-mock==3.14.0 +pytest-randomly==3.15.0 +requests==2.28.1 +sortedcontainers==2.4.0 +urllib3==1.26.19 +werkzeug==2.1.2 +wrapt==1.16.0 +zipp==3.19.2 +zope-event==5.0 +zope-interface==6.4.post2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/11f3313.txt b/.riot/requirements/a0f2001.txt similarity index 64% rename from .riot/requirements/11f3313.txt rename to .riot/requirements/a0f2001.txt index 8fa550e49d9..0fc05775a5d 100644 --- a/.riot/requirements/11f3313.txt +++ b/.riot/requirements/a0f2001.txt @@ -2,34 +2,35 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/11f3313.in +# pip-compile --no-annotate .riot/requirements/a0f2001.in # attrs==23.2.0 -certifi==2024.6.2 +certifi==2024.7.4 charset-normalizer==2.1.1 click==8.1.7 -coverage[toml]==7.5.4 +coverage[toml]==7.6.0 deprecated==1.2.14 flask==2.1.3 gevent==24.2.1 greenlet==3.0.3 hypothesis==6.45.0 idna==3.7 +importlib-metadata==8.0.0 iniconfig==2.0.0 itsdangerous==2.2.0 jinja2==3.1.4 markupsafe==2.0.1 mock==5.1.0 -opentelemetry-api==1.8.0 -opentelemetry-instrumentation==0.32b0 -opentelemetry-instrumentation-flask==0.32b0 -opentelemetry-instrumentation-wsgi==0.32b0 -opentelemetry-semantic-conventions==0.32b0 -opentelemetry-util-http==0.32b0 +opentelemetry-api==1.26.0 +opentelemetry-instrumentation==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 +opentelemetry-semantic-conventions==0.47b0 +opentelemetry-util-http==0.47b0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pytest==8.2.2 +pytest==8.3.2 pytest-asyncio==0.21.1 pytest-cov==5.0.0 pytest-mock==3.14.0 @@ -39,6 +40,7 @@ sortedcontainers==2.4.0 urllib3==1.26.19 werkzeug==2.1.2 wrapt==1.16.0 +zipp==3.19.2 zope-event==5.0 zope-interface==6.4.post2 diff --git a/.riot/requirements/a367077.txt b/.riot/requirements/a367077.txt deleted file mode 100644 index d5d4e879f48..00000000000 --- a/.riot/requirements/a367077.txt +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/a367077.in -# -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -exceptiongroup==1.2.0 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -importlib-metadata==6.11.0 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.22.0 -opentelemetry-instrumentation==0.37b0 -opentelemetry-instrumentation-flask==0.37b0 -opentelemetry-instrumentation-wsgi==0.37b0 -opentelemetry-semantic-conventions==0.37b0 -opentelemetry-util-http==0.37b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -tomli==2.0.1 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zipp==3.17.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/a3e6122.txt b/.riot/requirements/a3e6122.txt deleted file mode 100644 index dd5a350117c..00000000000 --- a/.riot/requirements/a3e6122.txt +++ /dev/null @@ -1,48 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.10 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/a3e6122.in -# -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -exceptiongroup==1.2.0 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.15.0 -opentelemetry-instrumentation==0.37b0 -opentelemetry-instrumentation-flask==0.37b0 -opentelemetry-instrumentation-wsgi==0.37b0 -opentelemetry-semantic-conventions==0.37b0 -opentelemetry-util-http==0.37b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -tomli==2.0.1 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/a4a20ae.txt b/.riot/requirements/a4a20ae.txt deleted file mode 100644 index 98806721794..00000000000 --- a/.riot/requirements/a4a20ae.txt +++ /dev/null @@ -1,46 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/a4a20ae.in -# -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.15.0 -opentelemetry-instrumentation==0.37b0 -opentelemetry-instrumentation-flask==0.37b0 -opentelemetry-instrumentation-wsgi==0.37b0 -opentelemetry-semantic-conventions==0.37b0 -opentelemetry-util-http==0.37b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/a8351f1.txt b/.riot/requirements/a8351f1.txt new file mode 100644 index 00000000000..6cfbaf73268 --- /dev/null +++ b/.riot/requirements/a8351f1.txt @@ -0,0 +1,50 @@ +# +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: +# +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/a8351f1.in +# +attrs==23.2.0 +certifi==2024.7.4 +charset-normalizer==2.1.1 +click==8.1.7 +coverage[toml]==7.6.0 +deprecated==1.2.14 +exceptiongroup==1.2.2 +flask==2.1.3 +gevent==24.2.1 +greenlet==3.0.3 +hypothesis==6.45.0 +idna==3.7 +importlib-metadata==8.0.0 +iniconfig==2.0.0 +itsdangerous==2.2.0 +jinja2==3.1.4 +markupsafe==2.0.1 +mock==5.1.0 +opentelemetry-api==1.26.0 +opentelemetry-instrumentation==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 +opentelemetry-semantic-conventions==0.47b0 +opentelemetry-util-http==0.47b0 +opentracing==2.4.0 +packaging==24.1 +pluggy==1.5.0 +pytest==8.3.2 +pytest-asyncio==0.21.1 +pytest-cov==5.0.0 +pytest-mock==3.14.0 +pytest-randomly==3.15.0 +requests==2.28.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +urllib3==1.26.19 +werkzeug==2.1.2 +wrapt==1.16.0 +zipp==3.19.2 +zope-event==5.0 +zope-interface==6.4.post2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/aab3556.txt b/.riot/requirements/aab3556.txt deleted file mode 100644 index 3024feb1468..00000000000 --- a/.riot/requirements/aab3556.txt +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/aab3556.in -# -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -exceptiongroup==1.2.0 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -importlib-metadata==7.0.0 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.8.0 -opentelemetry-instrumentation==0.32b0 -opentelemetry-instrumentation-flask==0.32b0 -opentelemetry-instrumentation-wsgi==0.32b0 -opentelemetry-semantic-conventions==0.32b0 -opentelemetry-util-http==0.32b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -tomli==2.0.1 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zipp==3.17.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/b1fd8ec.txt b/.riot/requirements/b1fd8ec.txt new file mode 100644 index 00000000000..cd02446f7bf --- /dev/null +++ b/.riot/requirements/b1fd8ec.txt @@ -0,0 +1,50 @@ +# +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: +# +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/b1fd8ec.in +# +attrs==23.2.0 +certifi==2024.7.4 +charset-normalizer==2.1.1 +click==8.1.7 +coverage[toml]==7.6.0 +deprecated==1.2.14 +exceptiongroup==1.2.2 +flask==2.1.3 +gevent==24.2.1 +greenlet==3.0.3 +hypothesis==6.45.0 +idna==3.7 +importlib-metadata==8.0.0 +iniconfig==2.0.0 +itsdangerous==2.2.0 +jinja2==3.1.4 +markupsafe==2.0.1 +mock==5.1.0 +opentelemetry-api==1.26.0 +opentelemetry-instrumentation==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 +opentelemetry-semantic-conventions==0.47b0 +opentelemetry-util-http==0.47b0 +opentracing==2.4.0 +packaging==24.1 +pluggy==1.5.0 +pytest==8.3.2 +pytest-asyncio==0.21.1 +pytest-cov==5.0.0 +pytest-mock==3.14.0 +pytest-randomly==3.15.0 +requests==2.28.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +urllib3==1.26.19 +werkzeug==2.1.2 +wrapt==1.16.0 +zipp==3.19.2 +zope-event==5.0 +zope-interface==6.4.post2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/c3e8b1a.txt b/.riot/requirements/c3e8b1a.txt new file mode 100644 index 00000000000..30d764cdbc5 --- /dev/null +++ b/.riot/requirements/c3e8b1a.txt @@ -0,0 +1,50 @@ +# +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/c3e8b1a.in +# +attrs==23.2.0 +certifi==2024.7.4 +charset-normalizer==2.1.1 +click==8.1.7 +coverage[toml]==7.6.0 +deprecated==1.2.14 +exceptiongroup==1.2.2 +flask==2.1.3 +gevent==24.2.1 +greenlet==3.0.3 +hypothesis==6.45.0 +idna==3.7 +importlib-metadata==8.0.0 +iniconfig==2.0.0 +itsdangerous==2.2.0 +jinja2==3.1.4 +markupsafe==2.0.1 +mock==5.1.0 +opentelemetry-api==1.26.0 +opentelemetry-instrumentation==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 +opentelemetry-semantic-conventions==0.47b0 +opentelemetry-util-http==0.47b0 +opentracing==2.4.0 +packaging==24.1 +pluggy==1.5.0 +pytest==8.3.2 +pytest-asyncio==0.21.1 +pytest-cov==5.0.0 +pytest-mock==3.14.0 +pytest-randomly==3.15.0 +requests==2.28.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +urllib3==1.26.19 +werkzeug==2.1.2 +wrapt==1.16.0 +zipp==3.19.2 +zope-event==5.0 +zope-interface==6.4.post2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/ca367e6.txt b/.riot/requirements/ca367e6.txt deleted file mode 100644 index fd85968e6e5..00000000000 --- a/.riot/requirements/ca367e6.txt +++ /dev/null @@ -1,48 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/ca367e6.in -# -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -importlib-metadata==6.11.0 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.22.0 -opentelemetry-instrumentation==0.37b0 -opentelemetry-instrumentation-flask==0.37b0 -opentelemetry-instrumentation-wsgi==0.37b0 -opentelemetry-semantic-conventions==0.37b0 -opentelemetry-util-http==0.37b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zipp==3.17.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/18dee11.txt b/.riot/requirements/d825572.txt similarity index 82% rename from .riot/requirements/18dee11.txt rename to .riot/requirements/d825572.txt index f3b7a09f9db..7ce81023285 100644 --- a/.riot/requirements/18dee11.txt +++ b/.riot/requirements/d825572.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --no-annotate .riot/requirements/18dee11.in +# pip-compile --no-annotate .riot/requirements/d825572.in # aiosqlite==0.17.0 annotated-types==0.7.0 @@ -14,20 +14,17 @@ certifi==2024.7.4 charset-normalizer==3.3.2 click==8.1.7 coverage[toml]==7.6.0 -deprecated==1.2.14 envier==0.5.2 flask==3.0.3 greenlet==3.0.3 hypothesis==6.45.0 idna==3.7 -importlib-metadata==7.1.0 iniconfig==2.0.0 iso8601==1.1.0 itsdangerous==2.2.0 jinja2==3.1.4 markupsafe==2.1.5 mock==5.1.0 -opentelemetry-api==1.25.0 opentracing==2.4.0 packaging==24.1 peewee==3.17.6 @@ -38,7 +35,7 @@ pycryptodome==3.20.0 pydantic==2.8.2 pydantic-core==2.20.1 pypika-tortoise==0.1.6 -pytest==8.2.2 +pytest==8.3.2 pytest-cov==5.0.0 pytest-mock==3.14.0 pytz==2024.1 @@ -49,6 +46,4 @@ tortoise-orm==0.21.5 typing-extensions==4.12.2 urllib3==2.2.2 werkzeug==3.0.3 -wrapt==1.16.0 xmltodict==0.13.0 -zipp==3.19.2 diff --git a/.riot/requirements/dd525d9.txt b/.riot/requirements/dd525d9.txt index 78df74609f9..03c376f19df 100644 --- a/.riot/requirements/dd525d9.txt +++ b/.riot/requirements/dd525d9.txt @@ -25,7 +25,7 @@ importlib-metadata==7.1.0 iniconfig==2.0.0 jmespath==1.0.1 mock==5.1.0 -opentelemetry-api==1.25.0 +opentelemetry-api==1.26.0 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 diff --git a/.riot/requirements/ddd1e3f.txt b/.riot/requirements/ddd1e3f.txt deleted file mode 100644 index 8d3cf956a2d..00000000000 --- a/.riot/requirements/ddd1e3f.txt +++ /dev/null @@ -1,48 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.10 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/ddd1e3f.in -# -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -exceptiongroup==1.2.0 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.4.1 -opentelemetry-instrumentation==0.32b0 -opentelemetry-instrumentation-flask==0.32b0 -opentelemetry-instrumentation-wsgi==0.32b0 -opentelemetry-semantic-conventions==0.32b0 -opentelemetry-util-http==0.32b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -tomli==2.0.1 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/e20bbeb.txt b/.riot/requirements/e20bbeb.txt new file mode 100644 index 00000000000..6d36ac10b16 --- /dev/null +++ b/.riot/requirements/e20bbeb.txt @@ -0,0 +1,50 @@ +# +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: +# +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/e20bbeb.in +# +attrs==23.2.0 +certifi==2024.7.4 +charset-normalizer==2.1.1 +click==8.1.7 +coverage[toml]==7.6.0 +deprecated==1.2.14 +exceptiongroup==1.2.2 +flask==2.1.3 +gevent==24.2.1 +greenlet==3.0.3 +hypothesis==6.45.0 +idna==3.7 +importlib-metadata==8.2.0 +iniconfig==2.0.0 +itsdangerous==2.2.0 +jinja2==3.1.4 +markupsafe==2.0.1 +mock==5.1.0 +opentelemetry-api==1.15.0 +opentelemetry-instrumentation==0.45b0 +opentelemetry-instrumentation-flask==0.45b0 +opentelemetry-instrumentation-wsgi==0.45b0 +opentelemetry-semantic-conventions==0.45b0 +opentelemetry-util-http==0.45b0 +opentracing==2.4.0 +packaging==24.1 +pluggy==1.5.0 +pytest==8.3.2 +pytest-asyncio==0.21.1 +pytest-cov==5.0.0 +pytest-mock==3.14.0 +pytest-randomly==3.15.0 +requests==2.28.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +urllib3==1.26.19 +werkzeug==2.1.2 +wrapt==1.16.0 +zipp==3.19.2 +zope-event==5.0 +zope-interface==6.4.post2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/efe1fdc.txt b/.riot/requirements/efe1fdc.txt deleted file mode 100644 index 2951697c135..00000000000 --- a/.riot/requirements/efe1fdc.txt +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/efe1fdc.in -# -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -exceptiongroup==1.2.0 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -importlib-metadata==6.11.0 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.22.0 -opentelemetry-instrumentation==0.37b0 -opentelemetry-instrumentation-flask==0.37b0 -opentelemetry-instrumentation-wsgi==0.37b0 -opentelemetry-semantic-conventions==0.37b0 -opentelemetry-util-http==0.37b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -tomli==2.0.1 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zipp==3.17.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/.riot/requirements/f19daa4.txt b/.riot/requirements/f19daa4.txt new file mode 100644 index 00000000000..c7c1207667f --- /dev/null +++ b/.riot/requirements/f19daa4.txt @@ -0,0 +1,50 @@ +# +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: +# +# pip-compile --no-annotate .riot/requirements/f19daa4.in +# +attrs==23.2.0 +certifi==2024.7.4 +charset-normalizer==2.1.1 +click==8.1.7 +coverage[toml]==7.6.0 +deprecated==1.2.14 +exceptiongroup==1.2.2 +flask==2.1.3 +gevent==24.2.1 +greenlet==3.0.3 +hypothesis==6.45.0 +idna==3.7 +importlib-metadata==8.2.0 +iniconfig==2.0.0 +itsdangerous==2.2.0 +jinja2==3.1.4 +markupsafe==2.0.1 +mock==5.1.0 +opentelemetry-api==1.15.0 +opentelemetry-instrumentation==0.45b0 +opentelemetry-instrumentation-flask==0.45b0 +opentelemetry-instrumentation-wsgi==0.45b0 +opentelemetry-semantic-conventions==0.45b0 +opentelemetry-util-http==0.45b0 +opentracing==2.4.0 +packaging==24.1 +pluggy==1.5.0 +pytest==8.3.2 +pytest-asyncio==0.21.1 +pytest-cov==5.0.0 +pytest-mock==3.14.0 +pytest-randomly==3.15.0 +requests==2.28.1 +sortedcontainers==2.4.0 +tomli==2.0.1 +urllib3==1.26.19 +werkzeug==2.1.2 +wrapt==1.16.0 +zipp==3.19.2 +zope-event==5.0 +zope-interface==6.4.post2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/.riot/requirements/fd63264.txt b/.riot/requirements/fd63264.txt deleted file mode 100644 index 1c8e776bf4b..00000000000 --- a/.riot/requirements/fd63264.txt +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.10 -# by the following command: -# -# pip-compile --no-annotate .riot/requirements/fd63264.in -# -asgiref==3.7.2 -attrs==23.1.0 -certifi==2023.11.17 -charset-normalizer==2.1.1 -click==8.1.7 -coverage[toml]==7.3.4 -deprecated==1.2.14 -exceptiongroup==1.2.0 -flask==2.1.3 -gevent==23.9.1 -greenlet==3.0.2 -hypothesis==6.45.0 -idna==3.6 -iniconfig==2.0.0 -itsdangerous==2.1.2 -jinja2==3.1.2 -markupsafe==2.0.1 -mock==5.1.0 -opentelemetry-api==1.3.0 -opentelemetry-instrumentation==0.22b0 -opentelemetry-instrumentation-flask==0.22b0 -opentelemetry-instrumentation-wsgi==0.22b0 -opentelemetry-semantic-conventions==0.22b0 -opentelemetry-util-http==0.22b0 -opentracing==2.4.0 -packaging==23.2 -pluggy==1.3.0 -pytest==7.4.3 -pytest-asyncio==0.21.1 -pytest-cov==4.1.0 -pytest-mock==3.12.0 -pytest-randomly==3.15.0 -requests==2.28.1 -sortedcontainers==2.4.0 -tomli==2.0.1 -typing-extensions==4.9.0 -urllib3==1.26.18 -werkzeug==2.1.2 -wrapt==1.16.0 -zope-event==5.0 -zope-interface==6.1 - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/ddtrace/opentelemetry/_context.py b/ddtrace/internal/opentelemetry/context.py similarity index 76% rename from ddtrace/opentelemetry/_context.py rename to ddtrace/internal/opentelemetry/context.py index 24c3d311cb7..0969878a397 100644 --- a/ddtrace/opentelemetry/_context.py +++ b/ddtrace/internal/opentelemetry/context.py @@ -1,22 +1,8 @@ -""" -Implementation details of parenting open telemetry spans should be kept internal. This will give us the flexibility -to support new features (ex: baggage) and refactor this module with out introducing a breaking change. -""" -from opentelemetry.context.context import Context as OtelContext -from opentelemetry.trace import NonRecordingSpan as OtelNonRecordingSpan -from opentelemetry.trace import Span as OtelSpan -from opentelemetry.trace import SpanContext as OtelSpanContext -from opentelemetry.trace import get_current_span -from opentelemetry.trace import set_span_in_context -from opentelemetry.trace.span import TraceFlags -from opentelemetry.trace.span import TraceState - from ddtrace import tracer as ddtracer from ddtrace._trace.context import Context as DDContext from ddtrace._trace.provider import BaseContextProvider as DDBaseContextProvider # noqa:F401 from ddtrace._trace.span import Span as DDSpan from ddtrace.internal.logger import get_logger -from ddtrace.opentelemetry._span import Span from ddtrace.propagation.http import _TraceContext @@ -24,12 +10,22 @@ class DDRuntimeContext: + """ + Responsible for converting between OpenTelemetry and Datadog spans. This class is loaded by entrypoint + when `opentelemetry.context` is imported. + """ + def attach(self, otel_context): - # type: (OtelContext) -> object """ Converts an OpenTelemetry Span to a Datadog Span/Context then stores the Datadog representation in the Global DDtrace Trace Context Provider. """ + # Inline opentelemetry imports to avoid circular imports. + from opentelemetry.trace import Span as OtelSpan + from opentelemetry.trace import get_current_span + + from ddtrace.opentelemetry._span import Span + otel_span = get_current_span(otel_context) if otel_span: if isinstance(otel_span, Span): @@ -51,11 +47,20 @@ def attach(self, otel_context): return object() def get_current(self): - # type: (...) -> OtelContext """ Converts the active datadog span to an Opentelemetry Span and then stores it in a format that can be parsed by the OpenTelemetry API. """ + # Inline opentelemetry imports to avoid circular imports. + from opentelemetry.context.context import Context as OtelContext + from opentelemetry.trace import NonRecordingSpan as OtelNonRecordingSpan + from opentelemetry.trace import SpanContext as OtelSpanContext + from opentelemetry.trace import set_span_in_context + from opentelemetry.trace.span import TraceFlags + from opentelemetry.trace.span import TraceState + + from ddtrace.opentelemetry._span import Span + ddactive = self._ddcontext_provider.active() context = OtelContext() if isinstance(ddactive, DDSpan): @@ -70,7 +75,6 @@ def get_current(self): return context def detach(self, token): - # type: (object) -> None """ NOP, The otel api uses this method to deactivate spans but this operation is not supported by the datadog context provider. @@ -79,7 +83,6 @@ def detach(self, token): @property def _ddcontext_provider(self): - # type: () -> DDBaseContextProvider """ Get the ddtrace context provider from the global Datadog tracer. This can reterive a default, gevent, or asyncio context provider. diff --git a/ddtrace/opentelemetry/_trace.py b/ddtrace/opentelemetry/_trace.py index 1ede1cc7ccb..1f15a6dff26 100644 --- a/ddtrace/opentelemetry/_trace.py +++ b/ddtrace/opentelemetry/_trace.py @@ -1,6 +1,7 @@ from contextlib import contextmanager from typing import TYPE_CHECKING +from opentelemetry import version from opentelemetry.context import Context as OtelContext # noqa:F401 from opentelemetry.trace import SpanKind as OtelSpanKind from opentelemetry.trace import Tracer as OtelTracer @@ -18,6 +19,7 @@ if TYPE_CHECKING: + from typing import Dict # noqa:F401 from typing import Iterator # noqa:F401 from typing import Mapping # noqa:F401 from typing import Optional # noqa:F401 @@ -34,6 +36,9 @@ log = get_logger(__name__) +OTEL_VERSION = tuple(int(x) for x in version.__version__.split(".")[:3]) + + class TracerProvider(OtelTracerProvider): """ Entry point of the OpenTelemetry API and provides access to OpenTelemetry compatible Tracers. @@ -44,15 +49,32 @@ def __init__(self) -> None: self._ddtracer = ddtrace.tracer super().__init__() - def get_tracer( - self, - instrumenting_module_name, - instrumenting_library_version=None, - schema_url=None, - ): - # type: (str, Optional[str], Optional[str]) -> OtelTracer - """Returns an opentelemetry compatible Tracer.""" - return Tracer(self._ddtracer) + if OTEL_VERSION >= (1, 26): + # OpenTelemetry 1.26+ has a new get_tracer signature + # https://github.com/open-telemetry/opentelemetry-python/commit/d4e13bdf95190314b0d21a9357f850fa2e6a4cd3 + # The new signature includes an `attributes` parameter which is used by opentelemetry internals. + def get_tracer( + self, + instrumenting_module_name, + instrumenting_library_version=None, + schema_url=None, + attributes=None, + ): + # type: (str, Optional[str], Optional[str], Optional[Dict]) -> OtelTracer + """Returns an opentelemetry compatible Tracer.""" + return Tracer(self._ddtracer) + + else: + + def get_tracer( # type: ignore[misc] + self, + instrumenting_module_name, + instrumenting_library_version=None, + schema_url=None, + ): + # type: (str, Optional[str], Optional[str]) -> OtelTracer + """Returns an opentelemetry compatible Tracer.""" + return Tracer(self._ddtracer) class Tracer(OtelTracer): diff --git a/lib-injection/Dockerfile b/lib-injection/Dockerfile deleted file mode 100644 index 3d183aa8690..00000000000 --- a/lib-injection/Dockerfile +++ /dev/null @@ -1,41 +0,0 @@ -# This image provides the files needed to install the ddtrace Python package -# and auto instrument Python applications in containerized environments. -FROM python:3.10 -WORKDIR /build -ARG DDTRACE_PYTHON_VERSION -RUN python3 -m pip install -U pip==23.0.1 -RUN python3 -m pip install packaging==23.0 -RUN mkdir -p pkgs -ADD ./dl_wheels.py . -# Note that we only get Python >= 3.7. This is to keep the size of the image -# as small as possible. -RUN python3 dl_wheels.py \ - --python-version=3.12 \ - --python-version=3.11 \ - --python-version=3.10 \ - --python-version=3.9 \ - --python-version=3.8 \ - --python-version=3.7 \ - --ddtrace-version=${DDTRACE_PYTHON_VERSION} \ - --arch x86_64 \ - --arch aarch64 \ - --platform musllinux_1_1 \ - --platform manylinux2014 \ - --output-dir /build/pkgs \ - --verbose - -FROM alpine:3.20 -COPY --from=0 /build/pkgs /datadog-init/ddtrace_pkgs -ARG UID=10000 -RUN addgroup -g 10000 -S datadog && \ - adduser -u ${UID} -S datadog -G datadog -RUN chown -R datadog:datadog /datadog-init/ddtrace_pkgs -RUN chmod -R 755 /datadog-init/ddtrace_pkgs -ADD telemetry-forwarder.sh /datadog-init/telemetry-forwarder.sh -RUN chown -R datadog:datadog /datadog-init/telemetry-forwarder.sh -RUN chmod +x /datadog-init/telemetry-forwarder.sh -USER ${UID} -WORKDIR /datadog-init -ADD min_compatible_versions.csv /datadog-init/min_compatible_versions.csv -ADD sitecustomize.py /datadog-init/sitecustomize.py -ADD copy-lib.sh /datadog-init/copy-lib.sh diff --git a/lib-injection/copy-lib.sh b/lib-injection/copy-lib.sh deleted file mode 100755 index 83a7851274a..00000000000 --- a/lib-injection/copy-lib.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# This script is used by the admission controller to install the library from the -# init container into the application container. -cp sitecustomize.py "$1/sitecustomize.py" -cp min_compatible_versions.csv "$1/min_compatible_versions.csv" -cp telemetry-forwarder.sh "$1/telemetry-forwarder.sh" -cp -r ddtrace_pkgs "$1/ddtrace_pkgs" diff --git a/lib-injection/dl_wheels.py b/lib-injection/dl_wheels.py index 22d7fa8f702..e10d8e53e0e 100755 --- a/lib-injection/dl_wheels.py +++ b/lib-injection/dl_wheels.py @@ -37,7 +37,7 @@ if pip_version < MIN_PIP_VERSION: print( "WARNING: using known incompatible version, %r, of pip. The minimum compatible pip version is %r" - % (pip_version, MIN_PIP_VERSION) + % (pip_version, MIN_PIP_VERSION), ) # Supported Python versions lists all python versions that can install at least one version of the ddtrace library. @@ -64,7 +64,8 @@ action="append", required=True, ) -parser.add_argument("--ddtrace-version", type=str, required=True) +parser.add_argument("--ddtrace-version", type=str) +parser.add_argument("--local-ddtrace", action="store_true") parser.add_argument("--output-dir", type=str, required=True) parser.add_argument("--dry-run", action="store_true") parser.add_argument("--verbose", action="store_true") @@ -82,6 +83,22 @@ if python_version in ["2.7", "3.5", "3.6", "3.7"]: abi += "m" + if args.ddtrace_version: + ddtrace_specifier = "ddtrace==%s" % args.ddtrace_version + elif args.local_ddtrace: + wheel_files = [ + f for f in os.listdir(".") if f.endswith(".whl") and abi in f and platform in f and arch in f + ] + + if len(wheel_files) > 1: + print("More than one matching file found %s" % wheel_files) + sys.exit(1) + + ddtrace_specifier = wheel_files[0] + else: + print("--ddtrace-version or --local-ddtrace must be specified") + sys.exit(1) + # See the docs for an explanation of all the options used: # https://pip.pypa.io/en/stable/cli/pip_download/ # only-binary=:all: is specified to ensure we get all the dependencies of ddtrace as well. @@ -90,7 +107,7 @@ "-m", "pip", "download", - "ddtrace==%s" % args.ddtrace_version, + ddtrace_specifier, "--platform", "%s_%s" % (platform, arch), "--python-version", @@ -98,6 +115,8 @@ "--abi", abi, "--only-binary=:all:", + "--exists-action", + "i", # ignore redownloads of same wheel "--dest", dl_dir, ] diff --git a/pyproject.toml b/pyproject.toml index 85a5cd48e56..60a9d1f5b6a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,7 +49,7 @@ openai = [ ddtrace-run = "ddtrace.commands.ddtrace_run:main" [project.entry-points.opentelemetry_context] -ddcontextvars_context = "ddtrace.opentelemetry._context:DDRuntimeContext" +ddcontextvars_context = "ddtrace.internal.opentelemetry.context:DDRuntimeContext" [project.entry-points.pytest11] ddtrace = "ddtrace.contrib.pytest.plugin" diff --git a/releasenotes/notes/fix-otel-circular-imports-66f6c926d8626751.yaml b/releasenotes/notes/fix-otel-circular-imports-66f6c926d8626751.yaml new file mode 100644 index 00000000000..ba0d367b511 --- /dev/null +++ b/releasenotes/notes/fix-otel-circular-imports-66f6c926d8626751.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + opentelemetry: Resolves circular imports raised by the OpenTelemetry API when the ``ddcontextvars_context`` entrypoint is loaded. + This resolves an incompatibility introduced in ``opentelemetry-api==1.25.0``. diff --git a/releasenotes/notes/fix-otel-get-tracer-args-0195cb8c1f7614ac.yaml b/releasenotes/notes/fix-otel-get-tracer-args-0195cb8c1f7614ac.yaml new file mode 100644 index 00000000000..0c9c48d1f75 --- /dev/null +++ b/releasenotes/notes/fix-otel-get-tracer-args-0195cb8c1f7614ac.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + opentelemetry: Resolves an issue where the ``get_tracer`` function would raise a ``TypeError`` when called with the ``attribute`` argument. + This resolves an incompatibility introduced in ``opentelemetry-api==1.26.0``. diff --git a/riotfile.py b/riotfile.py index 01ceafb91ff..3001cbc83e8 100644 --- a/riotfile.py +++ b/riotfile.py @@ -207,7 +207,6 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): "protobuf": ">=3", "typing_extensions": latest, "xmltodict": ">=0.12", - "opentelemetry-api": ">=1", "opentracing": ">=2.0.0", "bytecode": latest, }, @@ -330,8 +329,6 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): "flask": "<=2.2.3", "httpretty": "<1.1", "werkzeug": "<2.0", - # FIXME: ddtrace does not support the latest versions of opentelemetry-api - "opentelemetry-api": "<1.25.0", "pytest-randomly": latest, "markupsafe": "<2.0", }, @@ -2351,14 +2348,13 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): Venv( name="opentelemetry", command="pytest {cmdargs} tests/opentelemetry", - # FIXME: this test suite breaks on 3.7 pys=select_pys(min_version="3.8"), pkgs={ "pytest-randomly": latest, "pytest-asyncio": "==0.21.1", - "opentelemetry-api": ["~=1.0.0", "~=1.3.0", "~=1.4.0", "~=1.8.0", "~=1.11.0", "~=1.15.0", latest], - "opentelemetry-instrumentation-flask": "<=0.37b0", - # opentelemetry-instrumentation-flask does not support the latest version of markupsafe + # Ensure we test against version of opentelemetry-api that broke compatibility with ddtrace + "opentelemetry-api": ["~=1.0.0", "~=1.15.0", "~=1.26.0", latest], + "opentelemetry-instrumentation-flask": latest, "markupsafe": "==2.0.1", "flask": latest, "gevent": latest, diff --git a/tests/.suitespec.json b/tests/.suitespec.json index c22772ce599..9c19fa325fc 100644 --- a/tests/.suitespec.json +++ b/tests/.suitespec.json @@ -260,7 +260,8 @@ "ddtrace/contrib/sqlalchemy/*" ], "opentelemetry": [ - "ddtrace/opentelemetry/*" + "ddtrace/opentelemetry/*", + "ddtrace/internal/opentelemetry/*" ], "profiling": [ "ddtrace/profiling/*", diff --git a/tests/opentelemetry/conftest.py b/tests/opentelemetry/conftest.py index 4f9c3ddbbaf..de20f8316a3 100644 --- a/tests/opentelemetry/conftest.py +++ b/tests/opentelemetry/conftest.py @@ -15,7 +15,7 @@ def set_otel_python_context(): # OTEL_PYTHON_CONTEXT overrides the default contextvar used to parent otel spans. Setting this envar to # ``ddcontextvars_context`` allows us correlate otel and ddtrace spans by load the following - # ddtrace entry point: `ddcontextvars_context = ddtrace.opentelemetry._context:DDRuntimeContext` + # ddtrace entry point: `ddcontextvars_context = ddtrace.internal.opentelemetry.context:DDRuntimeContext` os.environ["OTEL_PYTHON_CONTEXT"] = "ddcontextvars_context"