fix(examples): fix example tests (#52)

Signed-off-by: Michele Papalini <[email protected]>

Author: micpapal

data-plane/config/base/client-config.yaml

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 tracing:
-  log_level: debug
+  log_level: info
   display_thread_names: true
   display_thread_ids: true
 

data-plane/config/base/server-config.yaml

@@ -5,10 +5,6 @@ tracing:
   log_level: debug
   display_thread_names: true
   display_thread_ids: true
-  opentelemetry:
-    enabled: true
-    service_name: "data-plane-gateway"
-    service_version: "v0.1.0"
 
 runtime:
   n_cores: 0

data-plane/examples/src/sdk-mock/config/config.yaml renamed to data-plane/config/base/server-otel-config.yaml

@@ -2,9 +2,13 @@
 # SPDX-License-Identifier: Apache-2.0
 
 tracing:
-  log_level: info
+  log_level: debug
   display_thread_names: true
   display_thread_ids: true
+  opentelemetry:
+    enabled: true
+    service_name: "data-plane-gateway"
+    service_version: "v0.1.0"
 
 runtime:
   n_cores: 0
@@ -13,7 +17,9 @@ runtime:
 
 services:
   gateway/0:
-    clients:
-      - endpoint: "http://127.0.0.1:46357"
-        tls:
-          insecure: true
+    server:
+      endpoint: "0.0.0.0:46357"
+      tls:
+        insecure: true
+
+    clients: []

data-plane/examples/Taskfile.yml

@@ -17,18 +17,18 @@ tasks:
 
   run:server:
     desc: "Run the server"
-    dir: "../gateway/gateway"
+    dir: ".."
     cmds:
-      - cargo run --bin gateway -- --config ./config/config-base.yaml
+      - cargo run --bin gateway -- --config ./config/base/server-config.yaml
 
   run:mock-agent:server:
     desc: "Run the mock agent server"
     dir: src/sdk-mock
     cmds:
-      - cargo run -- --config ./config/config.yaml --local-agent server --remote-agent client
+      - cargo run -- --config ../../../config/base/client-config.yaml --local-agent server --remote-agent client
 
   run:mock-agent:client:
     desc: "Run the mock agent client"
     dir: src/sdk-mock
     cmds:
-      - cargo run -- --config ./config/config.yaml --local-agent client --remote-agent server --message "hey there!"
+      - cargo run -- --config ../../../config/base/client-config.yaml --local-agent client --remote-agent server --message "hey there!"

data-plane/examples/src/sdk-mock/main.rs

@@ -28,6 +28,7 @@ async fn main() {
 
     // create configured components
     let mut config = config::load_config(config_file).expect("failed to load configuration");
+    let _guard = config.tracing.setup_tracing_subscriber();
 
     info!(%config_file, %local_agent, %remote_agent, "starting client");
 
@@ -36,11 +37,18 @@ async fn main() {
     let svc = config.services.get_mut(&id).unwrap();
 
     // create local agent
-    let agent_name = encode_agent_from_string("cisco", "default", local_agent, 0);
+    let agent_id = 0;
+    let agent_name = encode_agent_from_string("cisco", "default", local_agent, agent_id);
     let mut rx = svc.create_agent(agent_name.clone());
 
     // connect to the remote gateway
     let conn_id = svc.connect(None).await.unwrap();
+    info!("remote connection id = {}", conn_id);
+
+    let local_agent_class = encode_agent_class("cisco", "default", local_agent);
+    svc.subscribe(&local_agent_class, Some(agent_id), conn_id)
+        .await
+        .unwrap();
 
     // Set a route for the remote agent
     let route = encode_agent_class("cisco", "default", remote_agent);
@@ -74,10 +82,10 @@ async fn main() {
         }
 
         // send a message back
-        let msg = "hello from the other side";
+        let msg = format!("hello from the {}", local_agent);
         svc.publish(&route, None, 1, msg.into()).await.unwrap();
 
         // sleep
-        tokio::time::sleep(tokio::time::Duration::from_secs(10)).await;
+        tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
     }
 }

data-plane/python-bindings/agp_bindings/__init__.py

@@ -82,7 +82,7 @@ async def serve(
             None
         """
 
-        await agp_bindings.serve(
+        await serve(
             self.svc,
             address,
             insecure,