Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1475,6 +1475,10 @@ public String getGraphiteMetricPrefix() {
return getString(HoodieMetricsGraphiteConfig.GRAPHITE_METRIC_PREFIX_VALUE);
}

public int getGraphiteReportPeriodSeconds() {
return getInt(HoodieMetricsGraphiteConfig.GRAPHITE_REPORT_PERIOD_IN_SECONDS);
}

public String getJmxHost() {
return getString(HoodieMetricsJmxConfig.JMX_HOST_NAME);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ public class HoodieMetricsGraphiteConfig extends HoodieConfig {
.sinceVersion("0.5.1")
.withDocumentation("Standard prefix applied to all metrics. This helps to add datacenter, environment information for e.g");

public static final ConfigProperty<Integer> GRAPHITE_REPORT_PERIOD_IN_SECONDS = ConfigProperty
.key(GRAPHITE_PREFIX + ".report.period.seconds")
.defaultValue(30)
.sinceVersion("0.10.0")
.withDocumentation("Graphite reporting period in seconds. Default to 30.");

/**
* @deprecated Use {@link #GRAPHITE_SERVER_HOST_NAME} and its methods instead
*/
Expand Down Expand Up @@ -126,6 +132,11 @@ public HoodieMetricsGraphiteConfig.Builder usePrefix(String prefix) {
return this;
}

public HoodieMetricsGraphiteConfig.Builder periodSeconds(String periodSeconds) {
hoodieMetricsGraphiteConfig.setValue(GRAPHITE_REPORT_PERIOD_IN_SECONDS, periodSeconds);
return this;
}

public HoodieMetricsGraphiteConfig build() {
hoodieMetricsGraphiteConfig.setDefaults(HoodieMetricsGraphiteConfig.class.getName());
return hoodieMetricsGraphiteConfig;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public class MetricsGraphiteReporter extends MetricsReporter {
private final HoodieWriteConfig config;
private String serverHost;
private int serverPort;
private final int periodSeconds;

public MetricsGraphiteReporter(HoodieWriteConfig config, MetricRegistry registry) {
this.registry = registry;
Expand All @@ -56,12 +57,13 @@ public MetricsGraphiteReporter(HoodieWriteConfig config, MetricRegistry registry
}

this.graphiteReporter = createGraphiteReport();
this.periodSeconds = config.getGraphiteReportPeriodSeconds();
}

@Override
public void start() {
if (graphiteReporter != null) {
graphiteReporter.start(30, TimeUnit.SECONDS);
graphiteReporter.start(periodSeconds, TimeUnit.SECONDS);
} else {
LOG.error("Cannot start as the graphiteReporter is null.");
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.hudi.metrics;

import org.apache.hudi.common.testutils.NetworkTestUtils;
import org.apache.hudi.config.HoodieWriteConfig;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;

import static org.apache.hudi.metrics.Metrics.registerGauge;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.when;

/**
* Test for the Graphite metrics report.
*/
@ExtendWith(MockitoExtension.class)
public class TestHoodieGraphiteMetrics {

@Mock
HoodieWriteConfig config;

@AfterEach
void shutdownMetrics() {
Metrics.shutdown();
}

@Test
public void testRegisterGauge() {
when(config.isMetricsOn()).thenReturn(true);
when(config.getTableName()).thenReturn("table1");
when(config.getMetricsReporterType()).thenReturn(MetricsReporterType.GRAPHITE);
when(config.getGraphiteServerHost()).thenReturn("localhost");
when(config.getGraphiteServerPort()).thenReturn(NetworkTestUtils.nextFreePort());
when(config.getGraphiteReportPeriodSeconds()).thenReturn(30);
new HoodieMetrics(config);
registerGauge("graphite_metric", 123L);
assertEquals("123", Metrics.getInstance().getRegistry().getGauges()
.get("graphite_metric").getValue().toString());
}
}