Apply review suggestions.

apache · Jan 27, 2025 · 99b7800 · 99b7800
1 parent 3aedfab
commit 99b7800
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/...fi-web/nifi-web-api/src/main/java/org/apache/nifi/prometheusutil/NiFiMetricsRegistry.java b/...fi-web/nifi-web-api/src/main/java/org/apache/nifi/prometheusutil/NiFiMetricsRegistry.java
@@ -283,25 +283,25 @@ public NiFiMetricsRegistry() {
                 .register(registry));
 
         nameToGaugeMap.put("PROCESSING_PERF_GC_MILLIS", Gauge.build()
-                .name("nifi_processing_gc_duration")
+                .name("nifi_processing_performance_gc_duration")
                 .help("Estimated garbage collection time (in milliseconds) used by this component")
                 .labelNames("instance", "component_type", "component_name", "component_id", "parent_id", "repo_identifier")
                 .register(registry));
 
         nameToGaugeMap.put("PROCESSING_PERF_READ_MILLIS", Gauge.build()
-                .name("nifi_processing_content_read_duration")
+                .name("nifi_processing_performance_content_read_duration")
                 .help("Estimated content read time (in milliseconds) used by this component")
                 .labelNames("instance", "component_type", "component_name", "component_id", "parent_id", "repo_identifier")
                 .register(registry));
 
         nameToGaugeMap.put("PROCESSING_PERF_WRITE_MILLIS", Gauge.build()
-                .name("nifi_processing_content_write_duration")
+                .name("nifi_processing_performance_content_write_duration")
                 .help("Estimated content write time (in milliseconds) used by this component")
                 .labelNames("instance", "component_type", "component_name", "component_id", "parent_id", "repo_identifier")
                 .register(registry));
 
         nameToGaugeMap.put("PROCESSING_PERF_COMMIT_MILLIS", Gauge.build()
-                .name("nifi_processing_session_commit_duration")
+                .name("nifi_processing_performance_session_commit_duration")
                 .help("Estimated session commit time (in milliseconds) used by this component")
                 .labelNames("instance", "component_type", "component_name", "component_id", "parent_id", "repo_identifier")
                 .register(registry));

diff --git a/...i-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java b/...i-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java
@@ -554,14 +554,16 @@ public Response getBreadcrumbs(
     )
     public Response getFlowMetrics(
             @Parameter(
-                    description = "The producer for flow file metrics. Each producer may have its own output format. " +
-                            "Allowed values: [prometheus, json]",
-                    required = true
+                    description = "The producer for flow file metrics. Each producer may have its own output format.",
+                    required = true,
+                    schema = @Schema(allowableValues = {"prometheus", "json"})
             )
             @PathParam("producer") final String producer,
             @Parameter(
                     description = "Set of included metrics registries. Duplicate the parameter to include multiple registries. " +
-                            "Allowed values: [NIFI, JVM, BULLETIN, CONNECTION, CLUSTER] default: all"
+                            "All registries are included by default.",
+
+                    schema = @Schema(allowableValues = {"NIFI", "JVM", "BULLETIN", "CONNECTION", "CLUSTER"})
             )
             @QueryParam("includedRegistries") final Set<FlowMetricsRegistry> includedRegistries,
             @Parameter(