Fix MySQL metric name in tests (#592)

* Fix mysql metric name test

* Fix version gating

* Fix version gating again

* Remove py36 testing

* Add cache ignore for pip

* Pip cache purge

* Revert "Pip cache purge"

This reverts commit 3b9eac2.

* Remove caching changes

Author: TimPansino

tests/datastore_mysql/test_database.py

@@ -25,8 +25,14 @@
 DB_NAMESPACE = DB_SETTINGS["namespace"]
 DB_PROCEDURE = "hello_" + DB_NAMESPACE
 
+mysql_version = tuple(int(x) for x in mysql.connector.__version__.split(".")[:3])
+if mysql_version >= (8, 0, 30):
+    _connector_metric_name = 'Function/mysql.connector.pooling:connect'
+else:
+    _connector_metric_name = 'Function/mysql.connector:connect'
+
 _test_execute_via_cursor_scoped_metrics = [
-        ('Function/mysql.connector:connect', 1),
+        (_connector_metric_name, 1),
         ('Datastore/statement/MySQL/datastore_mysql_%s/select' % DB_NAMESPACE, 1),
         ('Datastore/statement/MySQL/datastore_mysql_%s/insert' % DB_NAMESPACE, 1),
         ('Datastore/statement/MySQL/datastore_mysql_%s/update' % DB_NAMESPACE, 1),
@@ -103,7 +109,7 @@ def test_execute_via_cursor(table_name):
     connection.commit()
 
 _test_connect_using_alias_scoped_metrics = [
-        ('Function/mysql.connector:connect', 1),
+        (_connector_metric_name, 1),
         ('Datastore/statement/MySQL/datastore_mysql_%s/select' % DB_NAMESPACE, 1),
         ('Datastore/statement/MySQL/datastore_mysql_%s/insert' % DB_NAMESPACE, 1),
         ('Datastore/statement/MySQL/datastore_mysql_%s/update' % DB_NAMESPACE, 1),

tox.ini

@@ -74,7 +74,7 @@ envlist =
     elasticsearchserver07-datastore_elasticsearch-{py27,py36,py37,py38,py39,py310,pypy,pypy36}-elasticsearch{07},
     memcached-datastore_memcache-{py27,py36,py37,py38,py39,py310,pypy,pypy36}-memcached01,
     mysql-datastore_mysql-mysql080023-py27,
-    mysql-datastore_mysql-mysqllatest-{py36,py37,py38,py39,py310},
+    mysql-datastore_mysql-mysqllatest-{py37,py38,py39,py310},
     postgres-datastore_postgresql-{py36,py37,py38,py39},
     postgres-datastore_psycopg2-{py27,py36,py37,py38,py39,py310}-psycopg20208,
     postgres-datastore_psycopg2cffi-{py27,py36,pypy}-psycopg2cffi{0207,0208},