Compare commits

...

12 Commits
main ... stable

Author SHA1 Message Date
OpenTelemetry Bot 54e684aa69
[release/v1.28.x-0.49bx] Prepare release 1.28.2/0.49b2 (#3017)
* Prepare release 1.28.2/0.49b2

* Update CORE_REPO_SHA to point to core release branch

---------

Co-authored-by: Aaron Abbott <aaronabbott@google.com>
2024-11-18 13:25:25 -05:00
Aaron Abbott 13f57585b1
Fix eachdist.py patch release to respect "all" and "excluded" (#3016) 2024-11-18 12:03:53 -05:00
Aaron Abbott 29d61aa19a
Fix prepare patch release workflow (#3013) 2024-11-15 16:03:44 -05:00
Aaron Abbott d2e860c56c
[release/v1.28.x-0.49bx] Add openai instrumentation to opentelemetry-bootstrap (#2996) (#3010)
* Add openai instrumentation to opentelemetry-bootstrap (#2996)

* Move changelog entry to Unreleased section

* Run `tox -e generate` to fix bootstrap_gen.py

---------

Co-authored-by: Leighton Chen <lechen@microsoft.com>
2024-11-15 12:10:02 -05:00
Aaron Abbott 934ede51e0
Remove updating CHANGELOG step in release workflow (#3000) (#3009)
Co-authored-by: Leighton Chen <lechen@microsoft.com>
2024-11-15 12:02:43 -05:00
Aaron Abbott 10b23cd9b4
[release/v1.28.x-0.49bx] opentelemetry-instrumentation-httpx: make instrument_client a staticmethod again (#3003) (#3008)
* opentelemetry-instrumentation-httpx: make instrument_client a staticmethod again (#3003)

* opentelemetry-instrumentation-httpx: make instrument_client a staticmethod again

* ADd changelog

* Can be a classmethod

---------

Co-authored-by: Leighton Chen <lechen@microsoft.com>

* Move changelog entry to Unreleased section

---------

Co-authored-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Co-authored-by: Leighton Chen <lechen@microsoft.com>
2024-11-15 11:08:57 -05:00
OpenTelemetry Bot ec1c9ea8a8
[release/v1.28.x-0.49bx] Prepare release 1.28.1/0.49b1 (#2985) 2024-11-08 11:23:16 -08:00
Riccardo Magliocchetti e4ab0d88d0 Drop selective enabled for windows and regenerate workflows (#2964) 2024-11-07 16:53:45 -08:00
Emídio Neto 0855740d8f fix: teach instrument version constraint for sqlalchemy (#2971) 2024-11-07 15:41:02 -08:00
Tammy Baylis 402155e279 Update tests to work with SQLAlchemy 2 (#2976) 2024-11-07 15:28:53 -08:00
Emídio Neto d4c390015d fix: remove opentelemetry-instrumentation-test package from bootstrap_gen (#2969) 2024-11-07 11:41:11 -08:00
OpenTelemetry Bot a4dfeacf76
[release/v1.28.x-0.49bx] Prepare release 1.28.0/0.49b0 (#2955) 2024-11-05 10:59:23 -08:00
146 changed files with 607 additions and 767 deletions

11
.github/scripts/update-version-patch.sh vendored Executable file
View File

@ -0,0 +1,11 @@
#!/bin/bash -e
sed -i "/\[stable\]/{n;s/version=.*/version=$1/}" eachdist.ini
sed -i "/\[prerelease\]/{n;s/version=.*/version=$2/}" eachdist.ini
./scripts/eachdist.py update_patch_versions \
--stable_version=$1 \
--unstable_version=$2 \
--stable_version_prev=$3 \
--unstable_version_prev=$4

View File

@ -9,8 +9,6 @@ from generate_workflows_lib import (
tox_ini_path = Path(__file__).parent.parent.parent.joinpath("tox.ini")
workflows_directory_path = Path(__file__).parent
generate_test_workflow(
tox_ini_path, workflows_directory_path, "ubuntu-latest", "windows-latest"
)
generate_test_workflow(tox_ini_path, workflows_directory_path, "ubuntu-latest")
generate_lint_workflow(tox_ini_path, workflows_directory_path)
generate_misc_workflow(tox_ini_path, workflows_directory_path)

View File

@ -55,14 +55,6 @@ def get_test_job_datas(tox_envs: list, operating_systems: list) -> list:
"py312": "3.12",
}
# we enable windows testing only for packages with windows specific code paths
per_tox_env_os_enablement = {
"windows-latest": {
"py312-test-instrumentation-botocore",
"py312-test-instrumentation-system-metrics",
},
}
test_job_datas = []
for operating_system in operating_systems:
@ -79,14 +71,6 @@ def get_test_job_datas(tox_envs: list, operating_systems: list) -> list:
]
tox_env = tox_test_env_match.string
# if we have an entry for the os add only jobs for tox env manually configured
packages_manually_enabled = per_tox_env_os_enablement.get(
operating_system
)
if packages_manually_enabled:
if tox_env not in packages_manually_enabled:
continue
test_requirements = groups["test_requirements"]
if test_requirements is None:

View File

@ -10,7 +10,7 @@ on:
pull_request:
env:
CORE_REPO_SHA: main
CORE_REPO_SHA: b9240e73fb4a5c493a753cc9baa865e2d9a817a3
CONTRIB_REPO_SHA: main
PIP_EXISTS_ACTION: w

View File

@ -23,13 +23,17 @@ jobs:
{%- if job_data == "generate-workflows" %}
if: |
!contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows')
&& github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
&& github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
{%- endif %}
{%- if job_data == "public-symbols-check" %}
if: |
!contains(github.event.pull_request.labels.*.name, 'Approve Public API check')
&& github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
{%- endif %}
{%- if job_data == "docs" %}
if: |
github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
{%- endif %}
steps:
- name: Checkout repo @ SHA - ${% raw %}{{ github.sha }}{% endraw %}
uses: actions/checkout@v4

View File

@ -10,7 +10,7 @@ on:
pull_request:
env:
CORE_REPO_SHA: main
CORE_REPO_SHA: b9240e73fb4a5c493a753cc9baa865e2d9a817a3
CONTRIB_REPO_SHA: main
PIP_EXISTS_ACTION: w

View File

@ -10,7 +10,7 @@ on:
pull_request:
env:
CORE_REPO_SHA: main
CORE_REPO_SHA: opentelemetrybot/prepare-release-1.28.2-0.49b2
CONTRIB_REPO_SHA: main
PIP_EXISTS_ACTION: w

View File

@ -10,7 +10,7 @@ on:
pull_request:
env:
CORE_REPO_SHA: main
CORE_REPO_SHA: opentelemetrybot/prepare-release-1.28.2-0.49b2
CONTRIB_REPO_SHA: main
PIP_EXISTS_ACTION: w
@ -55,6 +55,8 @@ jobs:
docs:
name: docs
runs-on: ubuntu-latest
if: |
github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
steps:
- name: Checkout repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4
@ -96,7 +98,7 @@ jobs:
runs-on: ubuntu-latest
if: |
!contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows')
&& github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
&& github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
steps:
- name: Checkout repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4

View File

@ -40,14 +40,18 @@ jobs:
exit 1
fi
stable_version_prev="$stable_major_minor.$((stable_patch))"
unstable_version_prev="0.${unstable_minor}b$((unstable_patch))"
stable_version="$stable_major_minor.$((stable_patch + 1))"
unstable_version="0.${unstable_minor}b$((unstable_patch + 1))"
echo "STABLE_VERSION=$stable_version" >> $GITHUB_ENV
echo "UNSTABLE_VERSION=$unstable_version" >> $GITHUB_ENV
echo "STABLE_VERSION_PREV=$stable_version_prev" >> $GITHUB_ENV
echo "UNSTABLE_VERSION_PREV=$unstable_version_prev" >> $GITHUB_ENV
- name: Update version
run: .github/scripts/update-version.sh $STABLE_VERSION $UNSTABLE_VERSION
run: .github/scripts/update-version-patch.sh $STABLE_VERSION $UNSTABLE_VERSION $STABLE_VERSION_PREV $UNSTABLE_VERSION_PREV
- name: Set up Python 3.9
uses: actions/setup-python@v5

View File

@ -119,36 +119,3 @@ jobs:
# the step below is creating a pull request against main
ref: main
- name: Copy change log updates to main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
echo "VERSION=${STABLE_VERSION}\/${UNSTABLE_VERSION}" >> $GITHUB_ENV
echo "RELEASE_TAG=$STABLE_VERSION" >> $GITHUB_ENV
./scripts/merge_changelog_to_main.sh
- name: Use CLA approved github bot
run: .github/scripts/use-cla-approved-github-bot.sh
- name: Create pull request against main
env:
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
run: |
message="Copy change log updates from $GITHUB_REF_NAME"
body="Copy log updates from \`$GITHUB_REF_NAME\`."
branch="opentelemetrybot/copy-change-log-updates-from-${GITHUB_REF_NAME//\//-}"
if [[ -z $PRIOR_VERSION_WHEN_PATCH ]]; then
if git diff --quiet; then
echo there are no updates needed to the change log on main, not creating pull request
exit 0 # success
fi
fi
git commit -a -m "$message"
git push origin HEAD:$branch
gh pr create --title "$message" \
--body "$body" \
--head $branch \
--base main

View File

@ -10,7 +10,7 @@ on:
pull_request:
env:
CORE_REPO_SHA: main
CORE_REPO_SHA: opentelemetrybot/prepare-release-1.28.2-0.49b2
CONTRIB_REPO_SHA: main
PIP_EXISTS_ACTION: w

View File

@ -10,7 +10,7 @@ on:
pull_request:
env:
CORE_REPO_SHA: main
CORE_REPO_SHA: opentelemetrybot/prepare-release-1.28.2-0.49b2
CONTRIB_REPO_SHA: main
PIP_EXISTS_ACTION: w
@ -1168,6 +1168,24 @@ jobs:
- name: Run tests
run: tox -e py38-test-instrumentation-sqlalchemy-1 -- -ra
py38-test-instrumentation-sqlalchemy-2_ubuntu-latest:
name: instrumentation-sqlalchemy-2 3.8 Ubuntu
runs-on: ubuntu-latest
steps:
- name: Checkout repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4
- name: Set up Python 3.8
uses: actions/setup-python@v5
with:
python-version: "3.8"
- name: Install tox
run: pip install tox
- name: Run tests
run: tox -e py38-test-instrumentation-sqlalchemy-2 -- -ra
py39-test-instrumentation-sqlalchemy-1_ubuntu-latest:
name: instrumentation-sqlalchemy-1 3.9 Ubuntu
runs-on: ubuntu-latest
@ -1186,6 +1204,24 @@ jobs:
- name: Run tests
run: tox -e py39-test-instrumentation-sqlalchemy-1 -- -ra
py39-test-instrumentation-sqlalchemy-2_ubuntu-latest:
name: instrumentation-sqlalchemy-2 3.9 Ubuntu
runs-on: ubuntu-latest
steps:
- name: Checkout repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4
- name: Set up Python 3.9
uses: actions/setup-python@v5
with:
python-version: "3.9"
- name: Install tox
run: pip install tox
- name: Run tests
run: tox -e py39-test-instrumentation-sqlalchemy-2 -- -ra
py310-test-instrumentation-sqlalchemy-1_ubuntu-latest:
name: instrumentation-sqlalchemy-1 3.10 Ubuntu
runs-on: ubuntu-latest
@ -1204,6 +1240,24 @@ jobs:
- name: Run tests
run: tox -e py310-test-instrumentation-sqlalchemy-1 -- -ra
py310-test-instrumentation-sqlalchemy-2_ubuntu-latest:
name: instrumentation-sqlalchemy-2 3.10 Ubuntu
runs-on: ubuntu-latest
steps:
- name: Checkout repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4
- name: Set up Python 3.10
uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Install tox
run: pip install tox
- name: Run tests
run: tox -e py310-test-instrumentation-sqlalchemy-2 -- -ra
py311-test-instrumentation-sqlalchemy-1_ubuntu-latest:
name: instrumentation-sqlalchemy-1 3.11 Ubuntu
runs-on: ubuntu-latest
@ -1222,6 +1276,24 @@ jobs:
- name: Run tests
run: tox -e py311-test-instrumentation-sqlalchemy-1 -- -ra
py311-test-instrumentation-sqlalchemy-2_ubuntu-latest:
name: instrumentation-sqlalchemy-2 3.11 Ubuntu
runs-on: ubuntu-latest
steps:
- name: Checkout repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: Install tox
run: pip install tox
- name: Run tests
run: tox -e py311-test-instrumentation-sqlalchemy-2 -- -ra
py312-test-instrumentation-sqlalchemy-1_ubuntu-latest:
name: instrumentation-sqlalchemy-1 3.12 Ubuntu
runs-on: ubuntu-latest
@ -1240,6 +1312,24 @@ jobs:
- name: Run tests
run: tox -e py312-test-instrumentation-sqlalchemy-1 -- -ra
py312-test-instrumentation-sqlalchemy-2_ubuntu-latest:
name: instrumentation-sqlalchemy-2 3.12 Ubuntu
runs-on: ubuntu-latest
steps:
- name: Checkout repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4
- name: Set up Python 3.12
uses: actions/setup-python@v5
with:
python-version: "3.12"
- name: Install tox
run: pip install tox
- name: Run tests
run: tox -e py312-test-instrumentation-sqlalchemy-2 -- -ra
pypy3-test-instrumentation-sqlalchemy-0_ubuntu-latest:
name: instrumentation-sqlalchemy-0 pypy-3.8 Ubuntu
runs-on: ubuntu-latest
@ -1276,6 +1366,24 @@ jobs:
- name: Run tests
run: tox -e pypy3-test-instrumentation-sqlalchemy-1 -- -ra
pypy3-test-instrumentation-sqlalchemy-2_ubuntu-latest:
name: instrumentation-sqlalchemy-2 pypy-3.8 Ubuntu
runs-on: ubuntu-latest
steps:
- name: Checkout repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4
- name: Set up Python pypy-3.8
uses: actions/setup-python@v5
with:
python-version: "pypy-3.8"
- name: Install tox
run: pip install tox
- name: Run tests
run: tox -e pypy3-test-instrumentation-sqlalchemy-2 -- -ra
py38-test-instrumentation-redis_ubuntu-latest:
name: instrumentation-redis 3.8 Ubuntu
runs-on: ubuntu-latest
@ -3903,45 +4011,3 @@ jobs:
- name: Run tests
run: tox -e pypy3-test-processor-baggage -- -ra
py312-test-instrumentation-botocore_windows-latest:
name: instrumentation-botocore 3.12 Windows
runs-on: windows-latest
steps:
- name: Checkout repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4
- name: Set up Python 3.12
uses: actions/setup-python@v5
with:
python-version: "3.12"
- name: Install tox
run: pip install tox
- name: Configure git to support long filenames
run: git config --system core.longpaths true
- name: Run tests
run: tox -e py312-test-instrumentation-botocore -- -ra
py312-test-instrumentation-system-metrics_windows-latest:
name: instrumentation-system-metrics 3.12 Windows
runs-on: windows-latest
steps:
- name: Checkout repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4
- name: Set up Python 3.12
uses: actions/setup-python@v5
with:
python-version: "3.12"
- name: Install tox
run: pip install tox
- name: Configure git to support long filenames
run: git config --system core.longpaths true
- name: Run tests
run: tox -e py312-test-instrumentation-system-metrics -- -ra

View File

@ -9,7 +9,37 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
> The following components are released independently and maintain individual CHANGELOG files.
> Use [this search for a list of all CHANGELOG.md files in this repo](https://github.com/search?q=repo%3Aopen-telemetry%2Fopentelemetry-python-contrib+path%3A**%2FCHANGELOG.md&type=code).
## Unreleased
## Version 1.28.2/0.49b2 (2024-11-18)
### Added
- Add `opentelemetry-instrumentation-openai-v2` to `opentelemetry-bootstrap`
([#2996](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2996))
### Fixed
- `opentelemetry-instrumentation-httpx`: instrument_client is a static method again
([#3003](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3003))
### Breaking changes
## Version 1.28.1/0.49b1 (2024-11-08)
### Added
- `opentelemetry-instrumentation-sqlalchemy` Update unit tests to run with SQLALchemy 2
([#2976](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2976))
### Fixed
### Breaking changes
- `opentelemetry-instrumentation-sqlalchemy` teach instruments version
([#2971](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2971))
- Drop `opentelemetry-instrumentation-test` package from default instrumentation list
([#2969](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2969))
## Version 1.28.0/0.49b0 (2024-11-05)
### Added

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -16,7 +16,7 @@ sortfirst=
ext/*
[stable]
version=1.28.0.dev
version=1.28.2
packages=
opentelemetry-sdk
@ -34,7 +34,7 @@ packages=
opentelemetry-api
[prerelease]
version=0.49b0.dev
version=0.49b2
packages=
all

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -27,7 +27,7 @@ classifiers = [
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-sdk ~= 1.12",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b2",
"rich>=10.0.0",
]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -32,7 +32,7 @@ dependencies = [
[project.optional-dependencies]
instruments = [
"openai >= 1.0.0",
"openai >= 1.26.0",
]
[project.entry-points.opentelemetry_instrumentor]

View File

@ -39,11 +39,10 @@
| [opentelemetry-instrumentation-redis](./opentelemetry-instrumentation-redis) | redis >= 2.6 | No | experimental
| [opentelemetry-instrumentation-remoulade](./opentelemetry-instrumentation-remoulade) | remoulade >= 0.50 | No | experimental
| [opentelemetry-instrumentation-requests](./opentelemetry-instrumentation-requests) | requests ~= 2.0 | Yes | migration
| [opentelemetry-instrumentation-sqlalchemy](./opentelemetry-instrumentation-sqlalchemy) | sqlalchemy | Yes | experimental
| [opentelemetry-instrumentation-sqlalchemy](./opentelemetry-instrumentation-sqlalchemy) | sqlalchemy >= 1.0.0, < 2.1.0 | Yes | experimental
| [opentelemetry-instrumentation-sqlite3](./opentelemetry-instrumentation-sqlite3) | sqlite3 | No | experimental
| [opentelemetry-instrumentation-starlette](./opentelemetry-instrumentation-starlette) | starlette ~= 0.13.0 | Yes | experimental
| [opentelemetry-instrumentation-system-metrics](./opentelemetry-instrumentation-system-metrics) | psutil >= 5 | No | experimental
| [opentelemetry-instrumentation-test](./opentelemetry-instrumentation-test) | test | No | migration
| [opentelemetry-instrumentation-threading](./opentelemetry-instrumentation-threading) | threading | No | experimental
| [opentelemetry-instrumentation-tornado](./opentelemetry-instrumentation-tornado) | tornado >= 5.1.1 | Yes | experimental
| [opentelemetry-instrumentation-tortoiseorm](./opentelemetry-instrumentation-tortoiseorm) | tortoise-orm >= 0.17.0 | No | experimental

View File

@ -26,7 +26,7 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.5",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"wrapt >= 1.0.0, < 2.0.0",
]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,9 +26,9 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-util-http == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
"opentelemetry-util-http == 0.49b2",
"wrapt >= 1.0.0, < 2.0.0",
]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,9 +26,9 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-util-http == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
"opentelemetry-util-http == 0.49b2",
"wrapt >= 1.0.0, < 2.0.0",
]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.27",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
]
[project.optional-dependencies]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-instrumentation-dbapi == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-instrumentation-dbapi == 0.49b2",
"wrapt >= 1.0.0, < 2.0.0",
]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -27,9 +27,9 @@ classifiers = [
dependencies = [
"asgiref ~= 3.0",
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-util-http == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
"opentelemetry-util-http == 0.49b2",
]
[project.optional-dependencies]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.14",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
"wrapt >= 1.0.0, < 2.0.0",
]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
]
[project.optional-dependencies]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -25,8 +25,8 @@ classifiers = [
"Programming Language :: Python :: 3.12",
]
dependencies = [
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
"opentelemetry-propagator-aws-xray ~= 1.0",
]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -25,8 +25,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
]
[project.optional-dependencies]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
"wrapt >= 1.0.0, < 2.0.0",
]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
"opentelemetry-propagator-aws-xray ~= 1.0",
]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
"wrapt >= 1.0.0, < 2.0.0",
]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
]
[project.optional-dependencies]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -25,7 +25,7 @@ classifiers = [
"Programming Language :: Python :: 3.12",
]
dependencies = [
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-api ~= 1.12",
"wrapt >= 1.0.0, < 2.0.0",
]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
"wrapt >= 1.0.0, < 2.0.0",
]

View File

@ -12,6 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"
_instruments = tuple()

View File

@ -26,15 +26,15 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-instrumentation-wsgi == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-util-http == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-instrumentation-wsgi == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
"opentelemetry-util-http == 0.49b2",
]
[project.optional-dependencies]
asgi = [
"opentelemetry-instrumentation-asgi == 0.49b0.dev",
"opentelemetry-instrumentation-asgi == 0.49b2",
]
instruments = [
"django >= 1.10",

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
"wrapt >= 1.0.0, < 2.0.0",
]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,10 +26,10 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-instrumentation-wsgi == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-util-http == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-instrumentation-wsgi == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
"opentelemetry-util-http == 0.49b2",
"packaging >= 20.0",
]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,10 +26,10 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-instrumentation-asgi == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-util-http == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-instrumentation-asgi == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
"opentelemetry-util-http == 0.49b2",
]
[project.optional-dependencies]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,10 +26,10 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-instrumentation-wsgi == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-util-http == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-instrumentation-wsgi == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
"opentelemetry-util-http == 0.49b2",
"packaging >= 21.0",
]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
"wrapt >= 1.0.0, < 2.0.0",
]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,9 +26,9 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-util-http == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
"opentelemetry-util-http == 0.49b2",
"wrapt >= 1.0.0, < 2.0.0",
]

View File

@ -938,8 +938,9 @@ class HTTPXClientInstrumentor(BaseInstrumentor):
return response
@classmethod
def instrument_client(
self,
cls,
client: typing.Union[httpx.Client, httpx.AsyncClient],
tracer_provider: TracerProvider = None,
request_hook: typing.Union[
@ -996,7 +997,7 @@ class HTTPXClientInstrumentor(BaseInstrumentor):
client._transport,
"handle_request",
partial(
self._handle_request_wrapper,
cls._handle_request_wrapper,
tracer=tracer,
sem_conv_opt_in_mode=sem_conv_opt_in_mode,
request_hook=request_hook,
@ -1008,7 +1009,7 @@ class HTTPXClientInstrumentor(BaseInstrumentor):
transport,
"handle_request",
partial(
self._handle_request_wrapper,
cls._handle_request_wrapper,
tracer=tracer,
sem_conv_opt_in_mode=sem_conv_opt_in_mode,
request_hook=request_hook,
@ -1021,7 +1022,7 @@ class HTTPXClientInstrumentor(BaseInstrumentor):
client._transport,
"handle_async_request",
partial(
self._handle_async_request_wrapper,
cls._handle_async_request_wrapper,
tracer=tracer,
sem_conv_opt_in_mode=sem_conv_opt_in_mode,
async_request_hook=async_request_hook,
@ -1033,7 +1034,7 @@ class HTTPXClientInstrumentor(BaseInstrumentor):
transport,
"handle_async_request",
partial(
self._handle_async_request_wrapper,
cls._handle_async_request_wrapper,
tracer=tracer,
sem_conv_opt_in_mode=sem_conv_opt_in_mode,
async_request_hook=async_request_hook,

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -910,13 +910,20 @@ class BaseTestCases:
self.assert_span(num_spans=0)
def test_instrument_client(self):
def test_instrument_client_called_on_the_instance(self):
client = self.create_client()
HTTPXClientInstrumentor().instrument_client(client)
result = self.perform_request(self.URL, client=client)
self.assertEqual(result.text, "Hello!")
self.assert_span(num_spans=1)
def test_instrument_client_called_on_the_class(self):
client = self.create_client()
HTTPXClientInstrumentor.instrument_client(client)
result = self.perform_request(self.URL, client=client)
self.assertEqual(result.text, "Hello!")
self.assert_span(num_spans=1)
def test_instrumentation_without_client(self):
HTTPXClientInstrumentor().instrument()
results = [

View File

@ -26,7 +26,7 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"wrapt >= 1.0.0, < 2.0.0",
]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.5",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
]
[project.optional-dependencies]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,7 +26,7 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
]
[project.optional-dependencies]

View File

@ -12,6 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"
_instruments = tuple()

View File

@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-instrumentation-dbapi == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-instrumentation-dbapi == 0.49b2",
]
[project.optional-dependencies]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-instrumentation-dbapi == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-instrumentation-dbapi == 0.49b2",
]
[project.optional-dependencies]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -25,7 +25,7 @@ classifiers = [
"Programming Language :: Python :: 3.12",
]
dependencies = [
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-api ~= 1.5",
"packaging >= 20.0",
"wrapt >= 1.0.0, < 2.0.0",

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -27,8 +27,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-instrumentation-dbapi == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-instrumentation-dbapi == 0.49b2",
]
[project.optional-dependencies]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-instrumentation-dbapi == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-instrumentation-dbapi == 0.49b2",
]
[project.optional-dependencies]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
"wrapt >= 1.0.0, < 2.0.0",
]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
]
[project.optional-dependencies]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-instrumentation-dbapi == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-instrumentation-dbapi == 0.49b2",
]
[project.optional-dependencies]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,10 +26,10 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-instrumentation-wsgi == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-util-http == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-instrumentation-wsgi == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
"opentelemetry-util-http == 0.49b2",
"wrapt >= 1.0.0, < 2.0.0",
]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
"wrapt >= 1.12.1",
]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
]
[project.optional-dependencies]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,9 +26,9 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-util-http == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
"opentelemetry-util-http == 0.49b2",
]
[project.optional-dependencies]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.49b0.dev"
__version__ = "0.49b2"

View File

@ -26,15 +26,15 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.49b0.dev",
"opentelemetry-semantic-conventions == 0.49b0.dev",
"opentelemetry-instrumentation == 0.49b2",
"opentelemetry-semantic-conventions == 0.49b2",
"packaging >= 21.0",
"wrapt >= 1.11.2",
]
[project.optional-dependencies]
instruments = [
"sqlalchemy",
"sqlalchemy >= 1.0.0, < 2.1.0",
]
[project.entry-points.opentelemetry_instrumentor]

View File

@ -12,6 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
_instruments = ("sqlalchemy",)
_instruments = ("sqlalchemy >= 1.0.0, < 2.1.0",)
_supports_metrics = True

Some files were not shown because too many files have changed in this diff Show More