rebase

Created using spr 1.3.6-beta.1

Cargo.toml

@@ -64,6 +64,7 @@ members = [
     "nexus/test-utils-macros",
     "nexus/test-utils",
     "nexus/types",
+    "oximeter/api",
     "oximeter/collector",
     "oximeter/db",
     "oximeter/impl",
@@ -166,6 +167,7 @@ default-members = [
     "nexus/test-utils-macros",
     "nexus/test-utils",
     "nexus/types",
+    "oximeter/api",
     "oximeter/collector",
     "oximeter/db",
     "oximeter/impl",
@@ -411,6 +413,7 @@ opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "3dc9a3dd8d3
 oso = "0.27"
 owo-colors = "4.0.0"
 oximeter = { path = "oximeter/oximeter" }
+oximeter-api = { path = "oximeter/api" }
 oximeter-client = { path = "clients/oximeter-client" }
 oximeter-db = { path = "oximeter/db/", default-features = false }
 oximeter-collector = { path = "oximeter/collector" }
@@ -425,7 +428,7 @@ partial-io = { version = "0.5.4", features = ["proptest1", "tokio1"] }
 parse-size = "1.0.0"
 paste = "1.0.15"
 percent-encoding = "2.3.1"
-peg = "0.8.3"
+peg = "0.8.4"
 pem = "3.0"
 petgraph = "0.6.5"
 postgres-protocol = "0.6.6"

dev-tools/openapi-manager/Cargo.toml

@@ -24,6 +24,7 @@ omicron-workspace-hack.workspace = true
 openapiv3.workspace = true
 openapi-lint.workspace = true
 owo-colors.workspace = true
+oximeter-api.workspace = true
 serde_json.workspace = true
 similar.workspace = true
 supports-color.workspace = true

dev-tools/openapi-manager/src/spec.rs

@@ -66,6 +66,16 @@ pub fn all_apis() -> Vec<ApiSpec> {
             filename: "nexus-internal.json",
             extra_validation: None,
         },
+        ApiSpec {
+            title: "Oxide Oximeter API",
+            version: "0.0.1",
+            description: "API for interacting with oximeter",
+            boundary: ApiBoundary::Internal,
+            api_description:
+                oximeter_api::oximeter_api_mod::stub_api_description,
+            filename: "oximeter.json",
+            extra_validation: None,
+        },
         ApiSpec {
             title: "Oxide Technician Port Control Service",
             version: "0.0.1",

openapi/oximeter.json

@@ -12,6 +12,7 @@
   "paths": {
     "/info": {
       "get": {
+        "summary": "Return identifying information about this collector.",
         "operationId": "collector_info",
         "responses": {
           "200": {
@@ -35,6 +36,7 @@
     },
     "/producers": {
       "get": {
+        "summary": "List all producers.",
         "operationId": "producers_list",
         "parameters": [
           {
@@ -81,6 +83,7 @@
         }
       },
       "post": {
+        "summary": "Handle a request from Nexus to register a new producer with this collector.",
         "operationId": "producers_post",
         "requestBody": {
           "content": {
@@ -107,6 +110,7 @@
     },
     "/producers/{producer_id}": {
       "delete": {
+        "summary": "Delete a producer by ID.",
         "operationId": "producer_delete",
         "parameters": [
           {

oximeter/api/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "oximeter-api"
+version = "0.1.0"
+edition = "2021"
+
+[lints]
+workspace = true
+
+[dependencies]
+chrono.workspace = true
+dropshot.workspace = true
+omicron-common.workspace = true
+omicron-workspace-hack.workspace = true
+schemars.workspace = true
+serde.workspace = true
+uuid.workspace = true

oximeter/api/src/lib.rs

@@ -0,0 +1,79 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+use chrono::{DateTime, Utc};
+use dropshot::{
+    EmptyScanParams, HttpError, HttpResponseDeleted, HttpResponseOk,
+    HttpResponseUpdatedNoContent, PaginationParams, Query, RequestContext,
+    ResultsPage, TypedBody,
+};
+use omicron_common::api::internal::nexus::ProducerEndpoint;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use uuid::Uuid;
+
+#[dropshot::api_description {
+    module = "oximeter_api_mod",
+}]
+pub trait OximeterApi {
+    type Context;
+
+    /// Handle a request from Nexus to register a new producer with this collector.
+    #[endpoint {
+        method = POST,
+        path = "/producers",
+    }]
+    async fn producers_post(
+        request_context: RequestContext<Self::Context>,
+        body: TypedBody<ProducerEndpoint>,
+    ) -> Result<HttpResponseUpdatedNoContent, HttpError>;
+
+    /// List all producers.
+    #[endpoint {
+        method = GET,
+        path = "/producers",
+    }]
+    async fn producers_list(
+        request_context: RequestContext<Self::Context>,
+        query: Query<PaginationParams<EmptyScanParams, ProducerPage>>,
+    ) -> Result<HttpResponseOk<ResultsPage<ProducerEndpoint>>, HttpError>;
+
+    /// Delete a producer by ID.
+    #[endpoint {
+        method = DELETE,
+        path = "/producers/{producer_id}",
+    }]
+    async fn producer_delete(
+        request_context: RequestContext<Self::Context>,
+        path: dropshot::Path<ProducerIdPathParams>,
+    ) -> Result<HttpResponseDeleted, HttpError>;
+
+    /// Return identifying information about this collector.
+    #[endpoint {
+        method = GET,
+        path = "/info",
+    }]
+    async fn collector_info(
+        request_context: RequestContext<Self::Context>,
+    ) -> Result<HttpResponseOk<CollectorInfo>, HttpError>;
+}
+
+/// Parameters for paginating the list of producers.
+#[derive(Clone, Copy, Debug, Deserialize, JsonSchema, Serialize)]
+pub struct ProducerPage {
+    pub id: Uuid,
+}
+
+#[derive(Clone, Copy, Debug, Deserialize, JsonSchema, Serialize)]
+pub struct ProducerIdPathParams {
+    pub producer_id: Uuid,
+}
+
+#[derive(Clone, Copy, Debug, Deserialize, JsonSchema, Serialize)]
+pub struct CollectorInfo {
+    /// The collector's UUID.
+    pub id: Uuid,
+    /// Last time we refreshed our producer list with Nexus.
+    pub last_refresh: Option<DateTime<Utc>>,
+}

oximeter/collector/Cargo.toml

@@ -19,6 +19,7 @@ internal-dns.workspace = true
 nexus-types.workspace = true
 omicron-common.workspace = true
 oximeter.workspace = true
+oximeter-api.workspace = true
 oximeter-client.workspace = true
 oximeter-db.workspace = true
 rand.workspace = true

oximeter/collector/src/bin/oximeter.rs

@@ -10,7 +10,6 @@ use anyhow::{anyhow, Context};
 use clap::Parser;
 use omicron_common::cmd::fatal;
 use omicron_common::cmd::CmdError;
-use oximeter_collector::oximeter_api;
 use oximeter_collector::standalone_nexus_api;
 use oximeter_collector::Config;
 use oximeter_collector::Oximeter;
@@ -23,16 +22,6 @@ use std::net::SocketAddrV6;
 use std::path::PathBuf;
 use uuid::Uuid;
 
-pub fn run_openapi() -> Result<(), String> {
-    oximeter_api()
-        .openapi("Oxide Oximeter API", "0.0.1")
-        .description("API for interacting with oximeter")
-        .contact_url("https://oxide.computer")
-        .contact_email("[email protected]")
-        .write(&mut std::io::stdout())
-        .map_err(|e| e.to_string())
-}
-
 pub fn run_standalone_openapi() -> Result<(), String> {
     standalone_nexus_api()
         .openapi("Oxide Nexus API", "0.0.1")
@@ -47,9 +36,6 @@ pub fn run_standalone_openapi() -> Result<(), String> {
 #[derive(Parser)]
 #[clap(name = "oximeter", about = "See README.adoc for more information")]
 enum Args {
-    /// Print the external OpenAPI Spec document and exit
-    Openapi,
-
     /// Start an Oximeter server
     Run {
         /// Path to TOML file with configuration for the server
@@ -133,9 +119,6 @@ async fn main() {
 async fn do_run() -> Result<(), CmdError> {
     let args = Args::parse();
     match args {
-        Args::Openapi => {
-            run_openapi().map_err(|err| CmdError::Failure(anyhow!(err)))
-        }
         Args::Run { config_file, id, address } => {
             let config = Config::from_file(config_file).unwrap();
             let args = OximeterArguments { id, address };