Merge branch '3.3' into backport-12833-to-3.3

Author: taegyunkim

.gitlab/benchmarks/serverless.yml

@@ -7,6 +7,8 @@ benchmark-serverless:
     project: DataDog/serverless-tools
     strategy: depend
   needs: []
+  # TODO: Revert this once the build issue has been resolved
+  allow_failure: true
   variables:
     UPSTREAM_PIPELINE_ID: $CI_PIPELINE_ID
     UPSTREAM_PROJECT_URL: $CI_PROJECT_URL

pyproject.toml

@@ -77,7 +77,7 @@ Homepage = "https://github.com/DataDog/dd-trace-py"
 "Source Code" = "https://github.com/DataDog/dd-trace-py/"
 
 [tool.setuptools_scm]
-version_scheme = "release-branch-semver"  # Must be "release-branch-semver" for now in main, see https://github.com/DataDog/dd-trace-py/issues/8801
+version_scheme = "guess-next-dev"  # Must be "release-branch-semver" for now in main, see https://github.com/DataDog/dd-trace-py/issues/8801
 write_to = "ddtrace/_version.py"
 
 [tool.cython-lint]