fix: DPE-7497 ensure early logging_provider relation wont break init (#616)

* avoid race on early relation to logging provider

* limit test to amd64

* passwordless ssh on runner

* libpatch bump

* revert lib changes as its not needed

Author: paulomach

src/charm.py

@@ -325,7 +325,7 @@ def unit_initialized(self, raise_exceptions: bool = False) -> bool:
         """
         container = self.unit.get_container(CONTAINER_NAME)
         if container.can_connect():
-            return super().unit_initialized()
+            return super().unit_initialized(raise_exceptions)
         else:
             return False
 

src/log_rotation_setup.py

@@ -92,11 +92,17 @@ def _update_logs_rotation(self, _):
         self.charm.unit_peer_data[_LOGS_SYNCED] = "true"
         self.setup()
 
-    def _cos_relation_created(self, _):
+    def _cos_relation_created(self, event):
         """Handle relation created."""
         container = self.charm.unit.get_container(CONTAINER_NAME)
         if not container.can_connect():
             return
+
+        if not self.charm.app_peer_data.get("cluster-name"):
+            event.defer()
+            logger.info("Cluster name not set, deferring log rotation setup")
+            return
+
         logger.info("Reconfigure log rotation on cos relation created")
         self.setup()
 

tests/integration/bundle_templates/grafana_agent_integration.j2

@@ -13,4 +13,7 @@ applications:
     channel: 1/stable
     scale: 1
 relations:
-  - [mysql-k8s:metrics-endpoint, grafana-agent-k8s:metrics-endpoint]
+  - - grafana-agent-k8s:logging-provider
+    - mysql-k8s:logging
+  - - grafana-agent-k8s:metrics-endpoint
+    - mysql-k8s:metrics-endpoint

tests/integration/test_cos_integration_bundle.py

@@ -11,13 +11,17 @@
 import yaml
 from pytest_operator.plugin import OpsTest
 
+from . import markers
+
 logger = logging.getLogger(__name__)
 
 METADATA = yaml.safe_load(pathlib.Path("./metadata.yaml").read_text())
 IMAGE_SOURCE = METADATA["resources"]["mysql-image"]["upstream-source"]
 TIMEOUT = 10 * 60
 
 
+# TODO: remove after https://github.com/canonical/grafana-agent-k8s-operator/issues/309 fixed
+@markers.amd64_only
 @pytest.mark.abort_on_fail
 async def test_deploy_bundle_with_cos_integrations(ops_test: OpsTest, charm) -> None:
     """Test COS integrations formed before mysql is allocated and deployed."""