Support PyMySQL 1.x series

owais · owais · commit 3498e8f49373 · 2021-11-05T22:16:35.000+05:30
Fixes open-telemetry#791
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#781](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/781))
 - `opentelemetry-instrumentation-aws-lambda` Add instrumentation for AWS Lambda Service - Implementation (Part 2/2)
   ([#777](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/777))
+- `opentelemetry-instrumentation-pymysql` Add support for PyMySQL 1.x series
+  ([#792](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/792))
 
 ### Fixed
 
diff --git a/instrumentation/README.md b/instrumentation/README.md
@@ -24,7 +24,7 @@
 | [opentelemetry-instrumentation-psycopg2](./opentelemetry-instrumentation-psycopg2) | psycopg2 >= 2.7.3.1 |
 | [opentelemetry-instrumentation-pymemcache](./opentelemetry-instrumentation-pymemcache) | pymemcache ~= 1.3 |
 | [opentelemetry-instrumentation-pymongo](./opentelemetry-instrumentation-pymongo) | pymongo ~= 3.1 |
-| [opentelemetry-instrumentation-pymysql](./opentelemetry-instrumentation-pymysql) | PyMySQL ~= 0.10.1 |
+| [opentelemetry-instrumentation-pymysql](./opentelemetry-instrumentation-pymysql) | PyMySQL < 2 |
 | [opentelemetry-instrumentation-pyramid](./opentelemetry-instrumentation-pyramid) | pyramid >= 1.7 |
 | [opentelemetry-instrumentation-redis](./opentelemetry-instrumentation-redis) | redis >= 2.6 |
 | [opentelemetry-instrumentation-requests](./opentelemetry-instrumentation-requests) | requests ~= 2.0 |
diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/src/opentelemetry/instrumentation/pymysql/package.py b/instrumentation/opentelemetry-instrumentation-pymysql/src/opentelemetry/instrumentation/pymysql/package.py
@@ -13,4 +13,4 @@
 # limitations under the License.
 
 
-_instruments = ("PyMySQL ~= 0.10.1",)
+_instruments = ("PyMySQL < 2",)
diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py
@@ -97,7 +97,7 @@
         "instrumentation": "opentelemetry-instrumentation-pymongo==0.25b2",
     },
     "PyMySQL": {
-        "library": "PyMySQL ~= 0.10.1",
+        "library": "PyMySQL < 2",
         "instrumentation": "opentelemetry-instrumentation-pymysql==0.25b2",
     },
     "pyramid": {
diff --git a/tox.ini b/tox.ini
@@ -462,7 +462,7 @@ deps =
   psycopg2 ~= 2.8.4
   aiopg >= 0.13.0, < 1.3.0
   sqlalchemy ~= 1.4
-  redis ~= 3.3.11
+  redis ~= 3.5
   celery[pytest] >= 4.0, < 6.0
   protobuf>=3.13.0
   requests==2.25.0

Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,4 @@`
`13`	`13`	`# limitations under the License.`
`14`	`14`
`15`	`15`
`16`		`-_instruments = ("PyMySQL ~= 0.10.1",)`
	`16`	`+_instruments = ("PyMySQL < 2",)`