From b1b9be0813e81f19567f6ce6234f60d44a4a39e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Em=C3=ADdio=20Neto?=
 <9735060+emdneto@users.noreply.github.com>
Date: Wed, 10 Jul 2024 14:20:44 -0300
Subject: [PATCH 1/2] Fix lint-instrumentation-mysqlclient in tox.ini (#2691)

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 33f0242c5a..529e2a76c0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -953,7 +953,7 @@ commands =
   lint-instrumentation-mysqlclient: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient
   lint-instrumentation-mysqlclient: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient
   lint-instrumentation-mysqlclient: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient
-  lint-instrumentation-mysqliclient: sh -c "cd instrumentation && pylint --rcfile ../.pylintrc opentelemetry-instrumentation-mysqliclient"
+  lint-instrumentation-mysqlclient: sh -c "cd instrumentation && pylint --rcfile ../.pylintrc opentelemetry-instrumentation-mysqlclient"
 
   test-instrumentation-sio-pika: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/tests {posargs}
   lint-instrumentation-sio-pika: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-pika

From 0b20c955faafbd12f661348a6362bb60077a64f2 Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Date: Wed, 10 Jul 2024 19:31:35 +0200
Subject: [PATCH 2/2] exporter/prometheus-remote-write: fix test requirements
 for pypy (#2692)

---
 .../test-requirements.txt                                     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt b/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt
index a32c442bf9..ec8f90336d 100644
--- a/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt
+++ b/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt
@@ -1,7 +1,9 @@
 asgiref==3.7.2
 certifi==2024.2.2
 charset-normalizer==3.3.2
-cramjam==2.8.1
+# We can drop this after bumping baseline to pypy-39
+cramjam==2.1.0; platform_python_implementation == "PyPy"
+cramjam==2.8.1; platform_python_implementation != "PyPy"
 Deprecated==1.2.14
 idna==3.7
 importlib-metadata==6.11.0