sync the log types on container updates

Author: reubenmiller

pkg/app/app.go

@@ -625,5 +625,10 @@ func (a *App) doUpdate(filterOptions container.FilterOptions) error {
 		}
 	}
 
+	// Update tedge-agent log types
+	if err := a.client.SyncLogTypes(tedgeClient.Target); err != nil {
+		slog.Warn("Failed to send tedge-agent sync request to update the log types", "err", err)
+	}
+
 	return nil
 }

pkg/tedge/tedge.go

@@ -241,6 +241,13 @@ func (c *Client) Publish(topic string, qos byte, retained bool, payload any) err
 	return tok.Error()
 }
 
+// SyncLogTypes sends a signal to the tedge-agent to refresh the list of log types
+// so that it will include any new containers which may of been added
+func (c *Client) SyncLogTypes(target Target) error {
+	topic := GetTopic(*c.Target.Service("tedge-agent"), "signal", "sync_log_upload")
+	return c.Publish(topic, 0, false, "{}")
+}
+
 // Deregister a thin-edge.io entity
 // Clear the status health topic as well as the registration topic
 func (c *Client) DeregisterEntity(target Target, retainedTopicPartials ...string) error {

tests/container-logs.robot

@@ -35,10 +35,6 @@ Get Container Logs with only last N lines
 Get Container Logs By Operation
     # Run dummy container then exit
     DeviceLibrary.Execute Command    cmd=tedge-container tools container-remove app14 ||: ; tedge-container engine docker run --name app14 httpd:2.4.61-alpine sh -c 'echo hello inside container stdout; echo hello inside container stderr >&2;'
-    
-    # FIXME: Remove once tedge-agent supports an official interface to reload the config
-    Execute Command    cmd=touch /usr/share/tedge/log-plugins/container
-
     Cumulocity.Should Contain Supported Log Types    app14::container
     ${operation}=    Cumulocity.Get Log File    app14::container
     Operation Should Be SUCCESSFUL    ${operation}

tests/operations.robot

@@ -75,6 +75,8 @@ Install/uninstall container package
     Device Should Not Have Installed Software    webserver
     Cumulocity.Should Have Services    name=webserver    service_type=container    min_count=0    max_count=0
 
+    # container's log type should be removed
+    Cumulocity.Should Not Contain Supported Log Types    webserver::container
 
 Install/uninstall container package from file
     ${binary_url}=    Cumulocity.Create Inventory Binary    app3    container    file=${CURDIR}/data/apps/app3.tar
@@ -101,6 +103,9 @@ Manual container creation/deletion
     Should Contain    ${operation.to_json()["c8y_Command"]["result"]}    It works!
     Cumulocity.Should Have Services    name=manualapp1    service_type=container    status=up
 
+    # container's log type should of been added
+    Cumulocity.Should Contain Supported Log Types    manualapp1::container
+
     # Pause
     ${operation}=    Cumulocity.Execute Shell Command    sudo tedge-container engine docker pause manualapp1;
     Operation Should Be SUCCESSFUL    ${operation}
@@ -116,6 +121,8 @@ Manual container creation/deletion
     Operation Should Be SUCCESSFUL    ${operation}
     Cumulocity.Should Have Services    name=manualapp1    service_type=container    min_count=0    max_count=0    timeout=10
 
+    # container's log type should be removed
+    Cumulocity.Should Not Contain Supported Log Types    manualapp1::container
 
 Manual container creation/deletion with error on run
     ${operation}=    Cumulocity.Execute Shell Command    sudo tedge-container engine docker run -d --name manualapp2 httpd:2.4 --invalid-arg || exit 0

tests/requirements.txt

@@ -1,4 +1,4 @@
 robotframework~=7.0.0
-robotframework-c8y @ git+https://github.com/reubenmiller/robotframework-c8y.git@0.47.0
-robotframework-devicelibrary[docker] @ git+https://github.com/reubenmiller/[email protected].0
+robotframework-c8y @ git+https://github.com/reubenmiller/robotframework-c8y.git@0.50.0
+robotframework-devicelibrary[docker] @ git+https://github.com/reubenmiller/[email protected].1
 robotframework-debuglibrary~=2.5.0