Skip to content

Commit 8a76540

Browse files
committed
Merge branch 'issue-1747' of https://github.com/javferrod/opentelemetry-python-contrib into issue-1747
2 parents a552778 + 6ce77cf commit 8a76540

File tree

123 files changed

+1488
-491
lines changed

Some content is hidden

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

123 files changed

+1488
-491
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: e9530c5c548d08a6aaa56268d103f9beb00cd002
9+
CORE_REPO_SHA: c41b6bf29e9486a71ba1c40cd0ea35a03b2f7489
1010

1111
jobs:
1212
build:

CHANGELOG.md

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,39 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

88
## Unreleased
9+
10+
### Fixed
11+
12+
- `opentelemetry-instrumentation-asgi` Fix UnboundLocalError local variable 'start' referenced before assignment
13+
([#1889](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1889))
14+
15+
## Version 1.19.0/0.40b0 (2023-07-13)
916
- `opentelemetry-instrumentation-asgi` Add `http.server.request.size` metric
1017
([#1867](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1867))
1118

1219
### Fixed
1320

21+
- `opentelemetry-instrumentation-django` Fix empty span name when using
22+
`path("", ...)` ([#1788](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1788)
1423
- Fix elastic-search instrumentation sanitization to support bulk queries
1524
([#1870](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1870))
1625
- Update falcon instrumentation to follow semantic conventions
1726
([#1824](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1824))
18-
- Fix sqlalchemy instrumentation wrap methods to accept sqlcommenter options([#1873](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1873))
27+
- Fix sqlalchemy instrumentation wrap methods to accept sqlcommenter options
28+
([#1873](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1873))
1929

2030
### Added
2131

22-
- Fix async redis clients not being traced correctly ([#1830](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1830))
32+
- Add instrumentor support for mysqlclient
33+
([#1744](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1744))
34+
- Fix async redis clients not being traced correctly
35+
([#1830](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1830))
2336
- Make Flask request span attributes available for `start_span`.
2437
([#1784](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1784))
2538
- Fix falcon instrumentation's usage of Span Status to only set the description if the status code is ERROR.
2639
([#1840](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1840))
27-
- Instrument all httpx versions >= 0.18. ([#1748](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1748))
40+
- Instrument all httpx versions >= 0.18.
41+
([#1748](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1748))
2842
- Fix `Invalid type NoneType for attribute X (opentelemetry-instrumentation-aws-lambda)` error when some attributes do not exist
2943
([#1780](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1780))
3044
- Add metric instrumentation for celery
@@ -37,18 +51,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3751
([#1810](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1810))
3852
- `opentelemetry-instrumentation-urllib3` Add support for urllib3 version 2
3953
([#1879](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1879))
54+
- Add optional distro and configurator selection for auto-instrumentation
55+
([#1823](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1823))
4056

4157
### Added
4258
- `opentelemetry-instrumentation-kafka-python` Add instrumentation to `consume` method
4359
([#1786](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1786))
4460

4561
## Version 1.18.0/0.39b0 (2023-05-10)
4662

47-
- `opentelemetry-instrumentation-system-metrics` Add `process.` prefix to `runtime.memory`, `runtime.cpu.time`, and `runtime.gc_count`. Change `runtime.memory` from count to UpDownCounter. ([#1735](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1735))
63+
- Update runtime metrics to follow semantic conventions
64+
([#1735](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1735))
4865
- Add request and response hooks for GRPC instrumentation (client only)
4966
([#1706](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1706))
5067
- Fix memory leak in SQLAlchemy instrumentation where disposed `Engine` does not get garbage collected
51-
([#1771](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1771)
68+
([#1771](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1771))
5269
- `opentelemetry-instrumentation-pymemcache` Update instrumentation to support pymemcache >4
5370
([#1764](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1764))
5471
- `opentelemetry-instrumentation-confluent-kafka` Add support for higher versions of confluent_kafka
@@ -71,8 +88,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
7188

7289
### Changed
7390

74-
- `opentelemetry-instrumentation-botocore` now uses the AWS X-Ray propagator by
75-
default
91+
- `opentelemetry-instrumentation-botocore` now uses the AWS X-Ray propagator by default
7692
([#1741](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1741))
7793

7894
### Fixed
@@ -90,7 +106,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
90106

91107
### Changed
92108
- Update HTTP server/client instrumentation span names to comply with spec
93-
([#1759](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1759)
109+
([#1759](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1759))
94110

95111
## Version 1.17.0/0.38b0 (2023-03-22)
96112

@@ -143,6 +159,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
143159
([#1592](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1592))
144160
- `opentelemetry-instrumentation-django` Allow explicit `excluded_urls` configuration through `instrument()`
145161
([#1618](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1618))
162+
- `opentelemetry-instrumentation-aws-lambda` Use env var `_X_AMZN_TRACE_ID` as a
163+
Span Link instead of parent
164+
([#1657](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1657))
146165

147166
### Fixed
148167

_template/version.py

Lines changed: 1 addition & 1 deletion
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.40b0.dev"
15+
__version__ = "0.41b0.dev"

docs-requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ falcon~=2.0
3333
grpcio~=1.27
3434
kafka-python>=2.0,<3.0
3535
mysql-connector-python~=8.0
36+
mysqlclient~=2.1.1
3637
psutil>=5
3738
pika>=0.12.0
3839
pymongo~=3.1
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OpenTelemetry mysqlclient Instrumentation
2+
=========================================
3+
4+
.. automodule:: opentelemetry.instrumentation.mysqlclient
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

eachdist.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sortfirst=
1616
ext/*
1717

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

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

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

3939
packages=
4040
all

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

Lines changed: 1 addition & 1 deletion
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.40b0.dev"
15+
__version__ = "0.41b0.dev"

exporter/opentelemetry-exporter-richconsole/pyproject.toml

Lines changed: 1 addition & 1 deletion
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.40b0.dev",
30+
"opentelemetry-semantic-conventions == 0.41b0.dev",
3131
"rich>=10.0.0",
3232
]
3333

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

Lines changed: 1 addition & 1 deletion
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.40b0.dev"
15+
__version__ = "0.41b0.dev"

instrumentation/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
| [opentelemetry-instrumentation-kafka-python](./opentelemetry-instrumentation-kafka-python) | kafka-python >= 2.0 | No
2525
| [opentelemetry-instrumentation-logging](./opentelemetry-instrumentation-logging) | logging | No
2626
| [opentelemetry-instrumentation-mysql](./opentelemetry-instrumentation-mysql) | mysql-connector-python ~= 8.0 | No
27+
| [opentelemetry-instrumentation-mysqlclient](./opentelemetry-instrumentation-mysqlclient) | mysqlclient < 3 | No
2728
| [opentelemetry-instrumentation-pika](./opentelemetry-instrumentation-pika) | pika >= 0.12.0 | No
2829
| [opentelemetry-instrumentation-psycopg2](./opentelemetry-instrumentation-psycopg2) | psycopg2 >= 2.7.3.1 | No
2930
| [opentelemetry-instrumentation-pymemcache](./opentelemetry-instrumentation-pymemcache) | pymemcache >= 1.3.5, < 5 | No

0 commit comments

Comments
 (0)