Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit faa845d

Browse files
committedJul 15, 2024··
Deprecate sklearn instrumentation
Fixes #2176
1 parent 7e48ee7 commit faa845d

File tree

18 files changed

+3
-1423
lines changed

18 files changed

+3
-1423
lines changed
 

Diff for: ‎.github/workflows/instrumentations_0.yml

-11
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ jobs:
6666
- "redis"
6767
- "remoulade"
6868
- "requests"
69-
- "sklearn"
7069
- "sqlalchemy"
7170
- "sqlite3"
7271
- "starlette"
@@ -75,14 +74,6 @@ jobs:
7574
- "tortoiseorm"
7675
os: [ubuntu-20.04]
7776
exclude:
78-
- python-version: py39
79-
package: "sklearn"
80-
- python-version: py310
81-
package: "sklearn"
82-
- python-version: py311
83-
package: "sklearn"
84-
- python-version: py312
85-
package: "sklearn"
8677
- python-version: py312
8778
package: "boto"
8879
- python-version: py312
@@ -103,8 +94,6 @@ jobs:
10394
package: "remoulade"
10495
- python-version: pypy3
10596
package: "requests"
106-
- python-version: pypy3
107-
package: "sklearn"
10897
- python-version: pypy3
10998
package: "confluent-kafka"
11099
- python-version: pypy3

Diff for: ‎.github/workflows/lint.yml

-28
Original file line numberDiff line numberDiff line change
@@ -93,31 +93,3 @@ jobs:
9393
key: v7-build-tox-cache-${{ matrix.package }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
9494
- name: run tox
9595
run: tox -e lint-${{ matrix.package }}
96-
97-
lint-3_8:
98-
strategy:
99-
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
100-
matrix:
101-
package:
102-
- "instrumentation-sklearn"
103-
os: [ubuntu-20.04]
104-
runs-on: ubuntu-20.04
105-
steps:
106-
- name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
107-
uses: actions/checkout@v4
108-
- name: Set up Python 3.8
109-
uses: actions/setup-python@v5
110-
with:
111-
python-version: 3.8
112-
- name: Install tox
113-
run: pip install tox
114-
- name: Cache tox environment
115-
# Preserves .tox directory between runs for faster installs
116-
uses: actions/cache@v4
117-
with:
118-
path: |
119-
.tox
120-
~/.cache/pip
121-
key: v7-build-tox-cache-${{ matrix.package }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
122-
- name: run tox
123-
run: tox -e lint-${{ matrix.package }}

Diff for: ‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
### Added
1111

12+
- `opentelemetry-instrumentation-sklearn` Deprecated the sklearn instrumentation
13+
([#2708](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2708))
1214
- `opentelemetry-instrumentation-pyramid` Record exceptions raised when serving a request
1315
([#2622](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2622))
1416
- `opentelemetry-sdk-extension-aws` Add AwsXrayLambdaPropagator

Diff for: ‎eachdist.ini

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ packages=
5454
[lintroots]
5555
extraroots=examples/*,scripts/
5656
subglob=*.py,tests/,test/,src/*,examples/*
57-
ignore=sklearn
5857

5958
[testroots]
6059
extraroots=examples/*,tests/

Diff for: ‎instrumentation/README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
| [opentelemetry-instrumentation-redis](./opentelemetry-instrumentation-redis) | redis >= 2.6 | No | experimental
3939
| [opentelemetry-instrumentation-remoulade](./opentelemetry-instrumentation-remoulade) | remoulade >= 0.50 | No | experimental
4040
| [opentelemetry-instrumentation-requests](./opentelemetry-instrumentation-requests) | requests ~= 2.0 | Yes | migration
41-
| [opentelemetry-instrumentation-sklearn](./opentelemetry-instrumentation-sklearn) | scikit-learn ~= 0.24.0 | No | experimental
4241
| [opentelemetry-instrumentation-sqlalchemy](./opentelemetry-instrumentation-sqlalchemy) | sqlalchemy | Yes | experimental
4342
| [opentelemetry-instrumentation-sqlite3](./opentelemetry-instrumentation-sqlite3) | sqlite3 | No | experimental
4443
| [opentelemetry-instrumentation-starlette](./opentelemetry-instrumentation-starlette) | starlette ~= 0.13.0 | Yes | experimental
@@ -48,4 +47,4 @@
4847
| [opentelemetry-instrumentation-tortoiseorm](./opentelemetry-instrumentation-tortoiseorm) | tortoise-orm >= 0.17.0 | No | experimental
4948
| [opentelemetry-instrumentation-urllib](./opentelemetry-instrumentation-urllib) | urllib | Yes | experimental
5049
| [opentelemetry-instrumentation-urllib3](./opentelemetry-instrumentation-urllib3) | urllib3 >= 1.0.0, < 3.0.0 | Yes | experimental
51-
| [opentelemetry-instrumentation-wsgi](./opentelemetry-instrumentation-wsgi) | wsgi | Yes | migration
50+
| [opentelemetry-instrumentation-wsgi](./opentelemetry-instrumentation-wsgi) | wsgi | Yes | migration

Diff for: ‎instrumentation/opentelemetry-instrumentation-sklearn/LICENSE

-201
This file was deleted.

Diff for: ‎instrumentation/opentelemetry-instrumentation-sklearn/README.rst

-24
This file was deleted.

Diff for: ‎instrumentation/opentelemetry-instrumentation-sklearn/pyproject.toml

-49
This file was deleted.

Diff for: ‎instrumentation/opentelemetry-instrumentation-sklearn/src/opentelemetry/instrumentation/sklearn/__init__.py

-792
This file was deleted.

Diff for: ‎instrumentation/opentelemetry-instrumentation-sklearn/src/opentelemetry/instrumentation/sklearn/package.py

-16
This file was deleted.

Diff for: ‎instrumentation/opentelemetry-instrumentation-sklearn/src/opentelemetry/instrumentation/sklearn/version.py

-15
This file was deleted.

Diff for: ‎instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt

-19
This file was deleted.

Diff for: ‎instrumentation/opentelemetry-instrumentation-sklearn/tests/__init__.py

Whitespace-only changes.

Diff for: ‎instrumentation/opentelemetry-instrumentation-sklearn/tests/fixtures.py

-54
This file was deleted.

Diff for: ‎instrumentation/opentelemetry-instrumentation-sklearn/tests/test_sklearn.py

-190
This file was deleted.

Diff for: ‎opentelemetry-contrib-instrumentations/pyproject.toml

-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ dependencies = [
6666
"opentelemetry-instrumentation-redis==0.47b0.dev",
6767
"opentelemetry-instrumentation-remoulade==0.47b0.dev",
6868
"opentelemetry-instrumentation-requests==0.47b0.dev",
69-
"opentelemetry-instrumentation-sklearn==0.47b0.dev",
7069
"opentelemetry-instrumentation-sqlalchemy==0.47b0.dev",
7170
"opentelemetry-instrumentation-sqlite3==0.47b0.dev",
7271
"opentelemetry-instrumentation-starlette==0.47b0.dev",

Diff for: ‎opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py

-4
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,6 @@
152152
"library": "requests ~= 2.0",
153153
"instrumentation": "opentelemetry-instrumentation-requests==0.47b0.dev",
154154
},
155-
{
156-
"library": "scikit-learn ~= 0.24.0",
157-
"instrumentation": "opentelemetry-instrumentation-sklearn==0.47b0.dev",
158-
},
159155
{
160156
"library": "sqlalchemy",
161157
"instrumentation": "opentelemetry-instrumentation-sqlalchemy==0.47b0.dev",

Diff for: ‎tox.ini

-16
Original file line numberDiff line numberDiff line change
@@ -273,10 +273,6 @@ envlist =
273273
pypy3-test-instrumentation-celery
274274
lint-instrumentation-celery
275275

276-
; opentelemetry-instrumentation-sklearn
277-
py3{8}-test-instrumentation-sklearn
278-
lint-instrumentation-sklearn
279-
280276
; opentelemetry-instrumentation-system-metrics
281277
py3{8,9,10,11,12}-test-instrumentation-system-metrics
282278
pypy3-test-instrumentation-system-metrics
@@ -701,12 +697,6 @@ commands_pre =
701697
prometheus: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
702698
prometheus: pip install -r {toxinidir}/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt
703699

704-
sklearn: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
705-
sklearn: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
706-
sklearn: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
707-
sklearn: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
708-
sklearn: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt
709-
710700
sqlalchemy: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
711701
sqlalchemy: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
712702
sqlalchemy: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
@@ -1021,12 +1011,6 @@ commands =
10211011
lint-instrumentation-requests: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-requests
10221012
lint-instrumentation-requests: sh -c "cd instrumentation && pylint --rcfile ../.pylintrc opentelemetry-instrumentation-requests"
10231013

1024-
test-instrumentation-sklearn: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/tests {posargs}
1025-
lint-instrumentation-sklearn: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn
1026-
lint-instrumentation-sklearn: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn
1027-
lint-instrumentation-sklearn: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn
1028-
lint-instrumentation-sklearn: sh -c "cd instrumentation && pylint --rcfile ../.pylintrc opentelemetry-instrumentation-sklearn"
1029-
10301014
test-instrumentation-sqlalchemy: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/tests {posargs}
10311015
lint-instrumentation-sqlalchemy: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy
10321016
lint-instrumentation-sqlalchemy: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy

0 commit comments

Comments
 (0)
Please sign in to comment.