Skip to content

Commit 6e8e175

Browse files
nao23nao23
committed
Merge branch 'main' into feature/dbapi-instrument-respect-suppress-instrumentation
2 parents ce6ee40 + 4a1e0ce commit 6e8e175

File tree

131 files changed

+1133
-518
lines changed

Some content is hidden

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

131 files changed

+1133
-518
lines changed

‎CHANGELOG.md

Lines changed: 8 additions & 0 deletions

‎_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.54b0.dev"
15+
__version__ = "0.55b0.dev"

‎docs/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
"https://opentelemetry-python.readthedocs.io/en/latest/",
123123
None,
124124
),
125+
"redis": ("https://redis-py.readthedocs.io/en/latest/", None),
125126
}
126127

127128
# http://www.sphinx-doc.org/en/master/config.html#confval-nitpicky

‎docs/instrumentation/redis/redis.rst

Lines changed: 6 additions & 3 deletions

‎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.33.0.dev
19+
version=1.34.0.dev
2020

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

3636
[prerelease]
37-
version=0.54b0.dev
37+
version=0.55b0.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.54b0.dev"
15+
__version__ = "0.55b0.dev"

‎exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ asgiref==3.8.1
22
certifi==2024.7.4
33
charset-normalizer==3.3.2
44
# We can drop this after bumping baseline to pypy-39
5-
cramjam==2.1.0; platform_python_implementation == "PyPy"
5+
cramjam==2.8.0; platform_python_implementation == "PyPy"
66
cramjam==2.8.4; platform_python_implementation != "PyPy"
77
Deprecated==1.2.14
88
idna==3.7

‎exporter/opentelemetry-exporter-prometheus-remote-write/tests/test_prometheus_remote_write_exporter.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# limitations under the License.
1414

1515
import unittest
16+
from platform import python_implementation
1617
from unittest.mock import patch
1718

1819
import pytest
@@ -282,6 +283,10 @@ def test_invalid_tls_config_key_only_param(self):
282283
)
283284

284285

286+
@pytest.mark.skipif(
287+
python_implementation() == "PyPy",
288+
reason="Fails with pypy 3.8, bump cramjam when 3.9 is baseline",
289+
)
285290
# Ensures export is successful with valid export_records and config
286291
@patch("requests.post")
287292
def test_valid_export(mock_post, prom_rw, metric):

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ classifiers = [
2828
dependencies = [
2929
"opentelemetry-api ~= 1.12",
3030
"opentelemetry-sdk ~= 1.12",
31-
"opentelemetry-semantic-conventions == 0.54b0.dev",
31+
"opentelemetry-semantic-conventions == 0.55b0.dev",
3232
"rich>=10.0.0",
3333
]
3434

‎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.54b0.dev"
15+
__version__ = "0.55b0.dev"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.5",
30-
"opentelemetry-instrumentation == 0.54b0.dev",
30+
"opentelemetry-instrumentation == 0.55b0.dev",
3131
"wrapt >= 1.0.0, < 2.0.0",
3232
]
3333

‎instrumentation/opentelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/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.54b0.dev"
15+
__version__ = "0.55b0.dev"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.12",
30-
"opentelemetry-instrumentation == 0.54b0.dev",
31-
"opentelemetry-semantic-conventions == 0.54b0.dev",
32-
"opentelemetry-util-http == 0.54b0.dev",
30+
"opentelemetry-instrumentation == 0.55b0.dev",
31+
"opentelemetry-semantic-conventions == 0.55b0.dev",
32+
"opentelemetry-util-http == 0.55b0.dev",
3333
"wrapt >= 1.0.0, < 2.0.0",
3434
]
3535

‎instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/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.54b0.dev"
15+
__version__ = "0.55b0.dev"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.12",
30-
"opentelemetry-instrumentation == 0.54b0.dev",
31-
"opentelemetry-semantic-conventions == 0.54b0.dev",
32-
"opentelemetry-util-http == 0.54b0.dev",
30+
"opentelemetry-instrumentation == 0.55b0.dev",
31+
"opentelemetry-semantic-conventions == 0.55b0.dev",
32+
"opentelemetry-util-http == 0.55b0.dev",
3333
"wrapt >= 1.0.0, < 2.0.0",
3434
]
3535

‎instrumentation/opentelemetry-instrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/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.54b0.dev"
15+
__version__ = "0.55b0.dev"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.27",
30-
"opentelemetry-instrumentation == 0.54b0.dev",
31-
"opentelemetry-semantic-conventions == 0.54b0.dev",
30+
"opentelemetry-instrumentation == 0.55b0.dev",
31+
"opentelemetry-semantic-conventions == 0.55b0.dev",
3232
]
3333

3434
[project.optional-dependencies]

‎instrumentation/opentelemetry-instrumentation-aiokafka/src/opentelemetry/instrumentation/aiokafka/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.54b0.dev"
15+
__version__ = "0.55b0.dev"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.12",
30-
"opentelemetry-instrumentation == 0.54b0.dev",
31-
"opentelemetry-instrumentation-dbapi == 0.54b0.dev",
30+
"opentelemetry-instrumentation == 0.55b0.dev",
31+
"opentelemetry-instrumentation-dbapi == 0.55b0.dev",
3232
"wrapt >= 1.0.0, < 2.0.0",
3333
]
3434

‎instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/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.54b0.dev"
15+
__version__ = "0.55b0.dev"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ classifiers = [
2828
dependencies = [
2929
"asgiref ~= 3.0",
3030
"opentelemetry-api ~= 1.12",
31-
"opentelemetry-instrumentation == 0.54b0.dev",
32-
"opentelemetry-semantic-conventions == 0.54b0.dev",
33-
"opentelemetry-util-http == 0.54b0.dev",
31+
"opentelemetry-instrumentation == 0.55b0.dev",
32+
"opentelemetry-semantic-conventions == 0.55b0.dev",
33+
"opentelemetry-util-http == 0.55b0.dev",
3434
]
3535

3636
[project.optional-dependencies]

‎instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/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.54b0.dev"
15+
__version__ = "0.55b0.dev"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.12",
30-
"opentelemetry-instrumentation == 0.54b0.dev",
31-
"opentelemetry-semantic-conventions == 0.54b0.dev",
30+
"opentelemetry-instrumentation == 0.55b0.dev",
31+
"opentelemetry-semantic-conventions == 0.55b0.dev",
3232
"wrapt ~= 1.0",
3333
"typing_extensions ~= 4.12",
3434
]

‎instrumentation/opentelemetry-instrumentation-asyncclick/src/opentelemetry/instrumentation/asyncclick/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.54b0.dev"
15+
__version__ = "0.55b0.dev"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.14",
30-
"opentelemetry-instrumentation == 0.54b0.dev",
31-
"opentelemetry-semantic-conventions == 0.54b0.dev",
30+
"opentelemetry-instrumentation == 0.55b0.dev",
31+
"opentelemetry-semantic-conventions == 0.55b0.dev",
3232
"wrapt >= 1.0.0, < 2.0.0",
3333
]
3434

‎instrumentation/opentelemetry-instrumentation-asyncio/src/opentelemetry/instrumentation/asyncio/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.54b0.dev"
15+
__version__ = "0.55b0.dev"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.12",
30-
"opentelemetry-instrumentation == 0.54b0.dev",
31-
"opentelemetry-semantic-conventions == 0.54b0.dev",
30+
"opentelemetry-instrumentation == 0.55b0.dev",
31+
"opentelemetry-semantic-conventions == 0.55b0.dev",
3232
]
3333

3434
[project.optional-dependencies]

‎instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/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.54b0.dev"
15+
__version__ = "0.55b0.dev"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
"Programming Language :: Python :: 3.13",
2727
]
2828
dependencies = [
29-
"opentelemetry-instrumentation == 0.54b0.dev",
30-
"opentelemetry-semantic-conventions == 0.54b0.dev",
29+
"opentelemetry-instrumentation == 0.55b0.dev",
30+
"opentelemetry-semantic-conventions == 0.55b0.dev",
3131
"opentelemetry-propagator-aws-xray ~= 1.0",
3232
]
3333

‎instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/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.54b0.dev"
15+
__version__ = "0.55b0.dev"

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

Lines changed: 2 additions & 2 deletions
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.54b0.dev",
30-
"opentelemetry-semantic-conventions == 0.54b0.dev",
29+
"opentelemetry-instrumentation == 0.55b0.dev",
30+
"opentelemetry-semantic-conventions == 0.55b0.dev",
3131
]
3232

3333
[project.optional-dependencies]

‎instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/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.54b0.dev"
15+
__version__ = "0.55b0.dev"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.12",
30-
"opentelemetry-instrumentation == 0.54b0.dev",
31-
"opentelemetry-semantic-conventions == 0.54b0.dev",
30+
"opentelemetry-instrumentation == 0.55b0.dev",
31+
"opentelemetry-semantic-conventions == 0.55b0.dev",
3232
"wrapt >= 1.0.0, < 2.0.0",
3333
]
3434

‎instrumentation/opentelemetry-instrumentation-boto3sqs/src/opentelemetry/instrumentation/boto3sqs/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.54b0.dev"
15+
__version__ = "0.55b0.dev"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.30",
30-
"opentelemetry-instrumentation == 0.54b0.dev",
31-
"opentelemetry-semantic-conventions == 0.54b0.dev",
30+
"opentelemetry-instrumentation == 0.55b0.dev",
31+
"opentelemetry-semantic-conventions == 0.55b0.dev",
3232
"opentelemetry-propagator-aws-xray ~= 1.0",
3333
]
3434

‎instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/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.54b0.dev"
15+
__version__ = "0.55b0.dev"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.12",
30-
"opentelemetry-instrumentation == 0.54b0.dev",
31-
"opentelemetry-semantic-conventions == 0.54b0.dev",
30+
"opentelemetry-instrumentation == 0.55b0.dev",
31+
"opentelemetry-semantic-conventions == 0.55b0.dev",
3232
"wrapt >= 1.0.0, < 2.0.0",
3333
]
3434

‎instrumentation/opentelemetry-instrumentation-cassandra/src/opentelemetry/instrumentation/cassandra/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.54b0.dev"
15+
__version__ = "0.55b0.dev"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.12",
30-
"opentelemetry-instrumentation == 0.54b0.dev",
31-
"opentelemetry-semantic-conventions == 0.54b0.dev",
30+
"opentelemetry-instrumentation == 0.55b0.dev",
31+
"opentelemetry-semantic-conventions == 0.55b0.dev",
3232
]
3333

3434
[project.optional-dependencies]

‎instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/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.54b0.dev"
15+
__version__ = "0.55b0.dev"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.12",
30-
"opentelemetry-instrumentation == 0.54b0.dev",
31-
"opentelemetry-semantic-conventions == 0.54b0.dev",
30+
"opentelemetry-instrumentation == 0.55b0.dev",
31+
"opentelemetry-semantic-conventions == 0.55b0.dev",
3232
"wrapt >= 1.0.0, < 2.0.0",
3333
]
3434

‎instrumentation/opentelemetry-instrumentation-click/src/opentelemetry/instrumentation/click/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.54b0.dev"
15+
__version__ = "0.55b0.dev"

0 commit comments

Comments
 (0)