Merge pull request #58 from posit-dev/feature/resource-usage

Add resource monitor

Author: jmcphers

Cargo.lock

@@ -12,6 +12,7 @@ docs/ExecutionQueue.md
 docs/InterruptMode.md
 docs/NewSession.md
 docs/NewSession200Response.md
+docs/ResourceUsage.md
 docs/RestartSession.md
 docs/ServerConfiguration.md
 docs/ServerConfigurationLogLevel.md

crates/kallichore_api/.openapi-generator/FILES

@@ -14,7 +14,7 @@ To see how to make this your own, look here:
 [README]((https://openapi-generator.tech))
 
 - API version: 1.0.0
-- Build date: 2025-11-12T12:51:21.340981-08:00[America/Los_Angeles]
+- Build date: 2026-01-06T09:23:26.564876-08:00[America/Los_Angeles]
 - Generator version: 7.17.0
 
 For more information, please visit [https://posit.co](https://posit.co)
@@ -162,6 +162,7 @@ Method | HTTP request | Description
  - [InterruptMode](docs/InterruptMode.md)
  - [NewSession](docs/NewSession.md)
  - [NewSession200Response](docs/NewSession200Response.md)
+ - [ResourceUsage](docs/ResourceUsage.md)
  - [RestartSession](docs/RestartSession.md)
  - [ServerConfiguration](docs/ServerConfiguration.md)
  - [ServerConfigurationLogLevel](docs/ServerConfigurationLogLevel.md)

crates/kallichore_api/README.md

@@ -712,7 +712,7 @@ components:
         process_id: 6
         input_prompt: input_prompt
         continuation_prompt: continuation_prompt
-        busy_seconds: 5
+        busy_seconds: 2
         kernel_info: "{}"
         session_id: session_id
         language: language
@@ -732,12 +732,18 @@ components:
           active: "{}"
         interrupt_mode: signal
         connected: true
+        resource_usage:
+          sampling_period_ms: 7
+          thread_count: 2
+          memory_bytes: 5
+          cpu_percent: 5
+          timestamp: 9
         session_mode: console
         initial_env:
           key: initial_env
         username: username
         status: uninitialized
-        idle_seconds: 5
+        idle_seconds: 3
       properties:
         session_id:
           description: A unique identifier for the session
@@ -796,6 +802,8 @@ components:
           description: "The kernel information, as returned by the kernel_info_request\
             \ message"
           type: object
+        resource_usage:
+          $ref: "#/components/schemas/resourceUsage"
         idle_seconds:
           description: "The number of seconds the session has been idle, or 0 if the\
             \ session is busy"
@@ -877,14 +885,54 @@ components:
       - uptime_seconds
       - version
       type: object
+    resourceUsage:
+      example:
+        sampling_period_ms: 7
+        thread_count: 2
+        memory_bytes: 5
+        cpu_percent: 5
+        timestamp: 9
+      properties:
+        cpu_percent:
+          description: The percentage of CPU used by the kernel process and its child
+            processes
+          format: int64
+          type: integer
+        memory_bytes:
+          description: The amount of memory used by the kernel process and all of
+            its child processes in bytes
+          format: int64
+          type: integer
+        thread_count:
+          description: The total number of threads used by the kernel process and
+            its child processes (Linux only)
+          format: int64
+          type: integer
+        sampling_period_ms:
+          description: The sampling period in milliseconds over which the resource
+            usage was measured
+          format: int64
+          type: integer
+        timestamp:
+          description: A Unix timestamp in milliseconds indicating when the resource
+            usage was sampled
+          format: int64
+          type: integer
+      required:
+      - cpu_percent
+      - memory_bytes
+      - sampling_period_ms
+      - thread_count
+      - timestamp
+      type: object
     sessionList:
       example:
         total: 0
         sessions:
         - process_id: 6
           input_prompt: input_prompt
           continuation_prompt: continuation_prompt
-          busy_seconds: 5
+          busy_seconds: 2
           kernel_info: "{}"
           session_id: session_id
           language: language
@@ -904,16 +952,22 @@ components:
             active: "{}"
           interrupt_mode: signal
           connected: true
+          resource_usage:
+            sampling_period_ms: 7
+            thread_count: 2
+            memory_bytes: 5
+            cpu_percent: 5
+            timestamp: 9
           session_mode: console
           initial_env:
             key: initial_env
           username: username
           status: uninitialized
-          idle_seconds: 5
+          idle_seconds: 3
         - process_id: 6
           input_prompt: input_prompt
           continuation_prompt: continuation_prompt
-          busy_seconds: 5
+          busy_seconds: 2
           kernel_info: "{}"
           session_id: session_id
           language: language
@@ -933,12 +987,18 @@ components:
             active: "{}"
           interrupt_mode: signal
           connected: true
+          resource_usage:
+            sampling_period_ms: 7
+            thread_count: 2
+            memory_bytes: 5
+            cpu_percent: 5
+            timestamp: 9
           session_mode: console
           initial_env:
             key: initial_env
           username: username
           status: uninitialized
-          idle_seconds: 5
+          idle_seconds: 3
       properties:
         total:
           type: integer
@@ -952,13 +1012,18 @@ components:
       type: object
     serverConfiguration:
       example:
+        resource_sample_interval_ms: 6
         log_level: trace
         idle_shutdown_hours: 0
       properties:
         idle_shutdown_hours:
           description: The number of hours the server will wait before shutting down
             idle sessions (-1 if idle shutdown is disabled)
           type: integer
+        resource_sample_interval_ms:
+          description: The interval in milliseconds at which resource usage is sampled.
+            A value of 0 disables resource usage sampling.
+          type: integer
         log_level:
           $ref: "#/components/schemas/serverConfiguration_log_level"
       type: object

crates/kallichore_api/api/openapi.yaml

@@ -21,6 +21,7 @@ Name | Type | Description | Notes
 **execution_queue** | [***models::ExecutionQueue**](execution_queue.md) |  | 
 **status** | [***models::Status**](status.md) |  | 
 **kernel_info** | [***serde_json::Value**](.md) | The kernel information, as returned by the kernel_info_request message | 
+**resource_usage** | [***models::ResourceUsage**](resourceUsage.md) |  | [optional] [default to None]
 **idle_seconds** | **i32** | The number of seconds the session has been idle, or 0 if the session is busy | 
 **busy_seconds** | **i32** | The number of seconds the session has been busy, or 0 if the session is idle | 
 **socket_path** | **String** | The path to the Unix domain socket used to send/receive data from the session, if applicable | [optional] [default to None]

crates/kallichore_api/docs/ActiveSession.md

@@ -0,0 +1,14 @@
+# ResourceUsage
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cpu_percent** | **i64** | The percentage of CPU used by the kernel process and its child processes | 
+**memory_bytes** | **i64** | The amount of memory used by the kernel process and all of its child processes in bytes | 
+**thread_count** | **i64** | The total number of threads used by the kernel process and its child processes (Linux only) | 
+**sampling_period_ms** | **i64** | The sampling period in milliseconds over which the resource usage was measured | 
+**timestamp** | **i64** | A Unix timestamp in milliseconds indicating when the resource usage was sampled | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

crates/kallichore_api/docs/ResourceUsage.md

@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **idle_shutdown_hours** | **i32** | The number of hours the server will wait before shutting down idle sessions (-1 if idle shutdown is disabled) | [optional] [default to None]
+**resource_sample_interval_ms** | **i32** | The interval in milliseconds at which resource usage is sampled. A value of 0 disables resource usage sampling. | [optional] [default to None]
 **log_level** | [***models::ServerConfigurationLogLevel**](serverConfiguration_log_level.md) |  | [optional] [default to None]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)