Skip to content

Commit 0bfc1c8

Browse files
allen-k1mallen-k1m
committed
Merge remote-tracking branch 'origin/feature/asyncio-instrumentation' into feature/asyncio-instrumentation
# Conflicts: # CHANGELOG.md
2 parents 31b6157 + 7581c30 commit 0bfc1c8

File tree

125 files changed

+1220
-314
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+1220
-314
lines changed

‎.github/component_owners.yml

+3
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,6 @@ components:
6464

6565
instrumentation/opentelemetry-instrumentation-requests:
6666
- ocelotl
67+
68+
instrumentation/opentelemetry-instrumentation-cassandra:
69+
- mattcontinisio

‎.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: c41b6bf29e9486a71ba1c40cd0ea35a03b2f7489
9+
CORE_REPO_SHA: 0ef76a5cc39626f783416ca75e43556e2bb2739d
1010

1111
jobs:
1212
build:

‎CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1212
([#1919](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1943))
1313

1414

15+
## Version 1.20.0/0.41b0 (2023-09-01)
16+
1517
### Fixed
1618

1719
- `opentelemetry-instrumentation-asgi` Fix UnboundLocalError local variable 'start' referenced before assignment
1820
([#1889](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1889))
1921
- Fixed union typing error not compatible with Python 3.7 introduced in `opentelemetry-util-http`, fix tests introduced by patch related to sanitize method for wsgi
2022
([#1913](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1913))
23+
- `opentelemetry-instrumentation-celery` Unwrap Celery's `ExceptionInfo` errors and report the actual exception that was raised. ([#1863](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1863))
2124

2225
### Added
2326

@@ -41,6 +44,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4144

4245
### Added
4346

47+
- Add instrumentor support for cassandra and scylla
48+
([#1902](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1902))
4449
- Add instrumentor support for mysqlclient
4550
([#1744](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1744))
4651
- Fix async redis clients not being traced correctly
@@ -66,6 +71,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
6671
- Add optional distro and configurator selection for auto-instrumentation
6772
([#1823](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1823))
6873

74+
### Added
75+
- `opentelemetry-instrumentation-kafka-python` Add instrumentation to `consume` method
76+
([#1786](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1786))
77+
6978
## Version 1.18.0/0.39b0 (2023-05-10)
7079

7180
- Update runtime metrics to follow semantic conventions

‎_template/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.41b0.dev"
15+
__version__ = "0.42b0.dev"

‎docs-requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ asyncpg>=0.12.0
2525
boto~=2.0
2626
botocore~=1.0
2727
boto3~=1.0
28+
cassandra-driver~=3.25
2829
celery>=4.0
2930
confluent-kafka>= 1.8.2,<= 2.2.0
3031
elasticsearch>=2.0,<9.0

‎docs/instrumentation/cassandra/cassandra.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OpenTelemetry Cassandra Instrumentation
2+
=======================================
3+
4+
.. automodule:: opentelemetry.instrumentation.cassandra
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎eachdist.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sortfirst=
1616
ext/*
1717

1818
[stable]
19-
version=1.20.0.dev
19+
version=1.21.0.dev
2020

2121
packages=
2222
opentelemetry-sdk
@@ -34,7 +34,7 @@ packages=
3434
opentelemetry-api
3535

3636
[prerelease]
37-
version=0.41b0.dev
37+
version=0.42b0.dev
3838

3939
packages=
4040
all

‎exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.41b0.dev"
15+
__version__ = "0.42b0.dev"

‎exporter/opentelemetry-exporter-richconsole/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ classifiers = [
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
2929
"opentelemetry-sdk ~= 1.12",
30-
"opentelemetry-semantic-conventions == 0.41b0.dev",
30+
"opentelemetry-semantic-conventions == 0.42b0.dev",
3131
"rich>=10.0.0",
3232
]
3333

‎exporter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.41b0.dev"
15+
__version__ = "0.42b0.dev"

‎instrumentation/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
| [opentelemetry-instrumentation-boto](./opentelemetry-instrumentation-boto) | boto~=2.0 | No
1212
| [opentelemetry-instrumentation-boto3sqs](./opentelemetry-instrumentation-boto3sqs) | boto3 ~= 1.0 | No
1313
| [opentelemetry-instrumentation-botocore](./opentelemetry-instrumentation-botocore) | botocore ~= 1.0 | No
14+
| [opentelemetry-instrumentation-cassandra](./opentelemetry-instrumentation-cassandra) | cassandra-driver ~= 3.25,scylla-driver ~= 3.25 | No
1415
| [opentelemetry-instrumentation-celery](./opentelemetry-instrumentation-celery) | celery >= 4.0, < 6.0 | No
1516
| [opentelemetry-instrumentation-confluent-kafka](./opentelemetry-instrumentation-confluent-kafka) | confluent-kafka >= 1.8.2, <= 2.2.0 | No
1617
| [opentelemetry-instrumentation-dbapi](./opentelemetry-instrumentation-dbapi) | dbapi | No

‎instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ instruments = [
3535
]
3636
test = [
3737
"opentelemetry-instrumentation-aio-pika[instruments]",
38-
"opentelemetry-test-utils == 0.41b0.dev",
38+
"opentelemetry-test-utils == 0.42b0.dev",
3939
"pytest",
4040
"wrapt >= 1.0.0, < 2.0.0",
4141
]

‎instrumentation/opentelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.41b0.dev"
15+
__version__ = "0.42b0.dev"

‎instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.41b0.dev",
30-
"opentelemetry-semantic-conventions == 0.41b0.dev",
31-
"opentelemetry-util-http == 0.41b0.dev",
29+
"opentelemetry-instrumentation == 0.42b0.dev",
30+
"opentelemetry-semantic-conventions == 0.42b0.dev",
31+
"opentelemetry-util-http == 0.42b0.dev",
3232
"wrapt >= 1.0.0, < 2.0.0",
3333
]
3434

‎instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.41b0.dev"
15+
__version__ = "0.42b0.dev"

‎instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.41b0.dev",
30-
"opentelemetry-instrumentation-dbapi == 0.41b0.dev",
29+
"opentelemetry-instrumentation == 0.42b0.dev",
30+
"opentelemetry-instrumentation-dbapi == 0.42b0.dev",
3131
"wrapt >= 1.0.0, < 2.0.0",
3232
]
3333

@@ -37,8 +37,8 @@ instruments = [
3737
]
3838
test = [
3939
"opentelemetry-instrumentation-aiopg[instruments]",
40-
"opentelemetry-semantic-conventions == 0.41b0.dev",
41-
"opentelemetry-test-utils == 0.41b0.dev",
40+
"opentelemetry-semantic-conventions == 0.42b0.dev",
41+
"opentelemetry-test-utils == 0.42b0.dev",
4242
]
4343

4444
[project.entry-points.opentelemetry_instrumentor]

‎instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.41b0.dev"
15+
__version__ = "0.42b0.dev"

‎instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ classifiers = [
2727
dependencies = [
2828
"asgiref ~= 3.0",
2929
"opentelemetry-api ~= 1.12",
30-
"opentelemetry-instrumentation == 0.41b0.dev",
31-
"opentelemetry-semantic-conventions == 0.41b0.dev",
32-
"opentelemetry-util-http == 0.41b0.dev",
30+
"opentelemetry-instrumentation == 0.42b0.dev",
31+
"opentelemetry-semantic-conventions == 0.42b0.dev",
32+
"opentelemetry-util-http == 0.42b0.dev",
3333
]
3434

3535
[project.optional-dependencies]
@@ -38,7 +38,7 @@ instruments = [
3838
]
3939
test = [
4040
"opentelemetry-instrumentation-asgi[instruments]",
41-
"opentelemetry-test-utils == 0.41b0.dev",
41+
"opentelemetry-test-utils == 0.42b0.dev",
4242
]
4343

4444
[project.urls]

‎instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.41b0.dev"
15+
__version__ = "0.42b0.dev"

‎instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.41b0.dev",
30-
"opentelemetry-semantic-conventions == 0.41b0.dev",
29+
"opentelemetry-instrumentation == 0.42b0.dev",
30+
"opentelemetry-semantic-conventions == 0.42b0.dev",
3131
]
3232

3333
[project.optional-dependencies]
@@ -36,7 +36,7 @@ instruments = [
3636
]
3737
test = [
3838
"opentelemetry-instrumentation-asyncpg[instruments]",
39-
"opentelemetry-test-utils == 0.41b0.dev",
39+
"opentelemetry-test-utils == 0.42b0.dev",
4040
]
4141

4242
[project.entry-points.opentelemetry_instrumentor]

‎instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.41b0.dev"
15+
__version__ = "0.42b0.dev"

‎instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ classifiers = [
2222
"Programming Language :: Python :: 3.8",
2323
]
2424
dependencies = [
25-
"opentelemetry-instrumentation == 0.41b0.dev",
25+
"opentelemetry-instrumentation == 0.42b0.dev",
2626
"opentelemetry-propagator-aws-xray == 1.0.1",
27-
"opentelemetry-semantic-conventions == 0.41b0.dev",
27+
"opentelemetry-semantic-conventions == 0.42b0.dev",
2828
]
2929

3030
[project.optional-dependencies]
3131
instruments = []
3232
test = [
33-
"opentelemetry-test-utils == 0.41b0.dev",
33+
"opentelemetry-test-utils == 0.42b0.dev",
3434
]
3535

3636
[project.urls]

‎instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.41b0.dev"
15+
__version__ = "0.42b0.dev"

‎instrumentation/opentelemetry-instrumentation-boto/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.41b0.dev",
30-
"opentelemetry-semantic-conventions == 0.41b0.dev",
29+
"opentelemetry-instrumentation == 0.42b0.dev",
30+
"opentelemetry-semantic-conventions == 0.42b0.dev",
3131
]
3232

3333
[project.optional-dependencies]
@@ -38,7 +38,7 @@ test = [
3838
"opentelemetry-instrumentation-boto[instruments]",
3939
"markupsafe==2.0.1",
4040
"moto~=2.0",
41-
"opentelemetry-test-utils == 0.41b0.dev",
41+
"opentelemetry-test-utils == 0.42b0.dev",
4242
]
4343

4444
[project.entry-points.opentelemetry_instrumentor]

‎instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.41b0.dev"
15+
__version__ = "0.42b0.dev"

‎instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.41b0.dev",
30-
"opentelemetry-semantic-conventions == 0.41b0.dev",
29+
"opentelemetry-instrumentation == 0.42b0.dev",
30+
"opentelemetry-semantic-conventions == 0.42b0.dev",
3131
"wrapt >= 1.0.0, < 2.0.0",
3232
]
3333

@@ -37,7 +37,7 @@ instruments = [
3737
]
3838
test = [
3939
"opentelemetry-instrumentation-boto3sqs[instruments]",
40-
"opentelemetry-test-utils == 0.41b0.dev",
40+
"opentelemetry-test-utils == 0.42b0.dev",
4141
]
4242

4343
[project.entry-points.opentelemetry_instrumentor]

‎instrumentation/opentelemetry-instrumentation-boto3sqs/src/opentelemetry/instrumentation/boto3sqs/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.41b0.dev"
15+
__version__ = "0.42b0.dev"

‎instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.41b0.dev",
30-
"opentelemetry-semantic-conventions == 0.41b0.dev",
29+
"opentelemetry-instrumentation == 0.42b0.dev",
30+
"opentelemetry-semantic-conventions == 0.42b0.dev",
3131
"opentelemetry-propagator-aws-xray == 1.0.1",
3232
]
3333

@@ -39,7 +39,7 @@ test = [
3939
"opentelemetry-instrumentation-botocore[instruments]",
4040
"markupsafe==2.0.1",
4141
"moto[all] ~= 2.2.6",
42-
"opentelemetry-test-utils == 0.41b0.dev",
42+
"opentelemetry-test-utils == 0.42b0.dev",
4343
]
4444

4545
[project.entry-points.opentelemetry_instrumentor]

‎instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.41b0.dev"
15+
__version__ = "0.42b0.dev"

0 commit comments

Comments
 (0)