Skip to content

Commit

Permalink
remove listener for sending gc events to chronos
Browse files Browse the repository at this point in the history
This isn't being used much and creates an annoying dependency
chain with iep libs. If needed we'll create a new sub-project
under iep with this listener that a user can choose to opt
into.
  • Loading branch information
brharrington committed Sep 10, 2015
1 parent a8f14ec commit 3dc3d43
Show file tree
Hide file tree
Showing 9 changed files with 2 additions and 375 deletions.
4 changes: 0 additions & 4 deletions spectator-nflx-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@ dependencies {
compile project(':spectator-ext-jvm')
compile project(':spectator-ext-sandbox')
compile project(':spectator-reg-servo')
compile "com.fasterxml.jackson.core:jackson-databind:$version_jackson"
compile "com.google.inject:guice:$version_guice"
compile "com.netflix.archaius:archaius-core:$version_archaius1"
compile "com.netflix.eureka:eureka-client:$version_eureka"
compile "com.netflix.iep-shadow:iepshadow-iep-module-rxnetty:$version_iep"
compile "com.netflix.iep-shadow:iepshadow-iep-rxhttp:$version_iep"
testCompile "com.netflix.governator:governator:$version_governator"
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ final class Plugin {

/** Create a new instance. */
@Inject
Plugin(Registry registry, ChronosGcEventListener listener) throws IOException {
Plugin(Registry registry) throws IOException {

AbstractConfiguration config = ConfigurationManager.getConfigInstance();
final boolean enabled = config.getBoolean(ENABLED_PROP, true);
if (enabled) {
ConfigurationManager.loadPropertiesFromResources(CONFIG_FILE);
if (config.getBoolean("spectator.gc.loggingEnabled")) {
GC_LOGGER.start(listener);
GC_LOGGER.start(null);
LOGGER.info("gc logging started");
} else {
LOGGER.info("gc logging is not enabled");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package com.netflix.spectator.nflx;

import com.netflix.spectator.servo.ServoRegistry;
import iep.com.netflix.iep.rxnetty.RxNettyModule;

import javax.annotation.PreDestroy;
import javax.inject.Inject;
Expand Down Expand Up @@ -63,7 +62,6 @@
*/
public final class SpectatorModule extends AbstractModule {
@Override protected void configure() {
install(new RxNettyModule());
bind(Plugin.class).asEagerSingleton();
bind(StaticManager.class).asEagerSingleton();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
package com.netflix.spectator.nflx;

import com.google.inject.AbstractModule;
import iep.com.netflix.iep.http.BasicServerRegistry;
import iep.com.netflix.iep.http.ServerRegistry;
import com.netflix.spectator.api.DefaultRegistry;
import com.netflix.spectator.api.ExtendedRegistry;
import com.netflix.spectator.api.Registry;
Expand All @@ -35,8 +33,5 @@ public final class TestModule extends AbstractModule {
final Registry registry = new DefaultRegistry();
bind(ExtendedRegistry.class).toInstance(new ExtendedRegistry(registry));
bind(Registry.class).toInstance(registry);

// Allows auto-plugin to come up without needing to get DiscoveryClient to work
bind(ServerRegistry.class).toInstance(new BasicServerRegistry());
}
}
11 changes: 0 additions & 11 deletions spectator-nflx-plugin/src/main/resources/spectator.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,3 @@

# Should we enable gc logging? Only checked at startup.
spectator.gc.loggingEnabled=true

# Should we send gc events to chronos backend? Logging must be enabled. This property is only
# checked at startup.
spectator.gc.chronosEnabled=true

# Rest client for chronos gc backend
chronos_gc.niws.client.ReadTimeout=15000
chronos_gc.niws.client.ConnectTimeout=5000
chronos_gc.niws.client.MaxAutoRetriesNextServer=2
chronos_gc.niws.client.GzipEnabled=false
chronos_gc.niws.client.DeploymentContextBasedVipAddresses=chronos_backend-gc:7001

This file was deleted.

Loading

0 comments on commit 3dc3d43

Please sign in to comment.