fix: disable telemetry for rw splitting integration tests

Author: karenc-bq

aws_advanced_python_wrapper/utils/properties.py

@@ -11,6 +11,7 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
+
 import copy
 from typing import Any, Dict, Optional
 from urllib.parse import unquote

tests/integration/container/test_aurora_failover.py

@@ -74,16 +74,6 @@ def props(self):
             "autocommit": True
         })
 
-        features = TestEnvironment.get_current().get_features()
-        if TestEnvironmentFeatures.TELEMETRY_TRACES_ENABLED in features \
-                or TestEnvironmentFeatures.TELEMETRY_METRICS_ENABLED in features:
-            WrapperProperties.ENABLE_TELEMETRY.set(p, False)
-            WrapperProperties.TELEMETRY_SUBMIT_TOPLEVEL.set(p, False)
-        if TestEnvironmentFeatures.TELEMETRY_TRACES_ENABLED in features:
-            WrapperProperties.TELEMETRY_TRACES_BACKEND.set(p, "XRAY")
-        if TestEnvironmentFeatures.TELEMETRY_METRICS_ENABLED in features:
-            WrapperProperties.TELEMETRY_METRICS_BACKEND.set(p, "OTLP")
-
         return p
 
     @pytest.fixture(scope='class')

tests/integration/container/test_read_write_splitting.py

@@ -26,6 +26,7 @@
 from aws_advanced_python_wrapper.host_list_provider import RdsHostListProvider
 from aws_advanced_python_wrapper.sql_alchemy_connection_provider import \
     SqlAlchemyPooledConnectionProvider
+from aws_advanced_python_wrapper.utils.log import Logger
 from aws_advanced_python_wrapper.utils.properties import (Properties,
                                                           WrapperProperties)
 from tests.integration.container.utils.conditions import (
@@ -51,6 +52,15 @@
                       TestEnvironmentFeatures.BLUE_GREEN_DEPLOYMENT,
                       TestEnvironmentFeatures.PERFORMANCE])
 class TestReadWriteSplitting:
+
+    logger = Logger(__name__)
+
+    @pytest.fixture(autouse=True)
+    def setup_method(self, request):
+        self.logger.info(f"Starting test: {request.node.name}")
+        yield
+        self.logger.info(f"Ending test: {request.node.name}")
+
     @pytest.fixture(scope='class')
     def rds_utils(self):
         region: str = TestEnvironment.get_current().get_info().get_region()
@@ -64,20 +74,7 @@ def clear_caches(self):
 
     @pytest.fixture(scope='class')
     def props(self):
-        p: Properties = Properties({"plugins": "read_write_splitting", "connect_timeout": 30, "autocommit": True})
-
-        if TestEnvironmentFeatures.TELEMETRY_TRACES_ENABLED in TestEnvironment.get_current().get_features() \
-                or TestEnvironmentFeatures.TELEMETRY_METRICS_ENABLED in TestEnvironment.get_current().get_features():
-            WrapperProperties.ENABLE_TELEMETRY.set(p, "True")
-            WrapperProperties.TELEMETRY_SUBMIT_TOPLEVEL.set(p, "True")
-
-        if TestEnvironmentFeatures.TELEMETRY_TRACES_ENABLED in TestEnvironment.get_current().get_features():
-            WrapperProperties.TELEMETRY_TRACES_BACKEND.set(p, "XRAY")
-
-        if TestEnvironmentFeatures.TELEMETRY_METRICS_ENABLED in TestEnvironment.get_current().get_features():
-            WrapperProperties.TELEMETRY_METRICS_BACKEND.set(p, "OTLP")
-
-        return p
+        return Properties({"plugins": "read_write_splitting", "socket_timeout": 10, "connect_timeout": 10, "autocommit": True})
 
     @pytest.fixture(scope='class')
     def failover_props(self):