Change Prometheus /metrics response from JSON to text

pinax-network · Aug 26, 2024 · fa0a751 · fa0a751
1 parent c886aa5
commit fa0a751
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/index.ts b/index.ts
@@ -72,7 +72,7 @@ async function AntelopeTokenAPI() {
 
     app.get(
         "/metrics",
-        async (ctx: Context) => ctx.json<EndpointReturnTypes<"/metrics">, 200>(await prometheus.registry.getMetricsAsJSON())
+        async (ctx: Context) => new Response(await prometheus.registry.metrics())
     );
 
     // --------------------------
@@ -133,7 +133,7 @@ async function AntelopeTokenAPI() {
                         return response.success ? "OK" : `[500] bad_database_response: ${response.error.message}`;
                     },
                     openapi: () => openapi,
-                    metrics: async () => await prometheus.registry.getMetricsAsJSON(),
+                    metrics: async () => await prometheus.registry.metrics(),
                     version: () => APP_VERSION
                 }
             );

diff --git a/src/types/zod.gen.ts b/src/types/zod.gen.ts
@@ -78,12 +78,17 @@ export type MonitoringHealthQueryResponseSchema = z.infer<typeof monitoringHealt
  /**
  * @description Metrics as text.
  */
-export const monitoringMetrics200Schema = z.object({});
+export const monitoringMetrics200Schema = z.coerce.string();
 export type MonitoringMetrics200Schema = z.infer<typeof monitoringMetrics200Schema>;
+/**
+ * @description An unexpected error response.
+ */
+export const monitoringMetricsErrorSchema = z.lazy(() => apiErrorSchema);
+export type MonitoringMetricsErrorSchema = z.infer<typeof monitoringMetricsErrorSchema>;
 /**
  * @description Metrics as text.
  */
-export const monitoringMetricsQueryResponseSchema = z.object({});
+export const monitoringMetricsQueryResponseSchema = z.coerce.string();
 export type MonitoringMetricsQueryResponseSchema = z.infer<typeof monitoringMetricsQueryResponseSchema>;
 
  /**

diff --git a/src/typespec/openapi3.tsp b/src/typespec/openapi3.tsp
@@ -242,5 +242,5 @@ interface Monitoring {
     @summary("Prometheus metrics")
     @route("/metrics")
     @get
-    metrics(): Record<unknown>;
+    metrics(): APIResponse<string>;
 }
diff --git a/static/@openapi-to-graphql/graphql/schema.graphql b/static/@openapi-to-graphql/graphql/schema.graphql
@@ -32,7 +32,7 @@ type Query {
   
   Equivalent to GET /metrics
   """
-  metrics: JSON
+  metrics: String
 
   """
   Reflection endpoint to return OpenAPI JSON spec. Also used by Swagger to generate the frontpage.

diff --git a/static/@typespec/openapi3/openapi.json b/static/@typespec/openapi3/openapi.json
@@ -151,8 +151,17 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "type": "object",
-                  "additionalProperties": {}
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "An unexpected error response.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/APIError"
                 }
               }
             }