Merge pull request #3 from schultyy/refactor-services

Refactor: Implement Service-to-Service Communication and Code Generation

Author: schultyy

Cargo.lock

@@ -8,23 +8,27 @@ edition = "2021"
 
 [dependencies]
 tracing = { version = "0.1", features = ["log", "log-always"] }
-tracing-subscriber = { version = "0.3.3", features = ["std", "env-filter"] }
+tracing-subscriber = { version = "0.3.19", features = ["env-filter", "json"] }
 clap = { version = "4.4", features = ["derive"] }
 fake = { version = "4", features = ["derive"] }
-tracing-opentelemetry = "0.28.0"
-opentelemetry = "0.27"
-opentelemetry-otlp = "0.27.0"
-opentelemetry_sdk = { version = "0.27.1", features = [
-  "opentelemetry-http",
+tracing-opentelemetry = "0.29.0"
+opentelemetry = "0.29.0"
+opentelemetry-otlp = { version = "0.29.0", features = ["tonic", "grpc-tonic"] }
+opentelemetry_sdk = { version = "0.29.0", features = [
   "rt-tokio",
+  "tokio",
+  "opentelemetry-http",
 ] }
 tonic = "0.12.3"
-opentelemetry-appender-tracing = "0.27"
-opentelemetry-stdout = "0.27.0"
+opentelemetry-appender-tracing = "0.29.0"
+opentelemetry-stdout = "0.29.0"
 tokio = { version = "1.43.0", features = ["full"] }
 futures = "0.3"
 rand = "0.9.0"
 ctrlc = "3.4"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_yaml = "0.9.34"
 opentelemetry-semantic-conventions = "0.29.0"
+pest = "2.8.0"
+pest_derive = "2.8.0"
+tabled = "0.18.0"

Cargo.toml

@@ -42,72 +42,124 @@ mustermann [OPTIONS] <file_path> [otel_endpoint] [--service-name <service_name>]
 mustermann config.yaml http://localhost:4317 --service-name my-service
 ```
 
-## Configuration
-
-### Log Configuration
-
-Define log patterns and their execution behavior:
-
-```yaml
-- task_name: App Logs
-  frequency: Infinite
-  template: "User %s logged in"
-  vars:
-    - Franz Josef
-    - 34
-    - Heinz
-  severity: INFO
-- task_name: App Login Errors
-  frequency: Amount(45)
-  template: "Failed to login: %s"
-  vars:
-    - Invalid username or password
-    - Upstream connection refused
-  severity: ERROR
+Standalone service just printing values:
+
+```
+service payments {
+  method charge {
+    print "Processing payment for order %s" with ["12345", "67890"]
+    sleep 500ms
+  }
+
+  loop {
+    call charge
+  }
+}
+```
+
+Standalone service printing values to stderr:
+
+```
+service payments {
+  method charge {
+    stderr "Processing payment for order %s" with ["12345", "67890"]
+    sleep 500ms
+  }
+
+  loop {
+    call charge
+  }
+}
+```
+
+Service accepting requests from other services:
+
+```
+service payments {
+  method charge {
+    print "Processing payment for order %s" with ["12345", "67890"]
+    sleep 500ms
+  }
+}
+```
+
+Call another service:
+
+```
+service products {
+  method get_products {
+    print "Fetching product orders %s" with ["12345", "67890"]
+    sleep 500ms
+  }
+}
+
+service frontend {
+  method main_page {
+    print "Main page"
+    call products.get_products
+  }
+
+  loop {
+    call main_page
+  }
+}
 ```
 
-### Service Configuration
-
-Define interconnected services and their interactions:
-
-```yaml
-logs: []
-services:
-  - name: checkout
-    methods:
-      - name: process
-        stdout: Processing Order
-        sleep_ms: 100
-  - name: user_service
-    methods:
-      - name: get_user
-        stdout: Getting user
-        sleep_ms: 100
-  - name: product_service
-    methods:
-      - name: get_product
-        stdout: Getting product
-        sleep_ms: 100
-  - name: web_frontend
-    methods:
-      - name: start_checkout
-        stdout: Starting checkout
-        calls:
-          - name: product_service
-            method: get_product
-          - name: user_service
-            method: get_user
-          - name: checkout
-            method: process
-        sleep_ms: 100
-    invoke:
-      - start_checkout
+## Multi-service example
+
+```
+service products {
+  method get_products {
+    print "Fetching product orders %s" with ["12345", "67890"]
+    sleep 500ms
+  }
+}
+
+service features {
+  method is_enabled {
+    print "Check if feature is enabled %s" with ["login", "upload", "create"]
+    sleep 1000ms
+  }
+}
+
+service frontend {
+  method login {
+    print "Main page"
+    call features.is_enabled
+  }
+
+  loop {
+    call login
+  }
+}
+
+service analytics {
+  method main_page {
+    print "Main page"
+    call products.get_products
+  }
+
+  loop {
+    call main_page
+  }
+}
+
+
+service frontend_b {
+  method main_page {
+    print "Main page"
+    call products.get_products
+  }
+
+  loop {
+    call main_page
+  }
+}
 ```
 
-- Services can invoke each other's methods. 
-- If no `invoke` is specified, the service just runs in an infinite loop, waiting for invokations.
+This service definition will generate the following service map:
 
-![screenshot.png](screenshot.png)
+![servicemap](servicemap.png)
 
 ## License
 

README.md

@@ -0,0 +1,47 @@
+service products {
+  method get_products {
+    print "Fetching product orders %s" with ["12345", "67890"]
+    sleep 500ms
+  }
+}
+
+service features {
+  method is_enabled {
+    print "Check if feature is enabled %s" with ["login", "upload", "create"]
+    sleep 1000ms
+  }
+}
+
+service frontend {
+  method login {
+    print "Main page"
+    call features.is_enabled
+  }
+
+  loop {
+    call login
+  }
+}
+
+service analytics {
+  method main_page {
+    print "Main page"
+    call products.get_products
+  }
+
+  loop {
+    call main_page
+  }
+}
+
+
+service frontend_b {
+  method main_page {
+    print "Main page"
+    call products.get_products
+  }
+
+  loop {
+    call main_page
+  }
+}

example.yml

@@ -0,0 +1,11 @@
+service payments {
+  method charge {
+    print "Processing payment for order %s" with ["12345", "67890"]
+    sleep 500ms
+    stderr "Processing payment for order %s" with ["BANANAS AND APPLES"]
+  }
+
+  loop {
+    call charge
+  }
+}

multi_service.muster

@@ -1,14 +1,14 @@
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum ByteCodeError {
-    UnsupportedConst(String),
+#[derive(Debug, Clone)]
+pub enum CodeGenError {
+    InvalidStatement(String),
 }
 
-impl std::error::Error for ByteCodeError {}
-
-impl std::fmt::Display for ByteCodeError {
+impl std::fmt::Display for CodeGenError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            ByteCodeError::UnsupportedConst(val) => write!(f, "Unsupported constant: {}", val),
+            CodeGenError::InvalidStatement(msg) => write!(f, "Invalid statement: {}", msg),
         }
     }
 }
+
+impl std::error::Error for CodeGenError {}