This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 2e09ce8a30c NIFI-15327 Enabled TestSiteToSiteMetricsReportingTask on
Windows.
2e09ce8a30c is described below
commit 2e09ce8a30c7622aaf50053bbd27be7f4b975f5b
Author: dan-s1 <[email protected]>
AuthorDate: Tue Dec 9 22:36:38 2025 +0000
NIFI-15327 Enabled TestSiteToSiteMetricsReportingTask on Windows.
Signed-off-by: Pierre Villard <[email protected]>
This closes #10627.
---
.../apache/nifi/reporting/util/metrics/MetricsService.java | 8 +++++++-
.../nifi/reporting/TestSiteToSiteMetricsReportingTask.java | 11 ++++-------
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-extension-utils/nifi-reporting-utils/src/main/java/org/apache/nifi/reporting/util/metrics/MetricsService.java
b/nifi-extension-bundles/nifi-extension-utils/nifi-reporting-utils/src/main/java/org/apache/nifi/reporting/util/metrics/MetricsService.java
index e9efc88b4fd..7f7a17d93d1 100644
---
a/nifi-extension-bundles/nifi-extension-utils/nifi-reporting-utils/src/main/java/org/apache/nifi/reporting/util/metrics/MetricsService.java
+++
b/nifi-extension-bundles/nifi-extension-utils/nifi-reporting-utils/src/main/java/org/apache/nifi/reporting/util/metrics/MetricsService.java
@@ -141,7 +141,13 @@ public class MetricsService {
metrics.put(MetricNames.JVM_HEAP_USED,
virtualMachineMetrics.heapUsed(DataUnit.B));
metrics.put(MetricNames.JVM_HEAP_USAGE,
virtualMachineMetrics.heapUsage());
metrics.put(MetricNames.JVM_NON_HEAP_USAGE,
virtualMachineMetrics.nonHeapUsage());
- metrics.put(MetricNames.JVM_FILE_DESCRIPTOR_USAGE,
virtualMachineMetrics.fileDescriptorUsage());
+ double fileDescriptorUsage =
virtualMachineMetrics.fileDescriptorUsage();
+
+ if (Double.isNaN(fileDescriptorUsage)) {
+ fileDescriptorUsage = -1.0;
+ }
+
+ metrics.put(MetricNames.JVM_FILE_DESCRIPTOR_USAGE,
fileDescriptorUsage);
return metrics;
}
diff --git
a/nifi-extension-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/test/java/org/apache/nifi/reporting/TestSiteToSiteMetricsReportingTask.java
b/nifi-extension-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/test/java/org/apache/nifi/reporting/TestSiteToSiteMetricsReportingTask.java
index e94feae5ca2..c9e00647447 100644
---
a/nifi-extension-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/test/java/org/apache/nifi/reporting/TestSiteToSiteMetricsReportingTask.java
+++
b/nifi-extension-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/test/java/org/apache/nifi/reporting/TestSiteToSiteMetricsReportingTask.java
@@ -36,8 +36,6 @@ import org.apache.nifi.state.MockStateManager;
import org.apache.nifi.util.MockPropertyValue;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledOnOs;
-import org.junit.jupiter.api.condition.OS;
import org.mockito.Mockito;
import org.mockito.stubbing.Answer;
@@ -62,7 +60,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.when;
-@DisabledOnOs(OS.WINDOWS)
public class TestSiteToSiteMetricsReportingTask {
private ReportingContext context;
@@ -99,7 +96,7 @@ public class TestSiteToSiteMetricsReportingTask {
status.setProcessGroupStatus(groupStatuses);
}
- public MockSiteToSiteMetricsReportingTask initTask(Map<PropertyDescriptor,
String> customProperties) throws InitializationException, IOException {
+ MockSiteToSiteMetricsReportingTask initTask(Map<PropertyDescriptor,
String> customProperties) throws InitializationException, IOException {
final MockSiteToSiteMetricsReportingTask task = new
MockSiteToSiteMetricsReportingTask();
Map<PropertyDescriptor, String> properties = new HashMap<>();
@@ -219,7 +216,7 @@ public class TestSiteToSiteMetricsReportingTask {
task.onTrigger(context);
assertEquals(1, task.dataSent.size());
- final String msg = new String(task.dataSent.get(0),
StandardCharsets.UTF_8);
+ final String msg = new String(task.dataSent.getFirst(),
StandardCharsets.UTF_8);
JsonReader jsonReader = Json.createReader(new
ByteArrayInputStream(msg.getBytes()));
JsonArray array = jsonReader.readObject().getJsonArray("metrics");
for (int i = 0; i < array.size(); i++) {
@@ -247,7 +244,7 @@ public class TestSiteToSiteMetricsReportingTask {
task.onTrigger(context);
assertEquals(1, task.dataSent.size());
- final String msg = new String(task.dataSent.get(0),
StandardCharsets.UTF_8);
+ final String msg = new String(task.dataSent.getFirst(),
StandardCharsets.UTF_8);
JsonReader jsonReader = Json.createReader(new
ByteArrayInputStream(msg.getBytes()));
JsonArray array = jsonReader.readObject().getJsonArray("metrics");
for (int i = 0; i < array.size(); i++) {
@@ -274,7 +271,7 @@ public class TestSiteToSiteMetricsReportingTask {
task.onTrigger(context);
assertEquals(1, task.dataSent.size());
- String[] data = new String(task.dataSent.get(0)).split(",");
+ String[] data = new String(task.dataSent.getFirst()).split(",");
assertEquals("\"nifi\"", data[0]);
assertEquals("\"1234\"", data[1]);
assertEquals("\"100\"", data[10]); // FlowFilesQueued
