Skip to content

NIFI-15327 Enabled TestSiteToSiteMetricsReportingTask on Windows. #10627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dan-s1 wants to merge 1 commit into from
Closed

NIFI-15327 Enabled TestSiteToSiteMetricsReportingTask on Windows. #10627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion ...-reporting-utils/src/main/java/org/apache/nifi/reporting/util/metrics/MetricsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,13 @@ private Map<String, Double> getDoubleMetrics(JvmMetrics virtualMachineMetrics) {
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;
}

Expand Down
11 changes: 4 additions & 7 deletions ...ting-task/src/test/java/org/apache/nifi/reporting/TestSiteToSiteMetricsReportingTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
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;

Expand All @@ -62,7 +60,6 @@
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.when;

@DisabledOnOs(OS.WINDOWS)
public class TestSiteToSiteMetricsReportingTask {

private ReportingContext context;
Expand Down Expand Up @@ -99,7 +96,7 @@ public void setup() {
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<>();
Expand Down Expand Up @@ -219,7 +216,7 @@ public void testAmbariFormat() throws IOException, InitializationException {
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++) {
Expand Down Expand Up @@ -247,7 +244,7 @@ public void testAmbariFormatWithNullValues() throws IOException, InitializationE
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++) {
Expand All @@ -274,7 +271,7 @@ public void testRecordFormat() throws IOException, InitializationException {
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
Expand Down
Loading