Merge remote-tracking branch 'origin/feature/valkey' into feature/valkey

Author: sightseeker

CHANGELOG.md

@@ -11,10 +11,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## Version 1.33.0/0.54b0 (2025-05-09)
+
 ### Added
 
 - `opentelemetry-instrumentation-valkey` Instrumentation for Valkey
   ([#3478](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3478))
+- `opentelemetry-instrumentation-requests` Support explicit_bucket_boundaries_advisory in duration metrics
+  ([#3464](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3464))
+- `opentelemetry-instrumentation-redis` Add support for redis client-specific instrumentation.
+  ([#3143](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3143))
 
 ### Fixed
 
@@ -31,6 +37,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3380](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3381))
 - `opentelemetry-instrumentation-[asynclick/click]` Add missing opentelemetry-instrumentation dep
   ([#3447](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3447))
+- `opentelemetry-instrumentation-botocore` Capture server attributes for botocore API calls
+  ([#3448](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3448))
+
 
 ## Version 1.32.0/0.53b0 (2025-04-10)
 

_template/version.py

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

docs/conf.py

@@ -122,6 +122,7 @@
         "https://opentelemetry-python.readthedocs.io/en/latest/",
         None,
     ),
+    "redis": ("https://redis-py.readthedocs.io/en/latest/", None),
 }
 
 # http://www.sphinx-doc.org/en/master/config.html#confval-nitpicky

docs/instrumentation/redis/redis.rst

@@ -1,7 +1,10 @@
-OpenTelemetry Redis Instrumentation
-===================================
+.. include:: ../../../instrumentation/opentelemetry-instrumentation-redis/README.rst
+    :end-before: References
+
+Usage
+-----
 
 .. automodule:: opentelemetry.instrumentation.redis
     :members:
     :undoc-members:
-    :show-inheritance:
+    :show-inheritance:

eachdist.ini

@@ -16,7 +16,7 @@ sortfirst=
     ext/*
 
 [stable]
-version=1.33.0.dev
+version=1.34.0.dev
 
 packages=
     opentelemetry-sdk
@@ -34,7 +34,7 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.54b0.dev
+version=0.55b0.dev
 
 packages=
     all

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

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

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

@@ -2,7 +2,7 @@ asgiref==3.8.1
 certifi==2024.7.4
 charset-normalizer==3.3.2
 # We can drop this after bumping baseline to pypy-39
-cramjam==2.1.0; platform_python_implementation == "PyPy"
+cramjam==2.8.0; platform_python_implementation == "PyPy"
 cramjam==2.8.4; platform_python_implementation != "PyPy"
 Deprecated==1.2.14
 idna==3.7

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

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import unittest
+from platform import python_implementation
 from unittest.mock import patch
 
 import pytest
@@ -282,6 +283,10 @@ def test_invalid_tls_config_key_only_param(self):
             )
 
 
+@pytest.mark.skipif(
+    python_implementation() == "PyPy",
+    reason="Fails with pypy 3.8, bump cramjam when 3.9 is baseline",
+)
 # Ensures export is successful with valid export_records and config
 @patch("requests.post")
 def test_valid_export(mock_post, prom_rw, metric):

exporter/opentelemetry-exporter-richconsole/pyproject.toml

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

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

@@ -68,7 +68,9 @@
 
 
 def _ns_to_time(nanoseconds):
-    ts = datetime.datetime.utcfromtimestamp(nanoseconds / 1e9)
+    ts = datetime.datetime.fromtimestamp(
+        nanoseconds / 1e9, datetime.timezone.utc
+    )
     return ts.strftime("%H:%M:%S.%f")
 
 

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

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

instrumentation-genai/opentelemetry-instrumentation-google-genai/CHANGELOG.md

@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-## Version 0.2b0 (2025-04-25)
+## Version 0.2b0 (2025-04-28)
 
 - Add more request configuration options to the span attributes ([#3374](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3374))
 - Restructure tests to keep in line with repository conventions ([#3344](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3344))

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

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

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

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

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

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

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

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

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

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

instrumentation/opentelemetry-instrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/version.py

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

instrumentation/opentelemetry-instrumentation-aiokafka/pyproject.toml

@@ -27,8 +27,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.27",
-  "opentelemetry-instrumentation == 0.54b0.dev",
-  "opentelemetry-semantic-conventions == 0.54b0.dev",
+  "opentelemetry-instrumentation == 0.55b0.dev",
+  "opentelemetry-semantic-conventions == 0.55b0.dev",
 ]
 
 [project.optional-dependencies]

instrumentation/opentelemetry-instrumentation-aiokafka/src/opentelemetry/instrumentation/aiokafka/__init__.py

@@ -20,20 +20,35 @@
 
 .. code:: python
 
+    import asyncio
     from opentelemetry.instrumentation.aiokafka import AIOKafkaInstrumentor
     from aiokafka import AIOKafkaProducer, AIOKafkaConsumer
 
     # Instrument kafka
     AIOKafkaInstrumentor().instrument()
 
     # report a span of type producer with the default settings
-    producer = AIOKafkaProducer(bootstrap_servers=['localhost:9092'])
-    await producer.send('my-topic', b'raw_bytes')
+    async def produce():
+        producer = AIOKafkaProducer(bootstrap_servers=['localhost:9092'])
+        await producer.start()
+        try:
+            await producer.send_and_wait('my-topic', b'raw_bytes')
+        finally:
+            await producer.stop()
 
     # report a span of type consumer with the default settings
-    consumer = AIOKafkaConsumer('my-topic', group_id='my-group', bootstrap_servers=['localhost:9092'])
-    async for message in consumer:
-    # process message
+    async def consume():
+        consumer = AIOKafkaConsumer('my-topic', group_id='my-group', bootstrap_servers=['localhost:9092'])
+        await consumer.start()
+        try:
+            async for message in consumer:
+                # process message
+                print(message)
+        finally:
+            await consumer.stop()
+
+    asyncio.run(produce())
+    asyncio.run(consume())
 
 The _instrument() method accepts the following keyword args:
 tracer_provider (TracerProvider) - an optional tracer provider
@@ -47,12 +62,14 @@ def async_consume_hook(span: Span, record: kafka.record.ABCRecord, args, kwargs)
 
 .. code:: python
 
-    from opentelemetry.instrumentation.kafka import AIOKafkaInstrumentor
+    import asyncio
+    from opentelemetry.instrumentation.aiokafka import AIOKafkaInstrumentor
     from aiokafka import AIOKafkaProducer, AIOKafkaConsumer
 
     async def async_produce_hook(span, args, kwargs):
         if span and span.is_recording():
             span.set_attribute("custom_user_attribute_from_async_response_hook", "some-value")
+
     async def async_consume_hook(span, record, args, kwargs):
         if span and span.is_recording():
             span.set_attribute("custom_user_attribute_from_consume_hook", "some-value")
@@ -62,8 +79,15 @@ async def async_consume_hook(span, record, args, kwargs):
 
     # Using kafka as normal now will automatically generate spans,
     # including user custom attributes added from the hooks
-    producer = AIOKafkaProducer(bootstrap_servers=['localhost:9092'])
-    await producer.send('my-topic', b'raw_bytes')
+    async def produce():
+        producer = AIOKafkaProducer(bootstrap_servers=['localhost:9092'])
+        await producer.start()
+        try:
+            await producer.send_and_wait('my-topic', b'raw_bytes')
+        finally:
+            await producer.stop()
+
+    asyncio.run(produce())
 
 API
 ___

instrumentation/opentelemetry-instrumentation-aiokafka/src/opentelemetry/instrumentation/aiokafka/version.py

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

instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml

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

instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/__init__.py

@@ -23,40 +23,53 @@
 
 .. code-block:: python
 
+    import asyncio
     import aiopg
     from opentelemetry.instrumentation.aiopg import AiopgInstrumentor
     # Call instrument() to wrap all database connections
     AiopgInstrumentor().instrument()
 
-    cnx = await aiopg.connect(database='Database')
-    cursor = await cnx.cursor()
-    await cursor.execute("CREATE TABLE IF NOT EXISTS test (testField INTEGER)")
-    await cursor.execute("INSERT INTO test (testField) VALUES (123)")
-    cursor.close()
-    cnx.close()
+    dsn = 'user=user password=password host=127.0.0.1'
 
-    pool = await aiopg.create_pool(database='Database')
+    async def connect():
+        cnx = await aiopg.connect(dsn)
+        cursor = await cnx.cursor()
+        await cursor.execute("CREATE TABLE IF NOT EXISTS test (testField INTEGER)")
+        await cursor.execute("INSERT INTO test (testField) VALUES (123)")
+        cursor.close()
+        cnx.close()
 
-    cnx = await pool.acquire()
-    cursor = await cnx.cursor()
-    await cursor.execute("CREATE TABLE IF NOT EXISTS test (testField INTEGER)")
-    await cursor.execute("INSERT INTO test (testField) VALUES (123)")
-    cursor.close()
-    cnx.close()
+    async def create_pool():
+        pool = await aiopg.create_pool(dsn)
+        cnx = await pool.acquire()
+        cursor = await cnx.cursor()
+        await cursor.execute("CREATE TABLE IF NOT EXISTS test (testField INTEGER)")
+        await cursor.execute("INSERT INTO test (testField) VALUES (123)")
+        cursor.close()
+        cnx.close()
+
+    asyncio.run(connect())
+    asyncio.run(create_pool())
 
 .. code-block:: python
 
+    import asyncio
     import aiopg
     from opentelemetry.instrumentation.aiopg import AiopgInstrumentor
 
+    dsn = 'user=user password=password host=127.0.0.1'
+
     # Alternatively, use instrument_connection for an individual connection
-    cnx = await aiopg.connect(database='Database')
-    instrumented_cnx = AiopgInstrumentor().instrument_connection(cnx)
-    cursor = await instrumented_cnx.cursor()
-    await cursor.execute("CREATE TABLE IF NOT EXISTS test (testField INTEGER)")
-    await cursor.execute("INSERT INTO test (testField) VALUES (123)")
-    cursor.close()
-    instrumented_cnx.close()
+    async def go():
+        cnx = await aiopg.connect(dsn)
+        instrumented_cnx = AiopgInstrumentor().instrument_connection(cnx)
+        cursor = await instrumented_cnx.cursor()
+        await cursor.execute("CREATE TABLE IF NOT EXISTS test (testField INTEGER)")
+        await cursor.execute("INSERT INTO test (testField) VALUES (123)")
+        cursor.close()
+        instrumented_cnx.close()
+
+    asyncio.run(go())
 
 API
 ---

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

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

instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml

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

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

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