Skip to content
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

Jump to bottom

Be sure to close Graphite properly #1518

Merged
merged 1 commit into from
May 1, 2017
Merged

Be sure to close Graphite properly #1518

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
22 changes: 14 additions & 8 deletions ...ice/src/main/java/com/hubspot/singularity/metrics/SingularityGraphiteReporterManaged.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import com.codahale.metrics.graphite.Graphite;
import com.codahale.metrics.graphite.GraphiteReporter;
import com.google.common.base.Charsets;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
import com.google.inject.Inject;
Expand All @@ -35,14 +34,14 @@ public class SingularityGraphiteReporterManaged implements Managed {

private final GraphiteConfiguration graphiteConfiguration;
private final MetricRegistry registry;
private Optional<GraphiteReporter> reporter;
private GraphiteReporter reporter = null;
private Graphite graphite = null;
private final String hostname;

@Inject
public SingularityGraphiteReporterManaged(SingularityConfiguration configuration, MetricRegistry registry, @Named(SingularityMainModule.HOST_NAME_PROPERTY) String hostname) {
this.graphiteConfiguration = configuration.getGraphiteConfiguration();
this.registry = registry;
this.reporter = Optional.absent();
this.hostname = !Strings.isNullOrEmpty(graphiteConfiguration.getHostnameOmitSuffix()) && hostname.endsWith(graphiteConfiguration.getHostnameOmitSuffix()) ? hostname.substring(0, hostname.length() - graphiteConfiguration.getHostnameOmitSuffix().length()) : hostname;
}

Expand Down Expand Up @@ -77,7 +76,7 @@ public void start() throws Exception {
LOG.info("Reporting data points to graphite server {}:{} every {} seconds with prefix '{}', predicates '{}', and tags '{}'.", graphiteConfiguration.getHostname(),
graphiteConfiguration.getPort(), graphiteConfiguration.getPeriodSeconds(), prefix, JavaUtils.COMMA_JOINER.join(graphiteConfiguration.getPredicates()), JavaUtils.COMMA_EQUALS_MAP_JOINER.join(tags));

final Graphite graphite = new GraphiteWithTags(new InetSocketAddress(graphiteConfiguration.getHostname(), graphiteConfiguration.getPort()), SocketFactory.getDefault(), Charsets.UTF_8, tags);
graphite = new GraphiteWithTags(new InetSocketAddress(graphiteConfiguration.getHostname(), graphiteConfiguration.getPort()), SocketFactory.getDefault(), Charsets.UTF_8, tags);

final GraphiteReporter.Builder reporterBuilder = GraphiteReporter.forRegistry(registry);

Expand All @@ -99,14 +98,21 @@ public boolean matches(String name, Metric metric) {
});
}

reporter = Optional.of(reporterBuilder.build(graphite));
reporter.get().start(graphiteConfiguration.getPeriodSeconds(), TimeUnit.SECONDS);
reporter = reporterBuilder.build(graphite);
reporter.start(graphiteConfiguration.getPeriodSeconds(), TimeUnit.SECONDS);
}

@Override
public void stop() throws Exception {
if (reporter.isPresent()) {
reporter.get().stop();
if (graphite != null) {
LOG.info("Closing GraphiteSender");
graphite.close();
LOG.info("Closed GraphiteSender");
}
if (reporter != null) {
LOG.info("Closing GraphiteReporter");
reporter.stop();
LOG.info("Closed GraphiteReporter");
}
}

Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
<aws.sdk.version>1.10.77</aws.sdk.version>
<project.build.targetJdk>1.8</project.build.targetJdk>
<dep.metrics-guice.version>3.1.3</dep.metrics-guice.version>
<dep.dropwizard-metrics.version>3.1.4</dep.dropwizard-metrics.version>
</properties>

<modules>
Expand Down