Merge branch 'main' into main

Author: marcm-ml

CHANGELOG.md

@@ -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"

_template/version.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/conf.py

@@ -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

docs/instrumentation/redis/redis.rst

@@ -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"

eachdist.ini

@@ -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/src/opentelemetry/exporter/prometheus_remote_write/version.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-prometheus-remote-write/test-requirements.txt

@@ -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-prometheus-remote-write/tests/test_prometheus_remote_write_exporter.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"