Add logfire.instrument_system_metrics()

docs/guides/onboarding_checklist/add_metrics.md

@@ -1,6 +1,16 @@
 **Pydantic Logfire** can be used to collect metrics from your application and send them to a metrics backend.
 
-Let's see how to create, and use metrics in your application.
+Metrics are a great way to record numerical values where you want to see an aggregation of the data (e.g. over time),
+rather than the individual values.
+
+## System Metrics
+
+The easiest way to start using metrics is to enable system metrics.
+See the [System Metrics][system-metrics] documentation to learn more.
+
+## Manual Metrics
+
+Let's see how to create and use custom metrics in your application.
 
 ```py
 import logfire
@@ -13,11 +23,6 @@ def send_message():
     messages_sent.add(1)
 ```
 
-## Metric Types
-
-Metrics are a great way to record number values where you want to see an aggregation of the data (e.g. over time),
-rather than the individual values.
-
 ### Counter
 
 The Counter metric is particularly useful when you want to measure the frequency or occurrence of a certain
@@ -250,18 +255,6 @@ logfire.metric_up_down_counter_callback(
 
 You can read more about the Up-Down Counter metric in the [OpenTelemetry documentation][up-down-counter-callback-metric].
 
-## System Metrics
-
-By default, **Logfire** does not collect system metrics.
-
-To enable metrics, you need just need install the `logfire[system-metrics]` extra:
-
-{{ install_logfire(extras=['system-metrics']) }}
-
-**Logfire** will automatically collect system metrics if the `logfire[system-metrics]` extra is installed.
-
-To know more about which system metrics are collected, check the [System Metrics][system-metrics] documentation.
-
 [counter-metric]: https://opentelemetry.io/docs/specs/otel/metrics/api/#counter
 [histogram-metric]: https://opentelemetry.io/docs/specs/otel/metrics/api/#histogram
 [up-down-counter-metric]: https://opentelemetry.io/docs/specs/otel/metrics/api/#updowncounter

docs/guides/web_ui/dashboards.md

@@ -19,14 +19,19 @@ This dashboard offers a high-level view of your web services' well-being. It lik
 * **Percent of 5XX Requests:** Percentage of requests that resulted in server errors (status codes in the 500 range).
 * **Log Type Ratio**: Breakdown of the different log types generated by your web service (e.g., info, warning, error).
 
-## System Metrics
+## Basic System Metrics
 
-This dashboard focuses on system resource utilization, potentially including:
+This dashboard shows essential system resource utilization metrics. It comes in two variants:
+
+- **Basic System Metrics (Logfire):** Uses the data exported by [`logfire.instrument_system_metrics()`](../../integrations/system_metrics.md).
+- **Basic System Metrics (OpenTelemetry):** Uses data exported by any OpenTelemetry-based instrumentation following the standard semantic conventions.
+
+Both variants include the following metrics:
 
-* **CPU Usage:** Percentage of processing power utilized by the system.
-* **Memory Usage:** Amount of memory currently in use by the system.
 * **Number of Processes:** Total number of running processes on the system.
-* **Swap Usage:** Amount of swap space currently in use by the system.
+* **CPU Usage %:** Percentage of processing power utilized by the system.
+* **Memory Usage %:** Percentage of memory currently in use by the system.
+* **Swap Usage %:** Percentage of swap space currently in use by the system.
 
 ## Custom Dashboards
 

docs/integrations/system_metrics.md

@@ -1,28 +1,80 @@
-By default, **Logfire** does not collect system metrics.
+The [`logfire.instrument_system_metrics()`][logfire.Logfire.instrument_system_metrics] method can be used to collect system metrics with **Logfire**, such as CPU and memory usage.
 
-To enable metrics, you need to install the `logfire[system-metrics]` extra:
+## Installation
+
+Install `logfire` with the `system-metrics` extra:
 
 {{ install_logfire(extras=['system-metrics']) }}
 
-### Available Metrics
-
-Logfire collects the following system metrics:
-
-* `system.cpu.time`: CPU time spent in different modes.
-* `system.cpu.utilization`: CPU utilization in different modes.
-* `system.memory.usage`: Memory usage.
-* `system.memory.utilization`: Memory utilization in different modes.
-* `system.swap.usage`: Swap usage.
-* `system.swap.utilization`: Swap utilization
-* `system.disk.io`: Disk I/O operations (read/write).
-* `system.disk.operations`: Disk operations (read/write).
-* `system.disk.time`: Disk time (read/write).
-* `system.network.dropped.packets`: Dropped packets (transmit/receive).
-* `system.network.packets`: Packets (transmit/receive).
-* `system.network.errors`: Network errors (transmit/receive).
-* `system.network.io`: Network I/O (transmit/receive).
-* `system.network.connections`: Network connections (family/type).
-* `system.thread_count`: Thread count.
-* `process.runtime.memory`: Process memory usage.
-* `process.runtime.cpu.time`: Process CPU time.
-* `process.runtime.gc_count`: Process garbage collection count.
+## Usage
+
+```py
+import logfire
+
+logfire.configure()
+
+logfire.instrument_system_metrics()
+```
+
+Then in your project, click on 'Dashboards' in the top bar, click 'New Dashboard', and select 'Basic System Metrics (Logfire)' from the dropdown.
+
+## Configuration
+
+By default, `instrument_system_metrics` collects only the metrics it needs to display the 'Basic System Metrics (Logfire)' dashboard. You can choose exactly which metrics to collect and how much data to collect about each metric. The default is equivalent to this:
+
+```py
+logfire.instrument_system_metrics({
+    'system.cpu.simple_utilization': None,  # (1)!
+    'system.memory.utilization': ['available'],
+    'system.swap.utilization': ['used'],
+})
+```
+
+1. `None` simply means that there are no fields to configure for this metric.
+
+To collect lots of detailed data about all available metrics, use `logfire.instrument_system_metrics(base='full')`.
+
+!!! warning
+    The amount of data collected by `base='full'` can be expensive, especially if you have many servers,
+    and this is easy to forget about. Be sure to monitor your usage and costs.
+
+    The most expensive metrics are `system.cpu.utilization/time` which collect data for each core and each mode,
+    and `system.disk.*` which collect data for each disk device. This can result in hundreds of data points per minute.
+    The exact number depends on your machine.
+
+`logfire.instrument_system_metrics(base='full')` is equivalent to:
+
+```py
+logfire.instrument_system_metrics({
+    'system.cpu.simple_utilization': None,
+    'system.cpu.time': ['idle', 'user', 'system', 'irq', 'softirq', 'nice', 'iowait', 'steal', 'interrupt', 'dpc'],
+    'system.cpu.utilization': ['idle', 'user', 'system', 'irq', 'softirq', 'nice', 'iowait', 'steal', 'interrupt', 'dpc'],
+    'system.memory.usage': ['available', 'used', 'free', 'active', 'inactive', 'buffers', 'cached', 'shared', 'wired', 'slab', 'total'],
+    'system.memory.utilization': ['available', 'used', 'free', 'active', 'inactive', 'buffers', 'cached', 'shared', 'wired', 'slab'],
+    'system.swap.usage': ['used', 'free'],
+    'system.swap.utilization': ['used'],
+    'system.disk.io': ['read', 'write'],
+    'system.disk.operations': ['read', 'write'],
+    'system.disk.time': ['read', 'write'],
+    'system.network.dropped.packets': ['transmit', 'receive'],
+    'system.network.packets': ['transmit', 'receive'],
+    'system.network.errors': ['transmit', 'receive'],
+    'system.network.io': ['transmit', 'receive'],
+    'system.thread_count': None,
+    'process.runtime.memory': ['rss', 'vms'],
+    'process.runtime.cpu.time': ['user', 'system'],
+    'process.runtime.gc_count': None,
+    'process.runtime.thread_count': None,
+    'process.runtime.cpu.utilization': None,
+    'process.runtime.context_switches': ['involuntary', 'voluntary'],
+    'process.open_file_descriptor.count': None,
+})
+```
+
+Each key here is a metric name. The values have different meanings for different metrics. For example, for `system.cpu.utilization`, the value is a list of CPU modes. So there will be a separate row for each CPU core saying what percentage of time it spent idle, another row for the time spent waiting for IO, etc. There are no fields to configure for `system.thread_count`, so the value is `None`.
+
+The first dict argument is merged with the base. For example, if you want to collect disk read operations (but not writes) you can write:
+
+- `logfire.instrument_system_metrics({'system.disk.operations': ['read']})` to collect that data in addition to the basic defaults.
+- `logfire.instrument_system_metrics({'system.disk.operations': ['read']}, base='full')` to collect detailed data about all metrics, excluding disk write operations.
+- `logfire.instrument_system_metrics({'system.disk.operations': ['read']}, base=None)` to collect only disk read operations and nothing else.

logfire-api/logfire_api/__init__.py

@@ -123,6 +123,8 @@ def instrument_openai(self, *args, **kwargs) -> ContextManager[None]:
 
             def instrument_aiohttp_client(self, *args, **kwargs) -> None: ...
 
+            def instrument_system_metrics(self, *args, **kwargs) -> None: ...
+
             def shutdown(self, *args, **kwargs) -> None: ...
 
         DEFAULT_LOGFIRE_INSTANCE = Logfire()
@@ -158,6 +160,7 @@ def shutdown(self, *args, **kwargs) -> None: ...
         instrument_redis = DEFAULT_LOGFIRE_INSTANCE.instrument_redis
         instrument_pymongo = DEFAULT_LOGFIRE_INSTANCE.instrument_pymongo
         instrument_mysql = DEFAULT_LOGFIRE_INSTANCE.instrument_mysql
+        instrument_system_metrics = DEFAULT_LOGFIRE_INSTANCE.instrument_system_metrics
         shutdown = DEFAULT_LOGFIRE_INSTANCE.shutdown
 
         def no_auto_trace(x):

logfire-api/logfire_api/__init__.pyi

@@ -11,7 +11,7 @@ from .integrations.logging import LogfireLoggingHandler as LogfireLoggingHandler
 from .integrations.structlog import LogfireProcessor as StructlogProcessor
 from .version import VERSION as VERSION
 
-__all__ = ['Logfire', 'LogfireSpan', 'LevelName', 'ConsoleOptions', 'PydanticPlugin', 'configure', 'span', 'instrument', 'log', 'trace', 'debug', 'notice', 'info', 'warn', 'error', 'exception', 'fatal', 'force_flush', 'log_slow_async_callbacks', 'install_auto_tracing', 'instrument_fastapi', 'instrument_openai', 'instrument_anthropic', 'instrument_asyncpg', 'instrument_httpx', 'instrument_celery', 'instrument_requests', 'instrument_psycopg', 'instrument_django', 'instrument_flask', 'instrument_starlette', 'instrument_aiohttp_client', 'instrument_sqlalchemy', 'instrument_redis', 'instrument_pymongo', 'instrument_mysql', 'AutoTraceModule', 'with_tags', 'with_settings', 'shutdown', 'load_spans_from_file', 'no_auto_trace', 'METRICS_PREFERRED_TEMPORALITY', 'ScrubMatch', 'ScrubbingOptions', 'VERSION', 'suppress_instrumentation', 'StructlogProcessor', 'LogfireLoggingHandler', 'TailSamplingOptions']
+__all__ = ['Logfire', 'LogfireSpan', 'LevelName', 'ConsoleOptions', 'PydanticPlugin', 'configure', 'span', 'instrument', 'log', 'trace', 'debug', 'notice', 'info', 'warn', 'error', 'exception', 'fatal', 'force_flush', 'log_slow_async_callbacks', 'install_auto_tracing', 'instrument_fastapi', 'instrument_openai', 'instrument_anthropic', 'instrument_asyncpg', 'instrument_httpx', 'instrument_celery', 'instrument_requests', 'instrument_psycopg', 'instrument_django', 'instrument_flask', 'instrument_starlette', 'instrument_aiohttp_client', 'instrument_sqlalchemy', 'instrument_redis', 'instrument_pymongo', 'instrument_mysql', 'instrument_system_metrics', 'AutoTraceModule', 'with_tags', 'with_settings', 'shutdown', 'load_spans_from_file', 'no_auto_trace', 'METRICS_PREFERRED_TEMPORALITY', 'ScrubMatch', 'ScrubbingOptions', 'VERSION', 'suppress_instrumentation', 'StructlogProcessor', 'LogfireLoggingHandler', 'TailSamplingOptions']
 
 DEFAULT_LOGFIRE_INSTANCE = Logfire()
 span = DEFAULT_LOGFIRE_INSTANCE.span
@@ -35,6 +35,7 @@ instrument_sqlalchemy = DEFAULT_LOGFIRE_INSTANCE.instrument_sqlalchemy
 instrument_redis = DEFAULT_LOGFIRE_INSTANCE.instrument_redis
 instrument_pymongo = DEFAULT_LOGFIRE_INSTANCE.instrument_pymongo
 instrument_mysql = DEFAULT_LOGFIRE_INSTANCE.instrument_mysql
+instrument_system_metrics = DEFAULT_LOGFIRE_INSTANCE.instrument_system_metrics
 shutdown = DEFAULT_LOGFIRE_INSTANCE.shutdown
 with_tags = DEFAULT_LOGFIRE_INSTANCE.with_tags
 with_settings = DEFAULT_LOGFIRE_INSTANCE.with_settings