diff --git a/pom.xml b/pom.xml index 5ea1c10f..1891e799 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ UTF-8 ${project.name}-${project.version}-${timestamp}-${buildNumber} - 1.0.0.27 + 1.0.0.31 diff --git a/src/main/java/com/hpcloud/mon/persister/MonPersisterModule.java b/src/main/java/com/hpcloud/mon/persister/MonPersisterModule.java index 5a083811..8cc54e32 100644 --- a/src/main/java/com/hpcloud/mon/persister/MonPersisterModule.java +++ b/src/main/java/com/hpcloud/mon/persister/MonPersisterModule.java @@ -7,10 +7,9 @@ import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration; import com.hpcloud.mon.persister.consumer.*; import com.hpcloud.mon.persister.dbi.DBIProvider; import com.hpcloud.mon.persister.disruptor.*; -import com.hpcloud.mon.persister.disruptor.event.AlarmStateTransitionedMessageEventHandler; -import com.hpcloud.mon.persister.disruptor.event.AlarmStateTransitionedMessageEventHandlerFactory; -import com.hpcloud.mon.persister.disruptor.event.MetricMessageEventHandler; -import com.hpcloud.mon.persister.disruptor.event.MetricMessageEventHandlerFactory; +import com.hpcloud.mon.persister.disruptor.event.*; +import com.hpcloud.mon.persister.disruptor.event.MetricHandler; +import com.hpcloud.mon.persister.disruptor.event.MetricHandlerFactory; import com.hpcloud.mon.persister.repository.RepositoryCommitHeartbeat; import com.lmax.disruptor.ExceptionHandler; import io.dropwizard.setup.Environment; @@ -33,12 +32,12 @@ public class MonPersisterModule extends AbstractModule { bind(Environment.class).toInstance(environment); install(new FactoryModuleBuilder() - .implement(MetricMessageEventHandler.class, MetricMessageEventHandler.class) - .build(MetricMessageEventHandlerFactory.class)); + .implement(MetricHandler.class, MetricHandler.class) + .build(MetricHandlerFactory.class)); install(new FactoryModuleBuilder() - .implement(AlarmStateTransitionedMessageEventHandler.class, AlarmStateTransitionedMessageEventHandler.class) - .build(AlarmStateTransitionedMessageEventHandlerFactory.class)); + .implement(AlarmStateTransitionedEventHandler.class, AlarmStateTransitionedEventHandler.class) + .build(AlarmStateTransitionedEventHandlerFactory.class)); install(new FactoryModuleBuilder() .implement(KafkaMetricsConsumerRunnableBasic.class, KafkaMetricsConsumerRunnableBasic.class) diff --git a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasic.java b/src/main/java/com/hpcloud/mon/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasic.java index 45b6570d..76f38d83 100644 --- a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasic.java +++ b/src/main/java/com/hpcloud/mon/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasic.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import com.hpcloud.mon.persister.disruptor.AlarmStateHistoryDisruptor; -import com.hpcloud.mon.persister.disruptor.event.AlarmStateTransitionedMessageEvent; +import com.hpcloud.mon.persister.disruptor.event.AlarmStateTransitionedEventHolder; import com.lmax.disruptor.EventTranslator; import kafka.consumer.ConsumerIterator; import kafka.consumer.KafkaStream; @@ -45,14 +45,14 @@ public class KafkaAlarmStateTransitionConsumerRunnableBasic implements Runnable logger.debug("Thread " + threadNumber + ": " + s); try { - final AlarmStateTransitionedEvent message = objectMapper.readValue(s, AlarmStateTransitionedEvent.class); + final AlarmStateTransitionedEvent event = objectMapper.readValue(s, AlarmStateTransitionedEvent.class); - logger.debug(message.toString()); + logger.debug(event.toString()); - disruptor.publishEvent(new EventTranslator() { + disruptor.publishEvent(new EventTranslator() { @Override - public void translateTo(AlarmStateTransitionedMessageEvent event, long sequence) { - event.setMessage(message); + public void translateTo(AlarmStateTransitionedEventHolder eventHolder, long sequence) { + eventHolder.setEvent(event); } }); } catch (Exception e) { diff --git a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaMetricsConsumerRunnableBasic.java b/src/main/java/com/hpcloud/mon/persister/consumer/KafkaMetricsConsumerRunnableBasic.java index 5a21915f..6e64506a 100644 --- a/src/main/java/com/hpcloud/mon/persister/consumer/KafkaMetricsConsumerRunnableBasic.java +++ b/src/main/java/com/hpcloud/mon/persister/consumer/KafkaMetricsConsumerRunnableBasic.java @@ -5,8 +5,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import com.hpcloud.mon.persister.disruptor.MetricDisruptor; -import com.hpcloud.mon.persister.disruptor.event.MetricMessageEvent; -import com.hpcloud.mon.persister.message.MetricEnvelope; +import com.hpcloud.mon.persister.disruptor.event.MetricHolder; +import com.hpcloud.mon.common.model.metric.MetricEnvelope; import com.lmax.disruptor.EventTranslator; import kafka.consumer.ConsumerIterator; import kafka.consumer.KafkaStream; @@ -49,9 +49,9 @@ public class KafkaMetricsConsumerRunnableBasic implements Runnable { logger.debug(envelope.toString()); - disruptor.publishEvent(new EventTranslator() { + disruptor.publishEvent(new EventTranslator() { @Override - public void translateTo(MetricMessageEvent event, long sequence) { + public void translateTo(MetricHolder event, long sequence) { event.setEnvelope(envelope); } diff --git a/src/main/java/com/hpcloud/mon/persister/disruptor/AlarmHistoryDisruptorProvider.java b/src/main/java/com/hpcloud/mon/persister/disruptor/AlarmHistoryDisruptorProvider.java index a5d82317..d2ffa731 100644 --- a/src/main/java/com/hpcloud/mon/persister/disruptor/AlarmHistoryDisruptorProvider.java +++ b/src/main/java/com/hpcloud/mon/persister/disruptor/AlarmHistoryDisruptorProvider.java @@ -3,8 +3,8 @@ package com.hpcloud.mon.persister.disruptor; import com.google.inject.Inject; import com.google.inject.Provider; import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration; -import com.hpcloud.mon.persister.disruptor.event.AlarmStateTransitionedMessageEventFactory; -import com.hpcloud.mon.persister.disruptor.event.AlarmStateTransitionedMessageEventHandlerFactory; +import com.hpcloud.mon.persister.disruptor.event.AlarmStateTransitionedEventFactory; +import com.hpcloud.mon.persister.disruptor.event.AlarmStateTransitionedEventHandlerFactory; import com.lmax.disruptor.EventHandler; import com.lmax.disruptor.ExceptionHandler; import org.slf4j.Logger; @@ -18,13 +18,13 @@ public class AlarmHistoryDisruptorProvider implements Provider { +public class AlarmStateHistoryDisruptor extends Disruptor { public AlarmStateHistoryDisruptor(EventFactory eventFactory, int ringBufferSize, Executor executor) { super(eventFactory, ringBufferSize, executor); } diff --git a/src/main/java/com/hpcloud/mon/persister/disruptor/MetricDisruptor.java b/src/main/java/com/hpcloud/mon/persister/disruptor/MetricDisruptor.java index 0d94a44f..345a1c6e 100644 --- a/src/main/java/com/hpcloud/mon/persister/disruptor/MetricDisruptor.java +++ b/src/main/java/com/hpcloud/mon/persister/disruptor/MetricDisruptor.java @@ -1,6 +1,6 @@ package com.hpcloud.mon.persister.disruptor; -import com.hpcloud.mon.persister.disruptor.event.MetricMessageEvent; +import com.hpcloud.mon.persister.disruptor.event.MetricHolder; import com.lmax.disruptor.EventFactory; import com.lmax.disruptor.WaitStrategy; import com.lmax.disruptor.dsl.Disruptor; @@ -8,7 +8,7 @@ import com.lmax.disruptor.dsl.ProducerType; import java.util.concurrent.Executor; -public class MetricDisruptor extends Disruptor { +public class MetricDisruptor extends Disruptor { public MetricDisruptor(EventFactory eventFactory, int ringBufferSize, Executor executor) { super(eventFactory, ringBufferSize, executor); } diff --git a/src/main/java/com/hpcloud/mon/persister/disruptor/MetricDisruptorProvider.java b/src/main/java/com/hpcloud/mon/persister/disruptor/MetricDisruptorProvider.java index de89f846..5f373bc1 100644 --- a/src/main/java/com/hpcloud/mon/persister/disruptor/MetricDisruptorProvider.java +++ b/src/main/java/com/hpcloud/mon/persister/disruptor/MetricDisruptorProvider.java @@ -3,8 +3,8 @@ package com.hpcloud.mon.persister.disruptor; import com.google.inject.Inject; import com.google.inject.Provider; import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration; -import com.hpcloud.mon.persister.disruptor.event.MetricMessageEventFactory; -import com.hpcloud.mon.persister.disruptor.event.MetricMessageEventHandlerFactory; +import com.hpcloud.mon.persister.disruptor.event.MetricFactory; +import com.hpcloud.mon.persister.disruptor.event.MetricHandlerFactory; import com.lmax.disruptor.EventHandler; import com.lmax.disruptor.ExceptionHandler; import org.slf4j.Logger; @@ -18,17 +18,17 @@ public class MetricDisruptorProvider implements Provider { private static final Logger logger = LoggerFactory.getLogger(MetricDisruptorProvider.class); private final MonPersisterConfiguration configuration; - private final MetricMessageEventHandlerFactory metricMessageEventHandlerFactory; + private final MetricHandlerFactory eventHandlerFactory; private final ExceptionHandler exceptionHandler; private final MetricDisruptor instance; @Inject public MetricDisruptorProvider(MonPersisterConfiguration configuration, - MetricMessageEventHandlerFactory metricMessageEventHandlerFactory, + MetricHandlerFactory eventHandlerFactory, ExceptionHandler exceptionHandler) { this.configuration = configuration; - this.metricMessageEventHandlerFactory = metricMessageEventHandlerFactory; + this.eventHandlerFactory = eventHandlerFactory; this.exceptionHandler = exceptionHandler; this.instance = createInstance(); } @@ -38,12 +38,12 @@ public class MetricDisruptorProvider implements Provider { logger.debug("Creating disruptor..."); Executor executor = Executors.newCachedThreadPool(); - MetricMessageEventFactory metricMessageEventFactory = new MetricMessageEventFactory(); + MetricFactory eventFactory = new MetricFactory(); int bufferSize = configuration.getDisruptorConfiguration().getBufferSize(); logger.debug("Buffer size for instance of disruptor [" + bufferSize + "]"); - MetricDisruptor disruptor = new MetricDisruptor(metricMessageEventFactory, bufferSize, executor); + MetricDisruptor disruptor = new MetricDisruptor(eventFactory, bufferSize, executor); disruptor.handleExceptionsWith(exceptionHandler); int batchSize = configuration.getVerticaOutputProcessorConfiguration().getBatchSize(); @@ -55,7 +55,7 @@ public class MetricDisruptorProvider implements Provider { EventHandler[] eventHandlers = new EventHandler[numOutputProcessors]; for (int i = 0; i < numOutputProcessors; ++i) { - eventHandlers[i] = metricMessageEventHandlerFactory.create(i, numOutputProcessors, batchSize); + eventHandlers[i] = eventHandlerFactory.create(i, numOutputProcessors, batchSize); } disruptor.handleEventsWith(eventHandlers); diff --git a/src/main/java/com/hpcloud/mon/persister/disruptor/event/AlarmStateTransitionedEventFactory.java b/src/main/java/com/hpcloud/mon/persister/disruptor/event/AlarmStateTransitionedEventFactory.java new file mode 100644 index 00000000..1b0a7b3f --- /dev/null +++ b/src/main/java/com/hpcloud/mon/persister/disruptor/event/AlarmStateTransitionedEventFactory.java @@ -0,0 +1,13 @@ +package com.hpcloud.mon.persister.disruptor.event; + +import com.lmax.disruptor.EventFactory; + +public class AlarmStateTransitionedEventFactory implements EventFactory { + + public static final AlarmStateTransitionedEventFactory INSTANCE = new AlarmStateTransitionedEventFactory(); + + @Override + public AlarmStateTransitionedEventHolder newInstance() { + return new AlarmStateTransitionedEventHolder(); + } +} diff --git a/src/main/java/com/hpcloud/mon/persister/disruptor/event/AlarmStateTransitionedMessageEventHandler.java b/src/main/java/com/hpcloud/mon/persister/disruptor/event/AlarmStateTransitionedEventHandler.java similarity index 76% rename from src/main/java/com/hpcloud/mon/persister/disruptor/event/AlarmStateTransitionedMessageEventHandler.java rename to src/main/java/com/hpcloud/mon/persister/disruptor/event/AlarmStateTransitionedEventHandler.java index bad0568d..cdd17ab6 100644 --- a/src/main/java/com/hpcloud/mon/persister/disruptor/event/AlarmStateTransitionedMessageEventHandler.java +++ b/src/main/java/com/hpcloud/mon/persister/disruptor/event/AlarmStateTransitionedEventHandler.java @@ -13,9 +13,9 @@ import io.dropwizard.setup.Environment; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AlarmStateTransitionedMessageEventHandler implements EventHandler { +public class AlarmStateTransitionedEventHandler implements EventHandler { - private static final Logger logger = LoggerFactory.getLogger(AlarmStateTransitionedMessageEventHandler.class); + private static final Logger logger = LoggerFactory.getLogger(AlarmStateTransitionedEventHandler.class); private final int ordinal; private final int numProcessors; private final int batchSize; @@ -34,12 +34,12 @@ public class AlarmStateTransitionedMessageEventHandler implements EventHandler { - - public static final AlarmStateTransitionedMessageEventFactory INSTANCE = new AlarmStateTransitionedMessageEventFactory(); - - @Override - public AlarmStateTransitionedMessageEvent newInstance() { - return new AlarmStateTransitionedMessageEvent(); - } -} diff --git a/src/main/java/com/hpcloud/mon/persister/disruptor/event/AlarmStateTransitionedMessageEventHandlerFactory.java b/src/main/java/com/hpcloud/mon/persister/disruptor/event/AlarmStateTransitionedMessageEventHandlerFactory.java deleted file mode 100644 index 0901df91..00000000 --- a/src/main/java/com/hpcloud/mon/persister/disruptor/event/AlarmStateTransitionedMessageEventHandlerFactory.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.hpcloud.mon.persister.disruptor.event; - -import com.google.inject.assistedinject.Assisted; - -public interface AlarmStateTransitionedMessageEventHandlerFactory { - AlarmStateTransitionedMessageEventHandler create(@Assisted("ordinal") int ordinal, - @Assisted("numProcessors") int numProcessors, - @Assisted("batchSize") int batchSize); -} diff --git a/src/main/java/com/hpcloud/mon/persister/disruptor/event/MetricFactory.java b/src/main/java/com/hpcloud/mon/persister/disruptor/event/MetricFactory.java new file mode 100644 index 00000000..5509d30c --- /dev/null +++ b/src/main/java/com/hpcloud/mon/persister/disruptor/event/MetricFactory.java @@ -0,0 +1,13 @@ +package com.hpcloud.mon.persister.disruptor.event; + +import com.lmax.disruptor.EventFactory; + +public class MetricFactory implements EventFactory { + + public static final MetricFactory INSTANCE = new MetricFactory(); + + @Override + public MetricHolder newInstance() { + return new MetricHolder(); + } +} diff --git a/src/main/java/com/hpcloud/mon/persister/disruptor/event/MetricMessageEventHandler.java b/src/main/java/com/hpcloud/mon/persister/disruptor/event/MetricHandler.java similarity index 73% rename from src/main/java/com/hpcloud/mon/persister/disruptor/event/MetricMessageEventHandler.java rename to src/main/java/com/hpcloud/mon/persister/disruptor/event/MetricHandler.java index 6a184af5..49587e7e 100644 --- a/src/main/java/com/hpcloud/mon/persister/disruptor/event/MetricMessageEventHandler.java +++ b/src/main/java/com/hpcloud/mon/persister/disruptor/event/MetricHandler.java @@ -5,8 +5,8 @@ import com.codahale.metrics.Meter; import com.codahale.metrics.Timer; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; +import com.hpcloud.mon.common.model.metric.Metric; import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration; -import com.hpcloud.mon.persister.message.MetricMessage; import com.hpcloud.mon.persister.repository.Sha1HashId; import com.hpcloud.mon.persister.repository.VerticaMetricRepository; import com.lmax.disruptor.EventHandler; @@ -21,10 +21,11 @@ import java.util.Map; import java.util.TimeZone; import java.util.TreeMap; -public class MetricMessageEventHandler implements EventHandler { +public class MetricHandler implements EventHandler { - private static final Logger logger = LoggerFactory.getLogger(MetricMessageEventHandler.class); + private static final Logger logger = LoggerFactory.getLogger(MetricHandler.class); private static final String TENANT_ID = "tenantId"; + private static final String REGION = "region"; private final int ordinal; private final int numProcessors; @@ -44,17 +45,17 @@ public class MetricMessageEventHandler implements EventHandler meta = metricMessageEvent.getMetricEnvelope().meta; + Metric metric = metricEvent.getMetricEnvelope().metric; + Map meta = metricEvent.getMetricEnvelope().meta; String tenantId = ""; if (!meta.containsKey(TENANT_ID)) { logger.warn("Failed to find 'tenantId' in message envelope meta data. Metric message may be mal-formed. Setting 'tenantId' to empty string."); - logger.warn(metricMessage.toString()); + logger.warn(metric.toString()); logger.warn("meta" + meta.toString()); } else { tenantId = (String) meta.get(TENANT_ID); } - String definitionIdStringToHash = metricMessage.getName() + tenantId + metricMessage.getRegion(); + String region = ""; + if (meta.containsKey(REGION)) { + region = (String) meta.get(REGION); + } + + String definitionIdStringToHash = metric.getName() + tenantId + region; byte[] definitionIdSha1Hash = DigestUtils.sha(definitionIdStringToHash); Sha1HashId definitionSha1HashId = new Sha1HashId((definitionIdSha1Hash)); - verticaMetricRepository.addToBatchStagingDefinitions(definitionSha1HashId, metricMessage.getName(), tenantId, metricMessage.getRegion()); + verticaMetricRepository.addToBatchStagingDefinitions(definitionSha1HashId, metric.getName(), tenantId, region); definitionCounter.inc(); String dimensionIdStringToHash = ""; - if (metricMessage.getDimensions() != null) { + if (metric.getDimensions() != null) { // Sort the dimensions on name and value. - TreeMap dimensionTreeMap = new TreeMap<>(metricMessage.getDimensions()); + TreeMap dimensionTreeMap = new TreeMap<>(metric.getDimensions()); for (String dimensionName : dimensionTreeMap.keySet()) { String dimensionValue = dimensionTreeMap.get(dimensionName); dimensionIdStringToHash += dimensionName + dimensionValue; @@ -134,8 +140,8 @@ public class MetricMessageEventHandler implements EventHandler dimensionTreeMap = new TreeMap<>(metricMessage.getDimensions()); + if (metric.getDimensions() != null) { + TreeMap dimensionTreeMap = new TreeMap<>(metric.getDimensions()); for (String dimensionName : dimensionTreeMap.keySet()) { String dimensionValue = dimensionTreeMap.get(dimensionName); verticaMetricRepository.addToBatchStagingDimensions(dimensionsSha1HashId, dimensionName, dimensionValue); @@ -149,22 +155,19 @@ public class MetricMessageEventHandler implements EventHandler { - - public static final MetricMessageEventFactory INSTANCE = new MetricMessageEventFactory(); - - @Override - public MetricMessageEvent newInstance() { - return new MetricMessageEvent(); - } -} diff --git a/src/main/java/com/hpcloud/mon/persister/disruptor/event/MetricMessageEventHandlerFactory.java b/src/main/java/com/hpcloud/mon/persister/disruptor/event/MetricMessageEventHandlerFactory.java deleted file mode 100644 index 63b5ce90..00000000 --- a/src/main/java/com/hpcloud/mon/persister/disruptor/event/MetricMessageEventHandlerFactory.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.hpcloud.mon.persister.disruptor.event; - -import com.google.inject.assistedinject.Assisted; - -public interface MetricMessageEventHandlerFactory { - MetricMessageEventHandler create(@Assisted("ordinal") int ordinal, - @Assisted("numProcessors") int numProcessors, - @Assisted("batchSize") int batchSize); -} diff --git a/src/main/java/com/hpcloud/mon/persister/message/MetricEnvelope.java b/src/main/java/com/hpcloud/mon/persister/message/MetricEnvelope.java deleted file mode 100644 index f1c73c7e..00000000 --- a/src/main/java/com/hpcloud/mon/persister/message/MetricEnvelope.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.hpcloud.mon.persister.message; - -import com.google.common.base.Preconditions; - -import java.util.Map; - -public class MetricEnvelope { - public MetricMessage metric; - public Map meta; - - protected MetricEnvelope() { - } - - public MetricEnvelope(MetricMessage metric) { - Preconditions.checkNotNull(metric, "metric"); - this.metric = metric; - } - - public MetricEnvelope(MetricMessage metric, Map meta) { - Preconditions.checkNotNull(metric, "metric"); - Preconditions.checkNotNull(meta, "meta"); - this.metric = metric; - this.meta = meta; - } - - @Override - public String toString() { - return "MetricEnvelope{" + - "metric=" + metric + - ", meta=" + meta + - '}'; - } -} \ No newline at end of file diff --git a/src/main/java/com/hpcloud/mon/persister/message/MetricMessage.java b/src/main/java/com/hpcloud/mon/persister/message/MetricMessage.java deleted file mode 100644 index 90febcf7..00000000 --- a/src/main/java/com/hpcloud/mon/persister/message/MetricMessage.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.hpcloud.mon.persister.message; - -import java.util.Arrays; -import java.util.Map; - -public class MetricMessage { - - String name = null; - - String region = ""; - - Map dimensions = null; - - String timestamp = null; - - Double value = null; - - Double[][] time_values = null; - - @Override - public String toString() { - return "MetricMessage{" + - "name='" + name + '\'' + - ", region='" + region + '\'' + - ", dimensions=" + dimensions + - ", timeStamp='" + timestamp + '\'' + - ", value=" + value + - ", time_values=" + Arrays.toString(time_values) + - '}'; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getRegion() { - return region; - } - - public void setRegion(String region) { - this.region = region; - } - - public Map getDimensions() { - return dimensions; - } - - public void setDimensions(Map dimensions) { - this.dimensions = dimensions; - } - - public String getTimestamp() { - return timestamp; - } - - public void setTimestamp(String timestamp) { - this.timestamp = timestamp; - } - - public Double getValue() { - return value; - } - - public void setValue(Double value) { - this.value = value; - } - - public Double[][] getTime_values() { - return time_values; - } - - public void setTime_values(Double[][] time_values) { - this.time_values = time_values; - } -} diff --git a/src/main/java/com/hpcloud/mon/persister/repository/RepositoryCommitHeartbeat.java b/src/main/java/com/hpcloud/mon/persister/repository/RepositoryCommitHeartbeat.java index 800168b2..d787b480 100644 --- a/src/main/java/com/hpcloud/mon/persister/repository/RepositoryCommitHeartbeat.java +++ b/src/main/java/com/hpcloud/mon/persister/repository/RepositoryCommitHeartbeat.java @@ -3,8 +3,8 @@ package com.hpcloud.mon.persister.repository; import com.google.inject.Inject; import com.hpcloud.mon.persister.disruptor.AlarmStateHistoryDisruptor; import com.hpcloud.mon.persister.disruptor.MetricDisruptor; -import com.hpcloud.mon.persister.disruptor.event.AlarmStateTransitionedMessageEvent; -import com.hpcloud.mon.persister.disruptor.event.MetricMessageEvent; +import com.hpcloud.mon.persister.disruptor.event.AlarmStateTransitionedEventHolder; +import com.hpcloud.mon.persister.disruptor.event.MetricHolder; import com.lmax.disruptor.EventTranslator; import com.lmax.disruptor.dsl.Disruptor; import io.dropwizard.lifecycle.Managed; @@ -58,18 +58,18 @@ public class RepositoryCommitHeartbeat implements Managed { // Send heartbeat logger.debug("Sending heartbeat message"); - metricDisruptor.publishEvent(new EventTranslator() { + metricDisruptor.publishEvent(new EventTranslator() { @Override - public void translateTo(MetricMessageEvent event, long sequence) { + public void translateTo(MetricHolder event, long sequence) { event.setEnvelope(null); } }); - alarmHistoryDisruptor.publishEvent(new EventTranslator() { + alarmHistoryDisruptor.publishEvent(new EventTranslator() { @Override - public void translateTo(AlarmStateTransitionedMessageEvent event, long sequence) { - event.setMessage(null); + public void translateTo(AlarmStateTransitionedEventHolder event, long sequence) { + event.setEvent(null); } });