From a0e5e142ea9dc17657ce554e05e132aaeb082acc Mon Sep 17 00:00:00 2001 From: Jay Date: Thu, 16 Feb 2017 02:49:21 -0800 Subject: [PATCH 1/5] [EAGLE-906] updating to use org.apache.storm==1.0.3 with compatibility changes --- .../eagle/alert/app/AlertUnitTopologyApp.java | 2 +- .../alert/engine/model/PartitionedEvent.java | 2 +- .../alert-devtools/bin/start-sampleclient1.sh | 2 +- .../alert-devtools/bin/start-sampleclient2.sh | 2 +- .../alert/engine/StormMultiCountMetric.java | 2 +- .../eagle/alert/engine/StreamContextImpl.java | 4 +- .../eagle/alert/engine/UnitTopologyMain.java | 8 ++-- .../router/impl/RoutePhysicalGrouping.java | 8 ++-- .../engine/router/impl/ShuffleGrouping.java | 6 +-- .../router/impl/StormOutputCollector.java | 2 +- .../engine/runner/AbstractStreamBolt.java | 10 ++--- .../eagle/alert/engine/runner/AlertBolt.java | 12 ++--- .../engine/runner/AlertPublisherBolt.java | 12 ++--- .../engine/runner/StormMetricConsumer.java | 6 +-- .../runner/StormMetricTaggedConsumer.java | 6 +-- .../alert/engine/runner/StreamRouterBolt.java | 8 ++-- .../engine/runner/UnitTopologyRunner.java | 22 +++++---- .../eagle/alert/engine/scheme/JsonScheme.java | 11 ++--- .../engine/scheme/PlainStringScheme.java | 11 ++--- .../alert/engine/spout/CorrelationSpout.java | 18 ++++---- .../spout/SpoutOutputCollectorWrapper.java | 4 +- .../apache}/storm/kafka/KafkaSpoutMetric.java | 8 ++-- .../storm/kafka/KafkaSpoutWrapper.java | 8 ++-- .../eagle/alert/engine/e2e/Integration1.java | 2 +- .../eagle/alert/engine/e2e/Integration2.java | 2 +- .../eagle/alert/engine/e2e/Integration3.java | 2 +- .../engine/e2e/Integration4NoDataAlert.java | 2 +- .../engine/e2e/Integration5AbsenceAlert.java | 2 +- .../eagle/alert/engine/e2e/SampleClient1.java | 2 +- .../eagle/alert/engine/e2e/SampleClient2.java | 2 +- .../engine/e2e/SampleClient4NoDataAlert.java | 2 +- ...tOutputCollectorThreadSafeWrapperTest.java | 4 +- .../SiddhiCEPPolicyEventHandlerTest.java | 2 +- .../alert/engine/mock/MockStreamReceiver.java | 12 ++--- .../alert/engine/router/TestAlertBolt.java | 45 +++++++++++++++---- .../TestStreamRouterBoltOutputCollector.java | 15 ++++--- .../engine/runner/TestStreamRouterBolt.java | 16 +++---- .../PartitionedEventSerializerTest.java | 6 +-- .../statecheck/TestStateCheckPolicy.java | 17 ++++--- .../engine/topology/AlertTopologyTest.java | 10 ++--- .../CoordinatorSpoutIntegrationTest.java | 14 +++--- .../engine/topology/CorrelationSpoutTest.java | 6 +-- .../topology/FastWordCountTopology.java | 30 ++++++------- .../eagle/alert/engine/topology/TestBolt.java | 10 ++--- .../TestStormCustomGroupingRouting.java | 28 ++++++------ .../engine/topology/TestStormParallelism.java | 22 ++++----- .../topology/TestStormStreamIdRouting.java | 22 ++++----- .../impl/TopologyMgmtResourceImpl.java | 16 ++++--- .../impl/TopologyMgmtResourceImplTest.java | 12 ++--- .../apache/eagle/app/StormApplication.java | 2 +- .../builder/ApplicationBuilder.java | 6 +-- .../builder/StormOutputCollector.java | 2 +- .../builder/TransformFunctionBolt.java | 12 ++--- .../impl/StormExecutionRuntime.java | 36 ++++++++------- .../app/environment/impl/StormSubmitter.java | 22 ++++----- .../app/messaging/EntityStreamPersist.java | 10 ++--- .../app/messaging/FlattenEventMapper.java | 2 +- .../eagle/app/messaging/JsonSchema.java | 11 ++--- .../app/messaging/KafkaStreamProvider.java | 2 +- .../eagle/app/messaging/KafkaStreamSink.java | 4 +- .../app/messaging/KafkaStreamSource.java | 12 ++--- .../messaging/KafkaStreamSourceConfig.java | 8 ++-- .../app/messaging/MetricSchemaGenerator.java | 10 ++--- .../app/messaging/MetricStreamPersist.java | 12 ++--- .../eagle/app/messaging/StormStreamSink.java | 10 ++--- .../app/messaging/StormStreamSource.java | 2 +- .../app/messaging/StreamEventMapper.java | 2 +- .../eagle/app/utils/StreamConvertHelper.java | 2 +- .../eagle/app/TestStormApplication.java | 14 +++--- .../eagle/app/storm/MockStormApplication.java | 14 +++--- .../impl/storm/StormSpoutProvider.java | 2 +- .../impl/storm/kafka/KafkaSpoutProvider.java | 14 +++--- .../partition/CustomPartitionGrouping.java | 6 +-- .../app/example/ExampleStormApplication.java | 16 +++---- .../org/apache/eagle/gc/GCLogApplication.java | 12 ++--- .../eagle/gc/executor/GCLogAnalyzerBolt.java | 12 ++--- .../gc/executor/GCMetricGeneratorBolt.java | 12 ++--- .../webapp/app/apps/hadoop_metric/index.html | 6 +++ .../hadoop/queue/HadoopQueueRunningApp.java | 7 +-- .../queue/crawler/ClusterMetricsCrawler.java | 2 +- .../crawler/ClusterMetricsParseListener.java | 2 +- .../crawler/RunningAppParseListener.java | 2 +- .../queue/crawler/RunningAppsCrawler.java | 2 +- .../queue/crawler/SchedulerInfoCrawler.java | 2 +- .../crawler/SchedulerInfoParseListener.java | 2 +- .../storm/HadoopQueueMetricPersistBolt.java | 14 +++--- .../storm/HadoopQueueRunningExtractor.java | 2 +- .../queue/storm/HadoopQueueRunningSpout.java | 9 ++++ .../aggregation/AggregationApplication.java | 4 +- .../aggregation/storm/AggregationBolt.java | 10 ++--- .../aggregation/storm/AggregationSpout.java | 12 ++--- .../mr/history/MRHistoryJobApplication.java | 6 +-- .../JobHistorySpoutCollectorInterceptor.java | 2 +- .../jpm/mr/history/storm/JobHistorySpout.java | 10 ++--- .../mr/history/storm/JobHistorySpoutTest.java | 11 +++-- .../mr/running/MRRunningJobApplication.java | 6 +-- .../running/storm/MRRunningJobFetchSpout.java | 12 ++--- .../running/storm/MRRunningJobParseBolt.java | 10 ++--- .../running/MRRunningJobApplicationTest.java | 15 ++++--- .../jpm/spark/history/SparkHistoryJobApp.java | 4 +- .../storm/SparkHistoryJobParseBolt.java | 10 ++--- .../history/storm/SparkHistoryJobSpout.java | 14 +++--- .../jpm/spark/running/SparkRunningJobApp.java | 6 +-- .../storm/SparkRunningJobFetchSpout.java | 12 ++--- .../storm/SparkRunningJobParseBolt.java | 10 ++--- .../eagle/metric/HadoopMetricMonitorApp.java | 2 +- .../EagleMetricCollectorApplication.java | 10 ++--- .../kafka/KafkaMessageDistributionBolt.java | 10 ++--- .../kafka/KafkaOffsetSourceSpoutProvider.java | 2 +- .../eagle/metric/kafka/KafkaOffsetSpout.java | 8 ++-- .../kafka/KafkaSourcedSpoutProvider.java | 14 +++--- .../metric/kafka/KafkaSourcedSpoutScheme.java | 9 ++-- .../enrich/AbstractDataEnrichBolt.java | 8 ++-- .../security/topo/TopologySubmitter.java | 15 ++++--- .../traffic/HadoopLogAccumulatorBolt.java | 14 +++--- .../hbase/HBaseAuditLogApplication.java | 12 ++--- .../hbase/HBaseAuditLogParserBolt.java | 12 ++--- .../HbaseResourceSensitivityDataJoinBolt.java | 6 +-- .../AbstractHdfsAuditLogApplication.java | 10 ++--- .../auditlog/HdfsAuditLogApplication.java | 10 ++--- .../auditlog/HdfsAuditLogParserBolt.java | 12 ++--- .../HdfsSensitivityDataEnrichBolt.java | 6 +-- .../auditlog/HdfsUserCommandReassembler.java | 2 +- .../auditlog/IPZoneDataEnrichBolt.java | 6 +-- .../auditlog/kafka/MessageJsonScheme.java | 15 ++++--- .../auditlog/TestUserCommandReassembler.java | 21 +++++++-- .../HdfsAuthLogMonitoringMain.java | 10 ++--- .../securitylog/SecurityLogParserBolt.java | 14 +++--- .../hive/HiveQueryMonitoringApplication.java | 10 ++--- .../hive/jobrunning/HiveJobFetchSpout.java | 10 ++--- ...veJobRunningSourcedStormSpoutProvider.java | 2 +- .../hive/jobrunning/HiveQueryParserBolt.java | 12 ++--- .../hive/jobrunning/JobFilterBolt.java | 12 ++--- .../HiveSensitivityDataEnrichBolt.java | 6 +-- .../jobrunning/TestHiveJobFetchSpout.java | 4 +- .../auditlog/MapRFSAuditLogApplication.java | 2 +- .../auditlog/MapRFSAuditLogParserBolt.java | 12 ++--- .../oozie/parse/OozieAuditLogApplication.java | 12 ++--- .../oozie/parse/OozieAuditLogParserBolt.java | 12 ++--- .../OozieResourceSensitivityDataJoinBolt.java | 8 ++-- .../eagle/topology/TopologyCheckApp.java | 4 +- .../extractor/TopologyExtractorFactory.java | 2 +- .../extractor/hbase/HbaseTopologyCrawler.java | 4 +- .../extractor/hdfs/HdfsTopologyCrawler.java | 4 +- .../extractor/mr/MRTopologyCrawler.java | 4 +- .../topology/storm/HealthCheckParseBolt.java | 14 +++--- .../topology/storm/TopologyCheckAppSpout.java | 10 ++--- .../topology/storm/TopologyDataExtractor.java | 2 +- .../storm/TopologyDataPersistBolt.java | 14 +++--- pom.xml | 4 +- 150 files changed, 714 insertions(+), 628 deletions(-) rename eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/{ => org/apache}/storm/kafka/KafkaSpoutMetric.java (93%) rename eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/{ => org/apache}/storm/kafka/KafkaSpoutWrapper.java (96%) create mode 100644 eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/index.html diff --git a/eagle-core/eagle-alert-parent/eagle-alert-app/src/main/java/org/apache/eagle/alert/app/AlertUnitTopologyApp.java b/eagle-core/eagle-alert-parent/eagle-alert-app/src/main/java/org/apache/eagle/alert/app/AlertUnitTopologyApp.java index a122c087fe..91476292a5 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert-app/src/main/java/org/apache/eagle/alert/app/AlertUnitTopologyApp.java +++ b/eagle-core/eagle-alert-parent/eagle-alert-app/src/main/java/org/apache/eagle/alert/app/AlertUnitTopologyApp.java @@ -20,7 +20,7 @@ import org.apache.eagle.alert.engine.UnitTopologyMain; import org.apache.eagle.app.StormApplication; import org.apache.eagle.app.environment.impl.StormEnvironment; -import backtype.storm.generated.StormTopology; +import org.apache.storm.generated.StormTopology; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-common/src/main/java/org/apache/eagle/alert/engine/model/PartitionedEvent.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-common/src/main/java/org/apache/eagle/alert/engine/model/PartitionedEvent.java index ecca0fff82..61a36cf8fb 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-common/src/main/java/org/apache/eagle/alert/engine/model/PartitionedEvent.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-common/src/main/java/org/apache/eagle/alert/engine/model/PartitionedEvent.java @@ -17,7 +17,7 @@ package org.apache.eagle.alert.engine.model; import org.apache.eagle.alert.engine.coordinator.StreamPartition; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; import org.apache.commons.lang3.builder.HashCodeBuilder; import java.io.Serializable; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-devtools/bin/start-sampleclient1.sh b/eagle-core/eagle-alert-parent/eagle-alert/alert-devtools/bin/start-sampleclient1.sh index df607398ad..9c8742db17 100755 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-devtools/bin/start-sampleclient1.sh +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-devtools/bin/start-sampleclient1.sh @@ -16,5 +16,5 @@ cd $(dirname $0)/../../alert-assembly/ -java -cp ${MAVEN_REPO}/org/apache/storm/storm-core/0.9.3/storm-core-0.9.3.jar:target/alert-engine-0.0.1-SNAPSHOT-alert-assembly.jar org.apache.eagle.alert.engine.e2e.SampleClient1 +java -cp ${MAVEN_REPO}/org/apache/storm/storm-core/1.0.3/storm-core-1.0.3.jar:target/alert-engine-0.0.1-SNAPSHOT-alert-assembly.jar org.apache.eagle.alert.engine.e2e.SampleClient1 diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-devtools/bin/start-sampleclient2.sh b/eagle-core/eagle-alert-parent/eagle-alert/alert-devtools/bin/start-sampleclient2.sh index 4b96d5d112..a845b00b61 100755 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-devtools/bin/start-sampleclient2.sh +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-devtools/bin/start-sampleclient2.sh @@ -17,5 +17,5 @@ cd $(dirname $0)/../../alert-assembly/ -java -cp ${MAVEN_REPO}/org/apache/storm/storm-core/0.9.3/storm-core-0.9.3.jar:target/alert-engine-0.0.1-SNAPSHOT-alert-assembly.jar org.apache.eagle.alert.engine.e2e.SampleClient2 +java -cp ${MAVEN_REPO}/org/apache/storm/storm-core/1.0.3/storm-core-1.0.3.jar:target/alert-engine-0.0.1-SNAPSHOT-alert-assembly.jar org.apache.eagle.alert.engine.e2e.SampleClient2 diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/StormMultiCountMetric.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/StormMultiCountMetric.java index 26760ab441..aae3ff7a58 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/StormMultiCountMetric.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/StormMultiCountMetric.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.alert.engine; -import backtype.storm.metric.api.MultiCountMetric; +import org.apache.storm.metric.api.MultiCountMetric; public class StormMultiCountMetric implements StreamCounter { private MultiCountMetric countMetric; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/StreamContextImpl.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/StreamContextImpl.java index e77a41be27..a6769ce8e2 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/StreamContextImpl.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/StreamContextImpl.java @@ -16,8 +16,8 @@ */ package org.apache.eagle.alert.engine; -import backtype.storm.metric.api.MultiCountMetric; -import backtype.storm.task.TopologyContext; +import org.apache.storm.metric.api.MultiCountMetric; +import org.apache.storm.task.TopologyContext; import com.typesafe.config.Config; public class StreamContextImpl implements StreamContext { diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/UnitTopologyMain.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/UnitTopologyMain.java index 055032f885..16d7ed0169 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/UnitTopologyMain.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/UnitTopologyMain.java @@ -27,10 +27,8 @@ import org.apache.eagle.alert.config.ZKConfigBuilder; import org.apache.eagle.alert.engine.coordinator.impl.ZKMetadataChangeNotifyService; import org.apache.eagle.alert.engine.runner.UnitTopologyRunner; - -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.TopologyBuilder; - +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.TopologyBuilder; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; @@ -70,7 +68,7 @@ public static void main(String[] args) throws Exception { new UnitTopologyRunner(changeNotifyService).run(topologyId, config); } - public static void runTopology(Config config, backtype.storm.Config stormConfig) { + public static void runTopology(Config config, org.apache.storm.Config stormConfig) { // load config and start String topologyId = getTopologyName(config); ZKMetadataChangeNotifyService changeNotifyService = createZKNotifyService(config, topologyId); diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/router/impl/RoutePhysicalGrouping.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/router/impl/RoutePhysicalGrouping.java index 5c10675b5c..128e186a28 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/router/impl/RoutePhysicalGrouping.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/router/impl/RoutePhysicalGrouping.java @@ -18,13 +18,13 @@ import org.apache.eagle.alert.engine.coordinator.StreamPartition; import org.apache.eagle.alert.engine.model.PartitionedEvent; -import backtype.storm.generated.GlobalStreamId; -import backtype.storm.grouping.CustomStreamGrouping; -import backtype.storm.task.WorkerTopologyContext; +import org.apache.storm.generated.GlobalStreamId; +import org.apache.storm.grouping.CustomStreamGrouping; +import org.apache.storm.task.WorkerTopologyContext; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import storm.trident.partition.GlobalGrouping; +import org.apache.storm.trident.partition.GlobalGrouping; import java.util.*; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/router/impl/ShuffleGrouping.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/router/impl/ShuffleGrouping.java index 752c7428e1..1a7eadba7e 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/router/impl/ShuffleGrouping.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/router/impl/ShuffleGrouping.java @@ -17,9 +17,9 @@ */ package org.apache.eagle.alert.engine.router.impl; -import backtype.storm.generated.GlobalStreamId; -import backtype.storm.grouping.CustomStreamGrouping; -import backtype.storm.task.WorkerTopologyContext; +import org.apache.storm.generated.GlobalStreamId; +import org.apache.storm.grouping.CustomStreamGrouping; +import org.apache.storm.task.WorkerTopologyContext; import java.io.Serializable; import java.util.*; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/router/impl/StormOutputCollector.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/router/impl/StormOutputCollector.java index 7b8f344060..44110be7b1 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/router/impl/StormOutputCollector.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/router/impl/StormOutputCollector.java @@ -17,7 +17,7 @@ package org.apache.eagle.alert.engine.router.impl; -import backtype.storm.task.OutputCollector; +import org.apache.storm.task.OutputCollector; import org.apache.eagle.alert.engine.model.PartitionedEvent; import org.apache.eagle.alert.engine.router.StreamOutputCollector; import org.apache.eagle.alert.engine.serialization.PartitionedEventSerializer; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/AbstractStreamBolt.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/AbstractStreamBolt.java index ab05b48f54..d65bf7f044 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/AbstractStreamBolt.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/AbstractStreamBolt.java @@ -25,11 +25,11 @@ import org.apache.eagle.alert.engine.serialization.SerializationMetadataProvider; import org.apache.eagle.alert.engine.serialization.Serializers; import org.apache.eagle.alert.utils.AlertConstants; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Fields; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Fields; import com.google.common.base.Preconditions; import com.typesafe.config.Config; import org.slf4j.Logger; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/AlertBolt.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/AlertBolt.java index 144f9aa1b5..6f628fea9d 100755 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/AlertBolt.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/AlertBolt.java @@ -51,12 +51,12 @@ import com.typesafe.config.Config; -import backtype.storm.metric.api.MultiCountMetric; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.metric.api.MultiCountMetric; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; /** * Since 5/1/16. diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/AlertPublisherBolt.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/AlertPublisherBolt.java index 44a5fe91db..13d8b3a18a 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/AlertPublisherBolt.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/AlertPublisherBolt.java @@ -16,12 +16,12 @@ */ package org.apache.eagle.alert.engine.runner; -import backtype.storm.metric.api.MultiCountMetric; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.metric.api.MultiCountMetric; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import com.typesafe.config.Config; import org.apache.eagle.alert.coordination.model.PublishSpec; import org.apache.eagle.alert.engine.StreamContextImpl; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/StormMetricConsumer.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/StormMetricConsumer.java index 771a667cec..99e3f3be5f 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/StormMetricConsumer.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/StormMetricConsumer.java @@ -18,9 +18,9 @@ import org.apache.eagle.alert.metric.IMetricSystem; import org.apache.eagle.alert.metric.MetricSystem; -import backtype.storm.metric.api.IMetricsConsumer; -import backtype.storm.task.IErrorReporter; -import backtype.storm.task.TopologyContext; +import org.apache.storm.metric.api.IMetricsConsumer; +import org.apache.storm.task.IErrorReporter; +import org.apache.storm.task.TopologyContext; import com.codahale.metrics.Gauge; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/StormMetricTaggedConsumer.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/StormMetricTaggedConsumer.java index 3c13ff7b80..8548d6c6c9 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/StormMetricTaggedConsumer.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/StormMetricTaggedConsumer.java @@ -18,9 +18,9 @@ import org.apache.eagle.alert.metric.IMetricSystem; import org.apache.eagle.alert.metric.MetricSystem; -import backtype.storm.metric.api.IMetricsConsumer; -import backtype.storm.task.IErrorReporter; -import backtype.storm.task.TopologyContext; +import org.apache.storm.metric.api.IMetricsConsumer; +import org.apache.storm.task.IErrorReporter; +import org.apache.storm.task.TopologyContext; import com.codahale.metrics.Gauge; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/StreamRouterBolt.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/StreamRouterBolt.java index e37b6808c7..8dfc66a309 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/StreamRouterBolt.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/StreamRouterBolt.java @@ -46,10 +46,10 @@ import com.typesafe.config.Config; -import backtype.storm.metric.api.MultiCountMetric; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.tuple.Tuple; +import org.apache.storm.metric.api.MultiCountMetric; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.tuple.Tuple; public class StreamRouterBolt extends AbstractStreamBolt implements StreamRouterBoltSpecListener, SerializationMetadataProvider { private static final Logger LOG = LoggerFactory.getLogger(StreamRouterBolt.class); diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/UnitTopologyRunner.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/UnitTopologyRunner.java index 3f06f66c54..cfe42d9748 100755 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/UnitTopologyRunner.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/runner/UnitTopologyRunner.java @@ -32,15 +32,13 @@ import org.apache.eagle.alert.utils.StreamIdConversion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import backtype.storm.LocalCluster; -import backtype.storm.StormSubmitter; -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.BoltDeclarer; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.tuple.Fields; -import backtype.storm.utils.Utils; - +import org.apache.storm.LocalCluster; +import org.apache.storm.StormSubmitter; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.BoltDeclarer; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.tuple.Fields; +import org.apache.storm.utils.Utils; import com.typesafe.config.Config; import com.typesafe.config.ConfigRenderOptions; @@ -69,13 +67,13 @@ public class UnitTopologyRunner { public static final int DEFAULT_MESSAGE_TIMEOUT_SECS = 3600; private final IMetadataChangeNotifyService metadataChangeNotifyService; - private backtype.storm.Config givenStormConfig = null; + private org.apache.storm.Config givenStormConfig = null; public UnitTopologyRunner(IMetadataChangeNotifyService metadataChangeNotifyService) { this.metadataChangeNotifyService = metadataChangeNotifyService; } - public UnitTopologyRunner(ZKMetadataChangeNotifyService changeNotifyService, backtype.storm.Config stormConfig) { + public UnitTopologyRunner(ZKMetadataChangeNotifyService changeNotifyService, org.apache.storm.Config stormConfig) { this(changeNotifyService); this.givenStormConfig = stormConfig; } @@ -94,7 +92,7 @@ private void run(String topologyId, Config config, boolean localMode) { - backtype.storm.Config stormConfig = givenStormConfig == null ? new backtype.storm.Config() : givenStormConfig; + org.apache.storm.Config stormConfig = givenStormConfig == null ? new org.apache.storm.Config() : givenStormConfig; // TODO: Configurable metric consumer instance number int messageTimeoutSecs = config.hasPath(MESSAGE_TIMEOUT_SECS) ? config.getInt(MESSAGE_TIMEOUT_SECS) : DEFAULT_MESSAGE_TIMEOUT_SECS; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/scheme/JsonScheme.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/scheme/JsonScheme.java index db461d8d25..4e2ad59bf3 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/scheme/JsonScheme.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/scheme/JsonScheme.java @@ -19,12 +19,13 @@ package org.apache.eagle.alert.engine.scheme; -import backtype.storm.spout.Scheme; -import backtype.storm.tuple.Fields; +import org.apache.storm.spout.Scheme; +import org.apache.storm.tuple.Fields; import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.Logger; import java.io.IOException; +import java.nio.ByteBuffer; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -51,10 +52,10 @@ public Fields getOutputFields() { @Override @SuppressWarnings("rawtypes") - public List deserialize(byte[] ser) { + public List deserialize(ByteBuffer ser) { try { if (ser != null) { - Map map = mapper.readValue(ser, Map.class); + Map map = mapper.readValue(ser.array(), Map.class); return Arrays.asList(topic, map); } else { if (LOG.isDebugEnabled()) { @@ -63,7 +64,7 @@ public List deserialize(byte[] ser) { } } catch (IOException e) { try { - LOG.error("Failed to deserialize as JSON: {}", new String(ser, "UTF-8"), e); + LOG.error("Failed to deserialize as JSON: {}", new String(ser.array(), "UTF-8"), e); } catch (Exception ex) { LOG.error(ex.getMessage(), ex); } diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/scheme/PlainStringScheme.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/scheme/PlainStringScheme.java index 57c8897eee..767379e61c 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/scheme/PlainStringScheme.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/scheme/PlainStringScheme.java @@ -19,12 +19,13 @@ package org.apache.eagle.alert.engine.scheme; -import backtype.storm.spout.Scheme; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; +import org.apache.storm.spout.Scheme; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Values; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.HashMap; @@ -58,9 +59,9 @@ public Fields getOutputFields() { @SuppressWarnings( {"unchecked", "rawtypes"}) @Override - public List deserialize(byte[] ser) { + public List deserialize(ByteBuffer ser) { Map m = new HashMap<>(); - m.put("value", deserializeString(ser)); + m.put("value", deserializeString(ser.array())); m.put("timestamp", System.currentTimeMillis()); return new Values(topic, m); } diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/spout/CorrelationSpout.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/spout/CorrelationSpout.java index 60a9b9854d..fd52444385 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/spout/CorrelationSpout.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/spout/CorrelationSpout.java @@ -18,14 +18,15 @@ */ package org.apache.eagle.alert.engine.spout; -import backtype.storm.spout.MultiScheme; -import backtype.storm.spout.Scheme; -import backtype.storm.spout.SchemeAsMultiScheme; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; +import org.apache.storm.kafka.*; +import org.apache.storm.spout.MultiScheme; +import org.apache.storm.spout.Scheme; +import org.apache.storm.spout.SchemeAsMultiScheme; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.apache.commons.collections.CollectionUtils; @@ -42,7 +43,6 @@ import org.apache.eagle.alert.utils.StreamIdConversion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import storm.kafka.*; import java.text.MessageFormat; import java.util.*; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/spout/SpoutOutputCollectorWrapper.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/spout/SpoutOutputCollectorWrapper.java index 1036a361bc..31d291f946 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/spout/SpoutOutputCollectorWrapper.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/spout/SpoutOutputCollectorWrapper.java @@ -18,8 +18,8 @@ */ package org.apache.eagle.alert.engine.spout; -import backtype.storm.spout.ISpoutOutputCollector; -import backtype.storm.spout.SpoutOutputCollector; +import org.apache.storm.spout.ISpoutOutputCollector; +import org.apache.storm.spout.SpoutOutputCollector; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.eagle.alert.coordination.model.SpoutSpec; import org.apache.eagle.alert.coordination.model.StreamRepartitionMetadata; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/storm/kafka/KafkaSpoutMetric.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/storm/kafka/KafkaSpoutMetric.java similarity index 93% rename from eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/storm/kafka/KafkaSpoutMetric.java rename to eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/storm/kafka/KafkaSpoutMetric.java index 935742fafd..b4279b76b9 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/storm/kafka/KafkaSpoutMetric.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/storm/kafka/KafkaSpoutMetric.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package storm.kafka; +package org.apache.storm.kafka; -import backtype.storm.metric.api.IMetric; +import org.apache.storm.metric.api.IMetric; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,7 +43,7 @@ public static class KafkaSpoutMetricContext { public void addTopic(String topic, KafkaSpoutMetricContext context) { // construct KafkaOffsetMetric - KafkaUtils.KafkaOffsetMetric kafkaOffsetMetric = new KafkaUtils.KafkaOffsetMetric(context.spoutConfig.topic, context.connections); + KafkaUtils.KafkaOffsetMetric kafkaOffsetMetric = new KafkaUtils.KafkaOffsetMetric(context.connections); metricContextMap.put(topic, context); offsetMetricMap.put(topic, kafkaOffsetMetric); } @@ -68,7 +68,7 @@ public Object getValueAndReset() { KafkaUtils.KafkaOffsetMetric offsetMetric = offsetMetricMap.get(entry.getKey()); offsetMetric.refreshPartitions(latestPartitions); for (PartitionManager pm : pms) { - offsetMetric.setLatestEmittedOffset(pm.getPartition(), pm.lastCompletedOffset()); + offsetMetric.setOffsetData(pm.getPartition(), pm.getOffsetData()); } Object o = offsetMetric.getValueAndReset(); if (o != null) { diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/storm/kafka/KafkaSpoutWrapper.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/storm/kafka/KafkaSpoutWrapper.java similarity index 96% rename from eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/storm/kafka/KafkaSpoutWrapper.java rename to eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/storm/kafka/KafkaSpoutWrapper.java index 2bdbd3cc28..7b6e67fb2b 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/storm/kafka/KafkaSpoutWrapper.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/storm/kafka/KafkaSpoutWrapper.java @@ -16,15 +16,15 @@ * * limitations under the License. * */ -package storm.kafka; +package org.apache.storm.kafka; import org.apache.eagle.alert.coordination.model.SpoutSpec; import org.apache.eagle.alert.engine.coordinator.StreamDefinition; import org.apache.eagle.alert.engine.spout.ISpoutSpecLCM; import org.apache.eagle.alert.engine.spout.SpoutOutputCollectorWrapper; -import backtype.storm.Config; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; +import org.apache.storm.Config; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/Integration1.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/Integration1.java index 01e50a4c8d..ee385f2dad 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/Integration1.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/Integration1.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.alert.engine.e2e; -import backtype.storm.utils.Utils; +import org.apache.storm.utils.Utils; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.type.CollectionType; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/Integration2.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/Integration2.java index 5c2c404629..9c7e40968c 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/Integration2.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/Integration2.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.alert.engine.e2e; -import backtype.storm.utils.Utils; +import org.apache.storm.utils.Utils; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.apache.eagle.alert.engine.UnitTopologyMain; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/Integration3.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/Integration3.java index 41dbe97218..82405dee82 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/Integration3.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/Integration3.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.alert.engine.e2e; -import backtype.storm.utils.Utils; +import org.apache.storm.utils.Utils; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.apache.eagle.alert.engine.UnitTopologyMain; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/Integration4NoDataAlert.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/Integration4NoDataAlert.java index 59af759abb..9b5e7e206e 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/Integration4NoDataAlert.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/Integration4NoDataAlert.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.alert.engine.e2e; -import backtype.storm.utils.Utils; +import org.apache.storm.utils.Utils; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.apache.eagle.alert.engine.UnitTopologyMain; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/Integration5AbsenceAlert.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/Integration5AbsenceAlert.java index e656c31bbb..9cffefa39e 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/Integration5AbsenceAlert.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/Integration5AbsenceAlert.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.alert.engine.e2e; -import backtype.storm.utils.Utils; +import org.apache.storm.utils.Utils; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.apache.eagle.alert.engine.UnitTopologyMain; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/SampleClient1.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/SampleClient1.java index acb8ff8cc9..fb1e6f6bea 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/SampleClient1.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/SampleClient1.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.alert.engine.e2e; -import backtype.storm.utils.Utils; +import org.apache.storm.utils.Utils; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.apache.commons.lang3.tuple.Pair; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/SampleClient2.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/SampleClient2.java index 8a2a6398d4..d7cd050386 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/SampleClient2.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/SampleClient2.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.alert.engine.e2e; -import backtype.storm.utils.Utils; +import org.apache.storm.utils.Utils; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.apache.commons.lang3.tuple.Pair; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/SampleClient4NoDataAlert.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/SampleClient4NoDataAlert.java index 2123571152..88d8cb978e 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/SampleClient4NoDataAlert.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/e2e/SampleClient4NoDataAlert.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.alert.engine.e2e; -import backtype.storm.utils.Utils; +import org.apache.storm.utils.Utils; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; import com.typesafe.config.Config; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/evaluator/AlertBoltOutputCollectorThreadSafeWrapperTest.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/evaluator/AlertBoltOutputCollectorThreadSafeWrapperTest.java index 4552417825..759e9884d0 100755 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/evaluator/AlertBoltOutputCollectorThreadSafeWrapperTest.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/evaluator/AlertBoltOutputCollectorThreadSafeWrapperTest.java @@ -16,8 +16,8 @@ */ package org.apache.eagle.alert.engine.evaluator; -import backtype.storm.task.IOutputCollector; -import backtype.storm.task.OutputCollector; +import org.apache.storm.task.IOutputCollector; +import org.apache.storm.task.OutputCollector; import org.apache.eagle.alert.engine.evaluator.impl.AlertBoltOutputCollectorThreadSafeWrapper; import org.apache.eagle.alert.engine.model.AlertStreamEvent; import org.apache.eagle.alert.engine.router.impl.StormOutputCollector; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/evaluator/SiddhiCEPPolicyEventHandlerTest.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/evaluator/SiddhiCEPPolicyEventHandlerTest.java index 89039f5015..402c79aad9 100755 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/evaluator/SiddhiCEPPolicyEventHandlerTest.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/evaluator/SiddhiCEPPolicyEventHandlerTest.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.alert.engine.evaluator; -import backtype.storm.metric.api.MultiCountMetric; +import org.apache.storm.metric.api.MultiCountMetric; import org.apache.eagle.alert.engine.Collector; import org.apache.eagle.alert.engine.StormMultiCountMetric; import org.apache.eagle.alert.engine.coordinator.PolicyDefinition; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/mock/MockStreamReceiver.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/mock/MockStreamReceiver.java index 9ab4c24113..67ea08feb0 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/mock/MockStreamReceiver.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/mock/MockStreamReceiver.java @@ -1,11 +1,11 @@ package org.apache.eagle.alert.engine.mock; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; -import backtype.storm.utils.Utils; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; +import org.apache.storm.utils.Utils; import org.apache.eagle.alert.engine.model.PartitionedEvent; import org.apache.eagle.alert.utils.AlertConstants; import org.apache.eagle.alert.utils.StreamIdConversion; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/router/TestAlertBolt.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/router/TestAlertBolt.java index c9e09fded7..c911919713 100755 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/router/TestAlertBolt.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/router/TestAlertBolt.java @@ -16,14 +16,14 @@ */ package org.apache.eagle.alert.engine.router; -import backtype.storm.metric.api.MultiCountMetric; -import backtype.storm.task.GeneralTopologyContext; -import backtype.storm.task.IOutputCollector; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.TupleImpl; +import org.apache.storm.metric.api.MultiCountMetric; +import org.apache.storm.task.GeneralTopologyContext; +import org.apache.storm.task.IOutputCollector; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.TupleImpl; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.apache.eagle.alert.coordination.model.AlertBoltSpec; @@ -110,6 +110,10 @@ public void ack(Tuple input) { public void fail(Tuple input) { } + @Override + public void resetTimeout(Tuple tuple) { + } + @Override public void reportError(Throwable error) { } @@ -224,6 +228,11 @@ public void fail(Tuple input) { failedCount.incrementAndGet(); } + @Override + public void resetTimeout(Tuple tuple) { + + } + @Override public void reportError(Throwable error) { } @@ -318,6 +327,11 @@ public void fail(Tuple input) { failedCount.incrementAndGet(); } + @Override + public void resetTimeout(Tuple tuple) { + + } + @Override public void reportError(Throwable error) { } @@ -422,6 +436,11 @@ public void ack(Tuple input) { public void fail(Tuple input) { } + @Override + public void resetTimeout(Tuple tuple) { + + } + @Override public void reportError(Throwable error) { } @@ -483,6 +502,11 @@ public void ack(Tuple input) { public void fail(Tuple input) { } + @Override + public void resetTimeout(Tuple tuple) { + + } + @Override public void reportError(Throwable error) { } @@ -579,6 +603,11 @@ public void ack(Tuple input) { public void fail(Tuple input) { } + @Override + public void resetTimeout(Tuple tuple) { + + } + @Override public void reportError(Throwable error) { } diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/router/TestStreamRouterBoltOutputCollector.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/router/TestStreamRouterBoltOutputCollector.java index 704857dc5b..29eaf388f8 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/router/TestStreamRouterBoltOutputCollector.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/router/TestStreamRouterBoltOutputCollector.java @@ -18,11 +18,11 @@ package org.apache.eagle.alert.engine.router; -import backtype.storm.metric.api.MultiCountMetric; -import backtype.storm.task.IOutputCollector; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.tuple.Tuple; +import org.apache.storm.metric.api.MultiCountMetric; +import org.apache.storm.task.IOutputCollector; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.tuple.Tuple; import org.apache.eagle.alert.coordination.model.PolicyWorkerQueue; import org.apache.eagle.alert.coordination.model.StreamRouterSpec; import org.apache.eagle.alert.coordination.model.WorkSlot; @@ -123,6 +123,11 @@ public void ack(Tuple input) { public void fail(Tuple input) { } + @Override + public void resetTimeout(Tuple tuple) { + + } + }; List list1 = new ArrayList<>(); diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/runner/TestStreamRouterBolt.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/runner/TestStreamRouterBolt.java index a480fcfed5..61f02896f9 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/runner/TestStreamRouterBolt.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/runner/TestStreamRouterBolt.java @@ -16,14 +16,14 @@ */ package org.apache.eagle.alert.engine.runner; -import backtype.storm.metric.api.MultiCountMetric; -import backtype.storm.task.GeneralTopologyContext; -import backtype.storm.task.IOutputCollector; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.TupleImpl; +import org.apache.storm.metric.api.MultiCountMetric; +import org.apache.storm.task.GeneralTopologyContext; +import org.apache.storm.task.IOutputCollector; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.TupleImpl; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.apache.eagle.alert.coordination.model.PolicyWorkerQueue; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/serialization/PartitionedEventSerializerTest.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/serialization/PartitionedEventSerializerTest.java index 5a81e2678b..e9a0f1ac64 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/serialization/PartitionedEventSerializerTest.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/serialization/PartitionedEventSerializerTest.java @@ -16,8 +16,8 @@ */ package org.apache.eagle.alert.engine.serialization; -import backtype.storm.serialization.DefaultKryoFactory; -import backtype.storm.serialization.DefaultSerializationDelegate; +import org.apache.storm.serialization.DefaultKryoFactory; +import org.apache.storm.serialization.DefaultSerializationDelegate; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; @@ -134,7 +134,7 @@ public void testPartitionEventSerializationEfficiency() throws IOException { stopWatch.start(); while (i < count) { byte[] javaSerialization = new DefaultSerializationDelegate().serialize(partitionedEvent); - PartitionedEvent javaSerializedEvent = (PartitionedEvent) new DefaultSerializationDelegate().deserialize(javaSerialization); + PartitionedEvent javaSerializedEvent = new DefaultSerializationDelegate().deserialize(javaSerialization, PartitionedEvent.class); Assert.assertEquals(partitionedEvent, javaSerializedEvent); i++; } diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/statecheck/TestStateCheckPolicy.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/statecheck/TestStateCheckPolicy.java index d4fe01abc5..2501bf095b 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/statecheck/TestStateCheckPolicy.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/statecheck/TestStateCheckPolicy.java @@ -16,12 +16,12 @@ */ package org.apache.eagle.alert.engine.statecheck; -import backtype.storm.task.GeneralTopologyContext; -import backtype.storm.task.IOutputCollector; -import backtype.storm.task.OutputCollector; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.TupleImpl; +import org.apache.storm.task.GeneralTopologyContext; +import org.apache.storm.task.IOutputCollector; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.TupleImpl; import org.apache.eagle.alert.coordination.model.AlertBoltSpec; import org.apache.eagle.alert.engine.coordinator.PolicyDefinition; import org.apache.eagle.alert.engine.coordinator.PublishPartition; @@ -76,6 +76,11 @@ public void ack(Tuple input) { public void fail(Tuple input) { } + @Override + public void resetTimeout(Tuple tuple) { + + } + @Override public void reportError(Throwable error) { } diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/AlertTopologyTest.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/AlertTopologyTest.java index 721278524b..8583e4f562 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/AlertTopologyTest.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/AlertTopologyTest.java @@ -19,11 +19,11 @@ package org.apache.eagle.alert.engine.topology; -import backtype.storm.LocalCluster; -import backtype.storm.topology.BoltDeclarer; -import backtype.storm.topology.SpoutDeclarer; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.tuple.Fields; +import org.apache.storm.LocalCluster; +import org.apache.storm.topology.BoltDeclarer; +import org.apache.storm.topology.SpoutDeclarer; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.tuple.Fields; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.apache.eagle.alert.engine.spout.CorrelationSpout; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/CoordinatorSpoutIntegrationTest.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/CoordinatorSpoutIntegrationTest.java index d011770b37..fe8fb69e2c 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/CoordinatorSpoutIntegrationTest.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/CoordinatorSpoutIntegrationTest.java @@ -19,13 +19,13 @@ package org.apache.eagle.alert.engine.topology; -import backtype.storm.LocalCluster; -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.BoltDeclarer; -import backtype.storm.topology.SpoutDeclarer; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.tuple.Fields; -import backtype.storm.utils.Utils; +import org.apache.storm.LocalCluster; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.BoltDeclarer; +import org.apache.storm.topology.SpoutDeclarer; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.tuple.Fields; +import org.apache.storm.utils.Utils; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.apache.eagle.alert.engine.spout.CorrelationSpout; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/CorrelationSpoutTest.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/CorrelationSpoutTest.java index 5a86cd2d75..16387b0c37 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/CorrelationSpoutTest.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/CorrelationSpoutTest.java @@ -19,8 +19,8 @@ package org.apache.eagle.alert.engine.topology; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.apache.eagle.alert.coordination.model.Kafka2TupleMetadata; @@ -33,7 +33,7 @@ import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; -import storm.kafka.KafkaSpoutWrapper; +import org.apache.storm.kafka.KafkaSpoutWrapper; import java.util.Arrays; import java.util.HashMap; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/FastWordCountTopology.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/FastWordCountTopology.java index 5aff5c8c08..92a52b2bb8 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/FastWordCountTopology.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/FastWordCountTopology.java @@ -17,21 +17,21 @@ */ package org.apache.eagle.alert.engine.topology; -import backtype.storm.Config; -import backtype.storm.LocalCluster; -import backtype.storm.generated.*; -import backtype.storm.metric.LoggingMetricsConsumer; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.BasicOutputCollector; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.topology.base.BaseBasicBolt; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.Values; -import backtype.storm.utils.Utils; +import org.apache.storm.Config; +import org.apache.storm.LocalCluster; +import org.apache.storm.generated.*; +import org.apache.storm.metric.LoggingMetricsConsumer; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.BasicOutputCollector; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.topology.base.BaseBasicBolt; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.Values; +import org.apache.storm.utils.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestBolt.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestBolt.java index dc9c9b3a44..a9c7a07205 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestBolt.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestBolt.java @@ -19,11 +19,11 @@ package org.apache.eagle.alert.engine.topology; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Tuple; import org.junit.Ignore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestStormCustomGroupingRouting.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestStormCustomGroupingRouting.java index c612d28a01..377cd7b79b 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestStormCustomGroupingRouting.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestStormCustomGroupingRouting.java @@ -19,20 +19,20 @@ package org.apache.eagle.alert.engine.topology; -import backtype.storm.Config; -import backtype.storm.LocalCluster; -import backtype.storm.generated.GlobalStreamId; -import backtype.storm.grouping.CustomStreamGrouping; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.task.WorkerTopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.Config; +import org.apache.storm.LocalCluster; +import org.apache.storm.generated.GlobalStreamId; +import org.apache.storm.grouping.CustomStreamGrouping; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.task.WorkerTopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import org.junit.Ignore; import org.junit.Test; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestStormParallelism.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestStormParallelism.java index c235e73a23..d82f08141c 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestStormParallelism.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestStormParallelism.java @@ -19,17 +19,17 @@ package org.apache.eagle.alert.engine.topology; -import backtype.storm.Config; -import backtype.storm.LocalCluster; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.Config; +import org.apache.storm.LocalCluster; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import org.junit.Ignore; import org.junit.Test; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestStormStreamIdRouting.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestStormStreamIdRouting.java index c27edf4eb8..15de69e03d 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestStormStreamIdRouting.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestStormStreamIdRouting.java @@ -19,17 +19,17 @@ package org.apache.eagle.alert.engine.topology; -import backtype.storm.Config; -import backtype.storm.LocalCluster; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.Config; +import org.apache.storm.LocalCluster; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import org.junit.Ignore; import org.junit.Test; diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/service/topology/resource/impl/TopologyMgmtResourceImpl.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/service/topology/resource/impl/TopologyMgmtResourceImpl.java index 1bf810fea3..6eaae7b800 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/service/topology/resource/impl/TopologyMgmtResourceImpl.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/service/topology/resource/impl/TopologyMgmtResourceImpl.java @@ -24,13 +24,13 @@ import org.apache.eagle.alert.engine.runner.UnitTopologyRunner; import org.apache.eagle.alert.metadata.IMetadataDao; import org.apache.eagle.alert.metadata.impl.MetadataDaoFactory; -import backtype.storm.Config; -import backtype.storm.StormSubmitter; -import backtype.storm.generated.Nimbus; -import backtype.storm.generated.StormTopology; -import backtype.storm.generated.TopologySummary; -import backtype.storm.utils.NimbusClient; -import backtype.storm.utils.Utils; +import org.apache.storm.Config; +import org.apache.storm.StormSubmitter; +import org.apache.storm.generated.Nimbus; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.generated.TopologySummary; +import org.apache.storm.utils.NimbusClient; +import org.apache.storm.utils.Utils; import com.typesafe.config.ConfigFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,6 +55,7 @@ public class TopologyMgmtResourceImpl { private Map getStormConf(List clusters, String clusterId) throws Exception { Map stormConf = Utils.readStormConfig(); if (clusterId == null) { + // TODO: change to NIMBUS_SEEDS list in EAGLE-907 stormConf.put(Config.NIMBUS_HOST, DEFAULT_NIMBUS_HOST); stormConf.put(Config.NIMBUS_THRIFT_PORT, DEFAULT_NIMBUS_THRIFT_PORT); } else { @@ -68,6 +69,7 @@ private Map getStormConf(List clusters, String clusterId) thro } else { throw new Exception("Fail to find cluster: " + clusterId); } + // TODO: change to NIMBUS_SEEDS list in EAGLE-907 stormConf.put(Config.NIMBUS_HOST, cluster.getDeployments().getOrDefault(StreamingCluster.NIMBUS_HOST, DEFAULT_NIMBUS_HOST)); stormConf.put(Config.NIMBUS_THRIFT_PORT, Integer.valueOf(cluster.getDeployments().get(StreamingCluster.NIMBUS_THRIFT_PORT))); } diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/test/java/org/apache/eagle/service/topology/resource/impl/TopologyMgmtResourceImplTest.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/test/java/org/apache/eagle/service/topology/resource/impl/TopologyMgmtResourceImplTest.java index b9a7634cbf..5df21f3577 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/test/java/org/apache/eagle/service/topology/resource/impl/TopologyMgmtResourceImplTest.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/test/java/org/apache/eagle/service/topology/resource/impl/TopologyMgmtResourceImplTest.java @@ -18,12 +18,12 @@ package org.apache.eagle.service.topology.resource.impl; -import backtype.storm.StormSubmitter; -import backtype.storm.generated.ClusterSummary; -import backtype.storm.generated.Nimbus; -import backtype.storm.generated.StormTopology; -import backtype.storm.generated.TopologySummary; -import backtype.storm.utils.NimbusClient; +import org.apache.storm.StormSubmitter; +import org.apache.storm.generated.ClusterSummary; +import org.apache.storm.generated.Nimbus; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.generated.TopologySummary; +import org.apache.storm.utils.NimbusClient; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.apache.eagle.alert.coordination.model.internal.Topology; diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/StormApplication.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/StormApplication.java index 05fc512bf1..1b915a1c50 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/StormApplication.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/StormApplication.java @@ -17,7 +17,7 @@ package org.apache.eagle.app; import org.apache.eagle.app.environment.impl.StormEnvironment; -import backtype.storm.generated.StormTopology; +import org.apache.storm.generated.StormTopology; public abstract class StormApplication extends ExecutableApplication { @Override diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/builder/ApplicationBuilder.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/builder/ApplicationBuilder.java index 88f0886f8d..d6aa38b3ee 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/builder/ApplicationBuilder.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/builder/ApplicationBuilder.java @@ -17,9 +17,9 @@ package org.apache.eagle.app.environment.builder; -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.tuple.Fields; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.tuple.Fields; import com.google.common.base.Preconditions; import com.typesafe.config.Config; import org.apache.eagle.app.environment.impl.StormEnvironment; diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/builder/StormOutputCollector.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/builder/StormOutputCollector.java index 9135cc8753..ab00c7d5a0 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/builder/StormOutputCollector.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/builder/StormOutputCollector.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.app.environment.builder; -import backtype.storm.task.OutputCollector; +import org.apache.storm.task.OutputCollector; import java.util.Arrays; diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/builder/TransformFunctionBolt.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/builder/TransformFunctionBolt.java index dbc7239745..c40d8f53c9 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/builder/TransformFunctionBolt.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/builder/TransformFunctionBolt.java @@ -16,12 +16,12 @@ */ package org.apache.eagle.app.environment.builder; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import org.apache.eagle.app.utils.StreamConvertHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/impl/StormExecutionRuntime.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/impl/StormExecutionRuntime.java index 2b4180d983..7288700383 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/impl/StormExecutionRuntime.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/impl/StormExecutionRuntime.java @@ -16,10 +16,10 @@ */ package org.apache.eagle.app.environment.impl; -import backtype.storm.Config; -import backtype.storm.LocalCluster; -import backtype.storm.generated.*; -import backtype.storm.utils.NimbusClient; +import org.apache.storm.Config; +import org.apache.storm.LocalCluster; +import org.apache.storm.generated.*; +import org.apache.storm.utils.NimbusClient; import com.google.common.base.Preconditions; import com.typesafe.config.ConfigRenderOptions; import org.apache.eagle.alert.engine.runner.StormMetricTaggedConsumer; @@ -29,11 +29,12 @@ import org.apache.eagle.app.environment.ExecutionRuntimeProvider; import org.apache.eagle.app.utils.DynamicJarPathFinder; import org.apache.eagle.metadata.model.ApplicationEntity; -import org.apache.thrift7.TException; +import org.apache.storm.thrift.TException; +import org.apache.storm.utils.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import scala.Int; -import storm.trident.spout.RichSpoutBatchExecutor; +import org.apache.storm.trident.spout.RichSpoutBatchExecutor; import java.util.List; import java.util.Objects; @@ -76,14 +77,14 @@ public StormEnvironment environment() { private static final String WORKERS = "workers"; - private backtype.storm.Config getStormConfig(com.typesafe.config.Config config) { - backtype.storm.Config conf = new backtype.storm.Config(); + private org.apache.storm.Config getStormConfig(com.typesafe.config.Config config) { + org.apache.storm.Config conf = new org.apache.storm.Config(); conf.put(RichSpoutBatchExecutor.MAX_BATCH_SIZE_CONF, Int.box(64 * 1024)); - conf.put(backtype.storm.Config.TOPOLOGY_RECEIVER_BUFFER_SIZE, Int.box(8)); - conf.put(backtype.storm.Config.TOPOLOGY_TRANSFER_BUFFER_SIZE, Int.box(32)); - conf.put(backtype.storm.Config.TOPOLOGY_EXECUTOR_RECEIVE_BUFFER_SIZE, Int.box(16384)); - conf.put(backtype.storm.Config.TOPOLOGY_EXECUTOR_SEND_BUFFER_SIZE, Int.box(16384)); - conf.put(backtype.storm.Config.NIMBUS_THRIFT_MAX_BUFFER_SIZE, Int.box(20480000)); + // TOPOLOGY_RECEIVER_BUFFER_SIZE has no effect, so no need to set. ref: STORM-596 + conf.put(org.apache.storm.Config.TOPOLOGY_TRANSFER_BUFFER_SIZE, Int.box(32)); + conf.put(org.apache.storm.Config.TOPOLOGY_EXECUTOR_RECEIVE_BUFFER_SIZE, Int.box(16384)); + conf.put(org.apache.storm.Config.TOPOLOGY_EXECUTOR_SEND_BUFFER_SIZE, Int.box(16384)); + conf.put(org.apache.storm.Config.NIMBUS_THRIFT_MAX_BUFFER_SIZE, Int.box(20480000)); String nimbusHost = STORM_NIMBUS_HOST_DEFAULT; if (environment.config().hasPath(STORM_NIMBUS_HOST_CONF_PATH)) { nimbusHost = environment.config().getString(STORM_NIMBUS_HOST_CONF_PATH); @@ -98,9 +99,10 @@ private backtype.storm.Config getStormConfig(com.typesafe.config.Config config) } else { LOG.info("Using default {} = {}",STORM_NIMBUS_THRIFT_CONF_PATH,STORM_NIMBUS_THRIFT_DEFAULT); } - conf.put(backtype.storm.Config.NIMBUS_HOST, nimbusHost); - conf.put(backtype.storm.Config.NIMBUS_THRIFT_PORT, nimbusThriftPort); - conf.put(Config.STORM_THRIFT_TRANSPORT_PLUGIN, "backtype.storm.security.auth.SimpleTransportPlugin"); + // TODO: change to NIMBUS_SEEDS list in EAGLE-907 + conf.put(Config.NIMBUS_HOST, nimbusHost); + conf.put(org.apache.storm.Config.NIMBUS_THRIFT_PORT, nimbusThriftPort); + conf.put(Config.STORM_THRIFT_TRANSPORT_PLUGIN, "org.apache.storm.security.auth.SimpleTransportPlugin"); if (config.hasPath(WORKERS)) { conf.setNumWorkers(config.getInt(WORKERS)); } @@ -155,7 +157,7 @@ public void stop(Application executor, com.type Nimbus.Client stormClient = NimbusClient.getConfiguredClient(getStormConfig(config)).getClient(); try { stormClient.killTopologyWithOpts(appId, this.killOptions); - } catch (NotAliveException | TException e) { + } catch (TException e) { LOG.error("Failed to kill topology named {}, due to: {}",appId,e.getMessage(),e.getCause()); throw new RuntimeException(e.getMessage(),e); } diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/impl/StormSubmitter.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/impl/StormSubmitter.java index 76d6e1b355..5a35e5a790 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/impl/StormSubmitter.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/impl/StormSubmitter.java @@ -26,17 +26,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import backtype.storm.generated.AlreadyAliveException; -import backtype.storm.generated.ClusterSummary; -import backtype.storm.generated.InvalidTopologyException; -import backtype.storm.generated.Nimbus; -import backtype.storm.generated.StormTopology; -import backtype.storm.generated.SubmitOptions; -import backtype.storm.generated.TopologySummary; -import backtype.storm.utils.BufferFileInputStream; -import backtype.storm.utils.NimbusClient; -import backtype.storm.utils.Utils; -import backtype.storm.Config; +import org.apache.storm.generated.AlreadyAliveException; +import org.apache.storm.generated.ClusterSummary; +import org.apache.storm.generated.InvalidTopologyException; +import org.apache.storm.generated.Nimbus; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.generated.SubmitOptions; +import org.apache.storm.generated.TopologySummary; +import org.apache.storm.utils.BufferFileInputStream; +import org.apache.storm.utils.NimbusClient; +import org.apache.storm.utils.Utils; +import org.apache.storm.Config; /** * copy from storm StormSubmitter diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/EntityStreamPersist.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/EntityStreamPersist.java index e216dc6658..06d2e42460 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/EntityStreamPersist.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/EntityStreamPersist.java @@ -17,11 +17,11 @@ package org.apache.eagle.app.messaging; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Tuple; import com.typesafe.config.Config; import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity; import org.apache.eagle.log.entity.GenericServiceAPIResponseEntity; diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/FlattenEventMapper.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/FlattenEventMapper.java index c8fe1b563b..5adecc45d1 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/FlattenEventMapper.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/FlattenEventMapper.java @@ -17,7 +17,7 @@ package org.apache.eagle.app.messaging; import org.apache.eagle.alert.engine.model.StreamEvent; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/JsonSchema.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/JsonSchema.java index 987ed0b625..a4ade3cf2d 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/JsonSchema.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/JsonSchema.java @@ -16,12 +16,13 @@ */ package org.apache.eagle.app.messaging; -import backtype.storm.spout.Scheme; -import backtype.storm.tuple.Fields; +import org.apache.storm.spout.Scheme; +import org.apache.storm.tuple.Fields; import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.Logger; import java.io.IOException; +import java.nio.ByteBuffer; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -44,10 +45,10 @@ public Fields getOutputFields() { @Override @SuppressWarnings("rawtypes") - public List deserialize(byte[] ser) { + public List deserialize(ByteBuffer ser) { try { if (ser != null) { - Map map = mapper.readValue(ser, Map.class); + Map map = mapper.readValue(ser.array(), Map.class); return Arrays.asList(map.hashCode(), map); } else { if (LOG.isDebugEnabled()) { @@ -56,7 +57,7 @@ public List deserialize(byte[] ser) { } } catch (IOException e) { try { - LOG.error("Failed to deserialize as JSON: {}", new String(ser, "UTF-8"), e); + LOG.error("Failed to deserialize as JSON: {}", new String(ser.array(), "UTF-8"), e); } catch (Exception ex) { LOG.error(ex.getMessage(), ex); } diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/KafkaStreamProvider.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/KafkaStreamProvider.java index 8038d42ddc..1d20a75199 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/KafkaStreamProvider.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/KafkaStreamProvider.java @@ -17,7 +17,7 @@ package org.apache.eagle.app.messaging; -import backtype.storm.spout.Scheme; +import org.apache.storm.spout.Scheme; import com.typesafe.config.Config; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/KafkaStreamSink.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/KafkaStreamSink.java index 696d79fdbe..78f87be4b3 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/KafkaStreamSink.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/KafkaStreamSink.java @@ -16,8 +16,8 @@ */ package org.apache.eagle.app.messaging; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; import com.fasterxml.jackson.databind.ObjectMapper; import kafka.javaapi.producer.Producer; import kafka.producer.KeyedMessage; diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/KafkaStreamSource.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/KafkaStreamSource.java index 5cc514501e..3db3df0fa9 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/KafkaStreamSource.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/KafkaStreamSource.java @@ -16,17 +16,17 @@ */ package org.apache.eagle.app.messaging; -import backtype.storm.spout.Scheme; -import backtype.storm.spout.SchemeAsMultiScheme; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.spout.Scheme; +import org.apache.storm.spout.SchemeAsMultiScheme; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; import com.google.common.base.Preconditions; import org.apache.commons.lang3.StringUtils; import org.apache.eagle.alert.engine.spout.SchemeBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import storm.kafka.*; +import org.apache.storm.kafka.*; import java.util.Arrays; import java.util.HashMap; diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/KafkaStreamSourceConfig.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/KafkaStreamSourceConfig.java index d0a91dae2e..90c18972c3 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/KafkaStreamSourceConfig.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/KafkaStreamSourceConfig.java @@ -21,7 +21,7 @@ public class KafkaStreamSourceConfig implements StreamSourceConfig { private static final String DEFAULT_CONSUMER_GROUP_ID = "eagleKafkaSource"; private static final String DEFAULT_TRANSACTION_ZK_ROOT = "/consumers"; - private static final Class DEFAULT_KAFKA_SCHEMA = JsonSchema.class; + private static final Class DEFAULT_KAFKA_SCHEMA = JsonSchema.class; // Read Config private String topicId; @@ -36,7 +36,7 @@ public class KafkaStreamSourceConfig implements StreamSourceConfig { private long transactionStateUpdateMS = 2000; private int startOffsetTime = -1; private boolean forceFromStart = false; - private Class schemaClass = DEFAULT_KAFKA_SCHEMA; + private Class schemaClass = DEFAULT_KAFKA_SCHEMA; public String getBrokerZkQuorum() { return brokerZkQuorum; @@ -118,11 +118,11 @@ public void setForceFromStart(boolean forceFromStart) { this.forceFromStart = forceFromStart; } - public Class getSchemaClass() { + public Class getSchemaClass() { return schemaClass; } - public void setSchemaClass(Class schemaClass) { + public void setSchemaClass(Class schemaClass) { this.schemaClass = schemaClass; } diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/MetricSchemaGenerator.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/MetricSchemaGenerator.java index 90e6481eb7..18527142a6 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/MetricSchemaGenerator.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/MetricSchemaGenerator.java @@ -16,11 +16,11 @@ */ package org.apache.eagle.app.messaging; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Tuple; import com.typesafe.config.Config; import org.apache.eagle.log.entity.GenericServiceAPIResponseEntity; import org.apache.eagle.metadata.model.MetricSchemaEntity; diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/MetricStreamPersist.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/MetricStreamPersist.java index c9b43e5b63..ab554d8d73 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/MetricStreamPersist.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/MetricStreamPersist.java @@ -16,12 +16,12 @@ */ package org.apache.eagle.app.messaging; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import com.google.common.base.Preconditions; import com.typesafe.config.Config; import org.apache.eagle.app.environment.builder.MetricDescriptor; diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/StormStreamSink.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/StormStreamSink.java index ef6c8d651c..6df06a66d7 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/StormStreamSink.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/StormStreamSink.java @@ -16,14 +16,14 @@ */ package org.apache.eagle.app.messaging; -import backtype.storm.task.OutputCollector; -import backtype.storm.topology.base.BaseRichBolt; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.topology.base.BaseRichBolt; import org.apache.eagle.app.utils.StreamConvertHelper; import org.apache.eagle.common.utils.Tuple2; import org.apache.eagle.metadata.model.StreamSinkConfig; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.Tuple; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/StormStreamSource.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/StormStreamSource.java index b31de46e0c..cba431b656 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/StormStreamSource.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/StormStreamSource.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.app.messaging; -import backtype.storm.topology.base.BaseRichSpout; +import org.apache.storm.topology.base.BaseRichSpout; import org.apache.eagle.metadata.model.StreamSinkConfig; import org.apache.eagle.metadata.model.StreamSourceConfig; diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/StreamEventMapper.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/StreamEventMapper.java index 42ea36eacd..28ed2735bb 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/StreamEventMapper.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/StreamEventMapper.java @@ -17,7 +17,7 @@ package org.apache.eagle.app.messaging; import org.apache.eagle.alert.engine.model.StreamEvent; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; import java.io.Serializable; import java.util.List; diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/utils/StreamConvertHelper.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/utils/StreamConvertHelper.java index c25a93bee5..6b40cb5652 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/utils/StreamConvertHelper.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/utils/StreamConvertHelper.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.app.utils; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; import org.apache.eagle.common.utils.Tuple2; import java.util.HashMap; diff --git a/eagle-core/eagle-app/eagle-app-base/src/test/java/org/apache/eagle/app/TestStormApplication.java b/eagle-core/eagle-app/eagle-app-base/src/test/java/org/apache/eagle/app/TestStormApplication.java index 797765034b..972b6b7d1a 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/test/java/org/apache/eagle/app/TestStormApplication.java +++ b/eagle-core/eagle-app/eagle-app-base/src/test/java/org/apache/eagle/app/TestStormApplication.java @@ -16,13 +16,13 @@ */ package org.apache.eagle.app; -import backtype.storm.generated.StormTopology; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; import com.google.inject.Inject; import com.typesafe.config.Config; import org.apache.eagle.app.environment.impl.StormEnvironment; diff --git a/eagle-core/eagle-app/eagle-app-base/src/test/java/org/apache/eagle/app/storm/MockStormApplication.java b/eagle-core/eagle-app/eagle-app-base/src/test/java/org/apache/eagle/app/storm/MockStormApplication.java index eda93839b1..5aa5a4cfce 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/test/java/org/apache/eagle/app/storm/MockStormApplication.java +++ b/eagle-core/eagle-app/eagle-app-base/src/test/java/org/apache/eagle/app/storm/MockStormApplication.java @@ -16,13 +16,13 @@ */ package org.apache.eagle.app.storm; -import backtype.storm.generated.StormTopology; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; import com.typesafe.config.Config; import org.apache.eagle.app.StormApplication; import org.apache.eagle.app.environment.impl.StormEnvironment; diff --git a/eagle-core/eagle-data-process/src/main/java/org/apache/eagle/dataproc/impl/storm/StormSpoutProvider.java b/eagle-core/eagle-data-process/src/main/java/org/apache/eagle/dataproc/impl/storm/StormSpoutProvider.java index c1dac86a0b..f000fdfdce 100644 --- a/eagle-core/eagle-data-process/src/main/java/org/apache/eagle/dataproc/impl/storm/StormSpoutProvider.java +++ b/eagle-core/eagle-data-process/src/main/java/org/apache/eagle/dataproc/impl/storm/StormSpoutProvider.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.dataproc.impl.storm; -import backtype.storm.topology.base.BaseRichSpout; +import org.apache.storm.topology.base.BaseRichSpout; import com.typesafe.config.Config; /** diff --git a/eagle-core/eagle-data-process/src/main/java/org/apache/eagle/dataproc/impl/storm/kafka/KafkaSpoutProvider.java b/eagle-core/eagle-data-process/src/main/java/org/apache/eagle/dataproc/impl/storm/kafka/KafkaSpoutProvider.java index 677cfa2438..9cefd13d4a 100644 --- a/eagle-core/eagle-data-process/src/main/java/org/apache/eagle/dataproc/impl/storm/kafka/KafkaSpoutProvider.java +++ b/eagle-core/eagle-data-process/src/main/java/org/apache/eagle/dataproc/impl/storm/kafka/KafkaSpoutProvider.java @@ -17,17 +17,17 @@ package org.apache.eagle.dataproc.impl.storm.kafka; -import backtype.storm.spout.Scheme; -import backtype.storm.spout.SchemeAsMultiScheme; -import backtype.storm.topology.base.BaseRichSpout; +import org.apache.storm.spout.Scheme; +import org.apache.storm.spout.SchemeAsMultiScheme; +import org.apache.storm.topology.base.BaseRichSpout; import com.typesafe.config.Config; import org.apache.eagle.dataproc.impl.storm.StormSpoutProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import storm.kafka.BrokerHosts; -import storm.kafka.KafkaSpout; -import storm.kafka.SpoutConfig; -import storm.kafka.ZkHosts; +import org.apache.storm.kafka.BrokerHosts; +import org.apache.storm.kafka.KafkaSpout; +import org.apache.storm.kafka.SpoutConfig; +import org.apache.storm.kafka.ZkHosts; import java.util.Arrays; import java.util.stream.Collectors; diff --git a/eagle-core/eagle-data-process/src/main/java/org/apache/eagle/dataproc/impl/storm/partition/CustomPartitionGrouping.java b/eagle-core/eagle-data-process/src/main/java/org/apache/eagle/dataproc/impl/storm/partition/CustomPartitionGrouping.java index 7253b651a0..434ff3e13f 100644 --- a/eagle-core/eagle-data-process/src/main/java/org/apache/eagle/dataproc/impl/storm/partition/CustomPartitionGrouping.java +++ b/eagle-core/eagle-data-process/src/main/java/org/apache/eagle/dataproc/impl/storm/partition/CustomPartitionGrouping.java @@ -17,9 +17,9 @@ package org.apache.eagle.dataproc.impl.storm.partition; -import backtype.storm.generated.GlobalStreamId; -import backtype.storm.grouping.CustomStreamGrouping; -import backtype.storm.task.WorkerTopologyContext; +import org.apache.storm.generated.GlobalStreamId; +import org.apache.storm.grouping.CustomStreamGrouping; +import org.apache.storm.task.WorkerTopologyContext; import java.util.ArrayList; import java.util.Arrays; diff --git a/eagle-examples/eagle-app-example/src/main/java/org/apache/eagle/app/example/ExampleStormApplication.java b/eagle-examples/eagle-app-example/src/main/java/org/apache/eagle/app/example/ExampleStormApplication.java index f1f4e5894e..edde7c446b 100644 --- a/eagle-examples/eagle-app-example/src/main/java/org/apache/eagle/app/example/ExampleStormApplication.java +++ b/eagle-examples/eagle-app-example/src/main/java/org/apache/eagle/app/example/ExampleStormApplication.java @@ -16,14 +16,14 @@ */ package org.apache.eagle.app.example; -import backtype.storm.generated.StormTopology; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; -import backtype.storm.utils.Utils; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; +import org.apache.storm.utils.Utils; import com.typesafe.config.Config; import org.apache.eagle.app.StormApplication; import org.apache.eagle.app.environment.impl.StormEnvironment; diff --git a/eagle-gc/src/main/java/org/apache/eagle/gc/GCLogApplication.java b/eagle-gc/src/main/java/org/apache/eagle/gc/GCLogApplication.java index 1453c3e5bd..cf8a544502 100644 --- a/eagle-gc/src/main/java/org/apache/eagle/gc/GCLogApplication.java +++ b/eagle-gc/src/main/java/org/apache/eagle/gc/GCLogApplication.java @@ -20,11 +20,11 @@ package org.apache.eagle.gc; -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.BoltDeclarer; -import backtype.storm.topology.IRichSpout; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.tuple.Fields; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.BoltDeclarer; +import org.apache.storm.topology.IRichSpout; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.tuple.Fields; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.apache.eagle.app.StormApplication; @@ -33,7 +33,7 @@ import org.apache.eagle.dataproc.impl.storm.kafka.KafkaSpoutProvider; import org.apache.eagle.gc.executor.GCLogAnalyzerBolt; import org.apache.eagle.gc.executor.GCMetricGeneratorBolt; -import storm.kafka.StringScheme; +import org.apache.storm.kafka.StringScheme; /** * Since 8/12/16. diff --git a/eagle-gc/src/main/java/org/apache/eagle/gc/executor/GCLogAnalyzerBolt.java b/eagle-gc/src/main/java/org/apache/eagle/gc/executor/GCLogAnalyzerBolt.java index 66cb8595ef..84cbacc2bc 100644 --- a/eagle-gc/src/main/java/org/apache/eagle/gc/executor/GCLogAnalyzerBolt.java +++ b/eagle-gc/src/main/java/org/apache/eagle/gc/executor/GCLogAnalyzerBolt.java @@ -19,12 +19,12 @@ package org.apache.eagle.gc.executor; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import org.apache.eagle.gc.model.GCPausedEvent; import org.apache.eagle.gc.stream.GCStreamBuilder; import org.apache.eagle.gc.parser.exception.IgnoredLogFormatException; diff --git a/eagle-gc/src/main/java/org/apache/eagle/gc/executor/GCMetricGeneratorBolt.java b/eagle-gc/src/main/java/org/apache/eagle/gc/executor/GCMetricGeneratorBolt.java index ebbeee1ab0..cb6d62d262 100644 --- a/eagle-gc/src/main/java/org/apache/eagle/gc/executor/GCMetricGeneratorBolt.java +++ b/eagle-gc/src/main/java/org/apache/eagle/gc/executor/GCMetricGeneratorBolt.java @@ -19,12 +19,12 @@ package org.apache.eagle.gc.executor; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import com.codahale.metrics.MetricRegistry; import com.typesafe.config.Config; import org.apache.eagle.common.config.EagleConfigConstants; diff --git a/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/index.html b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/index.html new file mode 100644 index 0000000000..765d8a613b --- /dev/null +++ b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/index.html @@ -0,0 +1,6 @@ + + +

Hadoop Metric Monitor Application!

+ url: /apps/hadoop_metric + + \ No newline at end of file diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/HadoopQueueRunningApp.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/HadoopQueueRunningApp.java index eb8326edfa..5c4a7ba67c 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/HadoopQueueRunningApp.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/HadoopQueueRunningApp.java @@ -16,9 +16,10 @@ */ package org.apache.eagle.hadoop.queue; -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.IRichSpout; -import backtype.storm.topology.TopologyBuilder; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.BoltDeclarer; +import org.apache.storm.topology.IRichSpout; +import org.apache.storm.topology.TopologyBuilder; import com.typesafe.config.Config; import org.apache.eagle.app.StormApplication; import org.apache.eagle.app.environment.impl.StormEnvironment; diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/ClusterMetricsCrawler.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/ClusterMetricsCrawler.java index ac2f0f5a6a..051efdc548 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/ClusterMetricsCrawler.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/ClusterMetricsCrawler.java @@ -22,7 +22,7 @@ import org.apache.eagle.hadoop.queue.common.YarnClusterResourceURLBuilder; import org.apache.eagle.hadoop.queue.model.cluster.ClusterMetrics; import org.apache.eagle.hadoop.queue.model.cluster.ClusterMetricsWrapper; -import backtype.storm.spout.SpoutOutputCollector; +import org.apache.storm.spout.SpoutOutputCollector; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/ClusterMetricsParseListener.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/ClusterMetricsParseListener.java index 57dd45496f..af3c9f6fcd 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/ClusterMetricsParseListener.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/ClusterMetricsParseListener.java @@ -32,7 +32,7 @@ import org.apache.eagle.hadoop.queue.storm.HadoopQueueMessageId; import org.apache.eagle.log.entity.GenericMetricEntity; -import backtype.storm.spout.SpoutOutputCollector; +import org.apache.storm.spout.SpoutOutputCollector; import org.apache.commons.lang3.builder.HashCodeBuilder; import java.util.*; import java.util.stream.Collectors; diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/RunningAppParseListener.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/RunningAppParseListener.java index 54df5e0a14..d5368faa8d 100755 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/RunningAppParseListener.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/RunningAppParseListener.java @@ -34,7 +34,7 @@ import org.apache.eagle.hadoop.queue.model.applications.YarnAppAPIEntity; import org.apache.eagle.hadoop.queue.storm.HadoopQueueMessageId; import org.apache.eagle.log.entity.GenericMetricEntity; -import backtype.storm.spout.SpoutOutputCollector; +import org.apache.storm.spout.SpoutOutputCollector; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/RunningAppsCrawler.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/RunningAppsCrawler.java index 6629408406..bf8ce8beae 100755 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/RunningAppsCrawler.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/RunningAppsCrawler.java @@ -22,7 +22,7 @@ import org.apache.eagle.hadoop.queue.common.YarnClusterResourceURLBuilder; import org.apache.eagle.hadoop.queue.model.applications.AppsWrapper; -import backtype.storm.spout.SpoutOutputCollector; +import org.apache.storm.spout.SpoutOutputCollector; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/SchedulerInfoCrawler.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/SchedulerInfoCrawler.java index 16e644aabb..a70f237791 100755 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/SchedulerInfoCrawler.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/SchedulerInfoCrawler.java @@ -22,7 +22,7 @@ import org.apache.eagle.hadoop.queue.common.YarnClusterResourceURLBuilder; import org.apache.eagle.hadoop.queue.model.scheduler.SchedulerInfo; import org.apache.eagle.hadoop.queue.model.scheduler.SchedulerWrapper; -import backtype.storm.spout.SpoutOutputCollector; +import org.apache.storm.spout.SpoutOutputCollector; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/SchedulerInfoParseListener.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/SchedulerInfoParseListener.java index 165bdb1000..20a494071d 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/SchedulerInfoParseListener.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/SchedulerInfoParseListener.java @@ -29,7 +29,7 @@ import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity; import org.apache.eagle.log.entity.GenericMetricEntity; -import backtype.storm.spout.SpoutOutputCollector; +import org.apache.storm.spout.SpoutOutputCollector; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/storm/HadoopQueueMetricPersistBolt.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/storm/HadoopQueueMetricPersistBolt.java index 91bf8e2690..710fa43b0d 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/storm/HadoopQueueMetricPersistBolt.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/storm/HadoopQueueMetricPersistBolt.java @@ -18,13 +18,13 @@ package org.apache.eagle.hadoop.queue.storm; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.Values; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.Values; import org.apache.eagle.hadoop.queue.HadoopQueueRunningAppConfig; import org.apache.eagle.hadoop.queue.common.HadoopClusterConstants; import org.apache.eagle.hadoop.queue.common.HadoopClusterConstants.DataSource; diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/storm/HadoopQueueRunningExtractor.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/storm/HadoopQueueRunningExtractor.java index 77177d9b9e..7205139c41 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/storm/HadoopQueueRunningExtractor.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/storm/HadoopQueueRunningExtractor.java @@ -18,7 +18,7 @@ package org.apache.eagle.hadoop.queue.storm; -import backtype.storm.spout.SpoutOutputCollector; +import org.apache.storm.spout.SpoutOutputCollector; import org.apache.eagle.hadoop.queue.HadoopQueueRunningAppConfig; import org.apache.eagle.hadoop.queue.crawler.ClusterMetricsCrawler; import org.apache.eagle.hadoop.queue.crawler.RunningAppsCrawler; diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/storm/HadoopQueueRunningSpout.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/storm/HadoopQueueRunningSpout.java index 495a63afef..5c9d2c4a75 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/storm/HadoopQueueRunningSpout.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/storm/HadoopQueueRunningSpout.java @@ -21,11 +21,20 @@ import org.apache.eagle.hadoop.queue.HadoopQueueRunningAppConfig; import org.apache.eagle.hadoop.queue.common.HadoopClusterConstants; +<<<<<<< HEAD import backtype.storm.spout.SpoutOutputCollector; import backtype.storm.task.TopologyContext; import backtype.storm.topology.OutputFieldsDeclarer; import backtype.storm.topology.base.BaseRichSpout; import backtype.storm.tuple.Fields; +======= +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; +import com.typesafe.config.Config; +>>>>>>> [EAGLE-906] updating to use org.apache.storm==1.0.3 with compatibility changes import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/AggregationApplication.java b/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/AggregationApplication.java index ecddbceb1e..aa7eaf69fc 100644 --- a/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/AggregationApplication.java +++ b/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/AggregationApplication.java @@ -22,8 +22,8 @@ import org.apache.eagle.jpm.aggregation.mr.MRMetricsAggregateContainer; import org.apache.eagle.jpm.aggregation.storm.AggregationBolt; import org.apache.eagle.jpm.aggregation.storm.AggregationSpout; -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.TopologyBuilder; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.TopologyBuilder; import com.typesafe.config.Config; import java.util.*; diff --git a/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/storm/AggregationBolt.java b/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/storm/AggregationBolt.java index bb2e3de729..c07c7c49ea 100644 --- a/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/storm/AggregationBolt.java +++ b/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/storm/AggregationBolt.java @@ -18,11 +18,11 @@ package org.apache.eagle.jpm.aggregation.storm; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Tuple; import org.apache.eagle.jpm.aggregation.common.MetricsAggregateContainer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/storm/AggregationSpout.java b/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/storm/AggregationSpout.java index e145cf3fc8..2690cf0b98 100644 --- a/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/storm/AggregationSpout.java +++ b/eagle-jpm/eagle-jpm-aggregation/src/main/java/org/apache/eagle/jpm/aggregation/storm/AggregationSpout.java @@ -18,12 +18,12 @@ package org.apache.eagle.jpm.aggregation.storm; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Values; import org.apache.eagle.jpm.aggregation.AggregationConfig; import org.apache.eagle.jpm.aggregation.common.MetricsAggregateContainer; import org.apache.eagle.jpm.aggregation.state.AggregationTimeManager; diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/MRHistoryJobApplication.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/MRHistoryJobApplication.java index 4d02e91a6a..19c6698277 100644 --- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/MRHistoryJobApplication.java +++ b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/MRHistoryJobApplication.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.jpm.mr.history; -import backtype.storm.topology.BoltDeclarer; +import org.apache.storm.topology.BoltDeclarer; import org.apache.eagle.app.StormApplication; import org.apache.eagle.app.environment.impl.StormEnvironment; import org.apache.eagle.app.messaging.StormStreamSink; @@ -30,8 +30,8 @@ import org.apache.eagle.jpm.mr.history.storm.JobHistorySpout; import org.apache.eagle.jpm.util.Constants; -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.TopologyBuilder; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.TopologyBuilder; import com.typesafe.config.Config; import java.util.ArrayList; diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/crawler/JobHistorySpoutCollectorInterceptor.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/crawler/JobHistorySpoutCollectorInterceptor.java index fac281f825..0432def500 100644 --- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/crawler/JobHistorySpoutCollectorInterceptor.java +++ b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/crawler/JobHistorySpoutCollectorInterceptor.java @@ -19,7 +19,7 @@ package org.apache.eagle.jpm.mr.history.crawler; import org.apache.eagle.dataproc.impl.storm.ValuesArray; -import backtype.storm.spout.SpoutOutputCollector; +import org.apache.storm.spout.SpoutOutputCollector; public class JobHistorySpoutCollectorInterceptor implements EagleOutputCollector { private SpoutOutputCollector collector; diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpout.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpout.java index 11deefe6f4..74bf560165 100644 --- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpout.java +++ b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpout.java @@ -18,11 +18,11 @@ package org.apache.eagle.jpm.mr.history.storm; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; import org.apache.eagle.jpm.mr.history.MRHistoryJobConfig; import org.apache.eagle.jpm.mr.history.crawler.*; import org.apache.eagle.jpm.mr.history.publisher.StreamPublisher; diff --git a/eagle-jpm/eagle-jpm-mr-history/src/test/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpoutTest.java b/eagle-jpm/eagle-jpm-mr-history/src/test/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpoutTest.java index a1b62e0ce3..ffa3803aa1 100644 --- a/eagle-jpm/eagle-jpm-mr-history/src/test/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpoutTest.java +++ b/eagle-jpm/eagle-jpm-mr-history/src/test/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpoutTest.java @@ -16,9 +16,9 @@ */ package org.apache.eagle.jpm.mr.history.storm; -import backtype.storm.spout.ISpoutOutputCollector; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; +import org.apache.storm.spout.ISpoutOutputCollector; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; import com.google.common.collect.Lists; import com.sun.jersey.api.client.Client; import com.typesafe.config.ConfigFactory; @@ -120,6 +120,11 @@ public void emitDirect(int i, String s, List list, Object o) { } + @Override + public long getPendingCount() { + return 0; + } + @Override public void reportError(Throwable throwable) { diff --git a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/MRRunningJobApplication.java b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/MRRunningJobApplication.java index ed0d1035b8..f2db715eb7 100644 --- a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/MRRunningJobApplication.java +++ b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/MRRunningJobApplication.java @@ -23,9 +23,9 @@ import org.apache.eagle.jpm.mr.running.storm.MRRunningJobFetchSpout; import org.apache.eagle.jpm.mr.running.storm.MRRunningJobParseBolt; import org.apache.eagle.jpm.util.Constants; -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.tuple.Fields; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.tuple.Fields; import com.typesafe.config.Config; import storm.trident.planner.SpoutNode; diff --git a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/storm/MRRunningJobFetchSpout.java b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/storm/MRRunningJobFetchSpout.java index c07e971c0b..7734ed83c6 100644 --- a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/storm/MRRunningJobFetchSpout.java +++ b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/storm/MRRunningJobFetchSpout.java @@ -28,12 +28,12 @@ import org.apache.eagle.jpm.util.resourcefetch.ResourceFetcher; import org.apache.eagle.jpm.util.resourcefetch.model.AppInfo; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Values; import org.apache.zookeeper.KeeperException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/storm/MRRunningJobParseBolt.java b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/storm/MRRunningJobParseBolt.java index 1cb8cd8ae0..52f8b28fd6 100644 --- a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/storm/MRRunningJobParseBolt.java +++ b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/storm/MRRunningJobParseBolt.java @@ -28,11 +28,11 @@ import org.apache.eagle.jpm.util.resourcefetch.RMResourceFetcher; import org.apache.eagle.jpm.util.resourcefetch.ResourceFetcher; import org.apache.eagle.jpm.util.resourcefetch.model.AppInfo; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Tuple; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/MRRunningJobApplicationTest.java b/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/MRRunningJobApplicationTest.java index a43c956a7f..eac0c1ba65 100644 --- a/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/MRRunningJobApplicationTest.java +++ b/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/MRRunningJobApplicationTest.java @@ -16,11 +16,11 @@ */ package org.apache.eagle.jpm.mr.running; -import backtype.storm.Testing; -import backtype.storm.spout.ISpoutOutputCollector; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.Values; +import org.apache.storm.Testing; +import org.apache.storm.spout.ISpoutOutputCollector; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.Values; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.apache.eagle.jpm.analyzer.mr.MRJobPerformanceAnalyzer; @@ -166,6 +166,11 @@ public void emitDirect(int taskId, String streamId, List tuple, Object m } + @Override + public long getPendingCount() { + return 0; + } + @Override public void reportError(Throwable error) { diff --git a/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/SparkHistoryJobApp.java b/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/SparkHistoryJobApp.java index e30a0d81cc..8af1eb1e33 100644 --- a/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/SparkHistoryJobApp.java +++ b/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/SparkHistoryJobApp.java @@ -21,8 +21,8 @@ import org.apache.eagle.app.environment.impl.StormEnvironment; import org.apache.eagle.jpm.spark.history.storm.SparkHistoryJobParseBolt; import org.apache.eagle.jpm.spark.history.storm.SparkHistoryJobSpout; -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.TopologyBuilder; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.TopologyBuilder; import com.typesafe.config.Config; public class SparkHistoryJobApp extends StormApplication { diff --git a/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/storm/SparkHistoryJobParseBolt.java b/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/storm/SparkHistoryJobParseBolt.java index f0fb6b5321..352c26f471 100644 --- a/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/storm/SparkHistoryJobParseBolt.java +++ b/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/storm/SparkHistoryJobParseBolt.java @@ -27,11 +27,11 @@ import org.apache.eagle.jpm.util.HDFSUtil; import org.apache.eagle.jpm.util.resourcefetch.model.SparkApplication; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Tuple; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/storm/SparkHistoryJobSpout.java b/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/storm/SparkHistoryJobSpout.java index 4ca01f1fde..912ed81c15 100644 --- a/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/storm/SparkHistoryJobSpout.java +++ b/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/storm/SparkHistoryJobSpout.java @@ -26,13 +26,13 @@ import org.apache.eagle.jpm.util.resourcefetch.RMResourceFetcher; import org.apache.eagle.jpm.util.resourcefetch.ResourceFetcher; import org.apache.eagle.jpm.util.resourcefetch.model.AppInfo; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; -import backtype.storm.utils.Utils; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Values; +import org.apache.storm.utils.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-jpm/eagle-jpm-spark-running/src/main/java/org/apache/eagle/jpm/spark/running/SparkRunningJobApp.java b/eagle-jpm/eagle-jpm-spark-running/src/main/java/org/apache/eagle/jpm/spark/running/SparkRunningJobApp.java index 0e1aacde7a..1ce8d4e5f0 100644 --- a/eagle-jpm/eagle-jpm-spark-running/src/main/java/org/apache/eagle/jpm/spark/running/SparkRunningJobApp.java +++ b/eagle-jpm/eagle-jpm-spark-running/src/main/java/org/apache/eagle/jpm/spark/running/SparkRunningJobApp.java @@ -21,9 +21,9 @@ import org.apache.eagle.app.environment.impl.StormEnvironment; import org.apache.eagle.jpm.spark.running.storm.SparkRunningJobFetchSpout; import org.apache.eagle.jpm.spark.running.storm.SparkRunningJobParseBolt; -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.tuple.Fields; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.tuple.Fields; import com.typesafe.config.Config; public class SparkRunningJobApp extends StormApplication { diff --git a/eagle-jpm/eagle-jpm-spark-running/src/main/java/org/apache/eagle/jpm/spark/running/storm/SparkRunningJobFetchSpout.java b/eagle-jpm/eagle-jpm-spark-running/src/main/java/org/apache/eagle/jpm/spark/running/storm/SparkRunningJobFetchSpout.java index 76c78156e8..0de1bebe6c 100644 --- a/eagle-jpm/eagle-jpm-spark-running/src/main/java/org/apache/eagle/jpm/spark/running/storm/SparkRunningJobFetchSpout.java +++ b/eagle-jpm/eagle-jpm-spark-running/src/main/java/org/apache/eagle/jpm/spark/running/storm/SparkRunningJobFetchSpout.java @@ -26,12 +26,12 @@ import org.apache.eagle.jpm.util.resourcefetch.ResourceFetcher; import org.apache.eagle.jpm.util.resourcefetch.model.AppInfo; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Values; import org.apache.zookeeper.KeeperException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-jpm/eagle-jpm-spark-running/src/main/java/org/apache/eagle/jpm/spark/running/storm/SparkRunningJobParseBolt.java b/eagle-jpm/eagle-jpm-spark-running/src/main/java/org/apache/eagle/jpm/spark/running/storm/SparkRunningJobParseBolt.java index 0a74348450..b7a3c42c9e 100644 --- a/eagle-jpm/eagle-jpm-spark-running/src/main/java/org/apache/eagle/jpm/spark/running/storm/SparkRunningJobParseBolt.java +++ b/eagle-jpm/eagle-jpm-spark-running/src/main/java/org/apache/eagle/jpm/spark/running/storm/SparkRunningJobParseBolt.java @@ -27,11 +27,11 @@ import org.apache.eagle.jpm.util.resourcefetch.ResourceFetcher; import org.apache.eagle.jpm.util.resourcefetch.model.AppInfo; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Tuple; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-metric/eagle-hadoop-metric/src/main/java/org/apache/eagle/metric/HadoopMetricMonitorApp.java b/eagle-metric/eagle-hadoop-metric/src/main/java/org/apache/eagle/metric/HadoopMetricMonitorApp.java index 05c874dfc0..7620112aa4 100644 --- a/eagle-metric/eagle-hadoop-metric/src/main/java/org/apache/eagle/metric/HadoopMetricMonitorApp.java +++ b/eagle-metric/eagle-hadoop-metric/src/main/java/org/apache/eagle/metric/HadoopMetricMonitorApp.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.metric; -import backtype.storm.generated.StormTopology; +import org.apache.storm.generated.StormTopology; import com.typesafe.config.Config; import org.apache.eagle.app.StormApplication; import org.apache.eagle.app.environment.builder.MetricDescriptor; diff --git a/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/EagleMetricCollectorApplication.java b/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/EagleMetricCollectorApplication.java index 646f2d4dc0..b96c7fce20 100644 --- a/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/EagleMetricCollectorApplication.java +++ b/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/EagleMetricCollectorApplication.java @@ -16,11 +16,11 @@ */ package org.apache.eagle.metric.kafka; -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.BoltDeclarer; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.BoltDeclarer; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.apache.eagle.app.StormApplication; diff --git a/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaMessageDistributionBolt.java b/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaMessageDistributionBolt.java index 76c7bf2915..f8430b0645 100644 --- a/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaMessageDistributionBolt.java +++ b/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaMessageDistributionBolt.java @@ -19,11 +19,11 @@ package org.apache.eagle.metric.kafka; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Tuple; import com.codahale.metrics.MetricRegistry; import com.typesafe.config.Config; import org.apache.commons.lang.time.DateUtils; diff --git a/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaOffsetSourceSpoutProvider.java b/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaOffsetSourceSpoutProvider.java index 8f25564492..4510b72723 100644 --- a/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaOffsetSourceSpoutProvider.java +++ b/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaOffsetSourceSpoutProvider.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.metric.kafka; -import backtype.storm.topology.base.BaseRichSpout; +import org.apache.storm.topology.base.BaseRichSpout; import com.typesafe.config.Config; import org.apache.eagle.common.config.EagleConfigConstants; import org.apache.eagle.dataproc.impl.storm.StormSpoutProvider; diff --git a/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaOffsetSpout.java b/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaOffsetSpout.java index 4fc66c164f..243c8eb646 100644 --- a/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaOffsetSpout.java +++ b/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaOffsetSpout.java @@ -16,10 +16,10 @@ */ package org.apache.eagle.metric.kafka; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichSpout; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichSpout; import org.apache.eagle.metric.reportor.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaSourcedSpoutProvider.java b/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaSourcedSpoutProvider.java index 382ae1a642..18b9dbcc07 100644 --- a/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaSourcedSpoutProvider.java +++ b/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaSourcedSpoutProvider.java @@ -16,16 +16,16 @@ */ package org.apache.eagle.metric.kafka; -import backtype.storm.spout.Scheme; -import backtype.storm.spout.SchemeAsMultiScheme; -import backtype.storm.topology.base.BaseRichSpout; +import org.apache.storm.spout.Scheme; +import org.apache.storm.spout.SchemeAsMultiScheme; +import org.apache.storm.topology.base.BaseRichSpout; import com.typesafe.config.Config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import storm.kafka.BrokerHosts; -import storm.kafka.KafkaSpout; -import storm.kafka.SpoutConfig; -import storm.kafka.ZkHosts; +import org.apache.storm.kafka.BrokerHosts; +import org.apache.storm.kafka.KafkaSpout; +import org.apache.storm.kafka.SpoutConfig; +import org.apache.storm.kafka.ZkHosts; import java.util.ArrayList; import java.util.List; diff --git a/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaSourcedSpoutScheme.java b/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaSourcedSpoutScheme.java index e9bc381b4d..e8c2451222 100644 --- a/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaSourcedSpoutScheme.java +++ b/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaSourcedSpoutScheme.java @@ -16,12 +16,13 @@ */ package org.apache.eagle.metric.kafka; -import backtype.storm.spout.Scheme; -import backtype.storm.tuple.Fields; +import org.apache.storm.spout.Scheme; +import org.apache.storm.tuple.Fields; import com.typesafe.config.Config; import org.apache.eagle.dataproc.impl.storm.kafka.SpoutKafkaMessageDeserializer; import java.lang.reflect.Constructor; +import java.nio.ByteBuffer; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -50,8 +51,8 @@ public KafkaSourcedSpoutScheme(String deserClsName, Config context){ } @Override - public List deserialize(byte[] ser) { - Object tmp = deserializer.deserialize(ser); + public List deserialize(ByteBuffer ser) { + Object tmp = deserializer.deserialize(ser.array()); Map map = (Map)tmp; if(tmp == null) return null; return Arrays.asList(map.get("user"), map.get("timestamp")); diff --git a/eagle-security/eagle-security-common/src/main/java/org/apache/eagle/security/enrich/AbstractDataEnrichBolt.java b/eagle-security/eagle-security-common/src/main/java/org/apache/eagle/security/enrich/AbstractDataEnrichBolt.java index 6c23180039..24e6408b69 100644 --- a/eagle-security/eagle-security-common/src/main/java/org/apache/eagle/security/enrich/AbstractDataEnrichBolt.java +++ b/eagle-security/eagle-security-common/src/main/java/org/apache/eagle/security/enrich/AbstractDataEnrichBolt.java @@ -17,10 +17,10 @@ package org.apache.eagle.security.enrich; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Tuple; import com.typesafe.config.Config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-security/eagle-security-common/src/main/java/org/apache/eagle/security/topo/TopologySubmitter.java b/eagle-security/eagle-security-common/src/main/java/org/apache/eagle/security/topo/TopologySubmitter.java index af737a3f12..d323f98621 100644 --- a/eagle-security/eagle-security-common/src/main/java/org/apache/eagle/security/topo/TopologySubmitter.java +++ b/eagle-security/eagle-security-common/src/main/java/org/apache/eagle/security/topo/TopologySubmitter.java @@ -17,14 +17,14 @@ package org.apache.eagle.security.topo; -import backtype.storm.LocalCluster; -import backtype.storm.StormSubmitter; -import backtype.storm.generated.StormTopology; -import backtype.storm.utils.Utils; +import org.apache.storm.LocalCluster; +import org.apache.storm.StormSubmitter; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.utils.Utils; import com.typesafe.config.Config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import storm.kafka.bolt.KafkaBolt; +import org.apache.storm.kafka.bolt.KafkaBolt; import java.util.HashMap; import java.util.Map; @@ -41,7 +41,7 @@ public class TopologySubmitter { private static Logger LOG = LoggerFactory.getLogger(TopologySubmitter.class); public static void submit(StormTopology topology, Config config){ - backtype.storm.Config stormConfig = new backtype.storm.Config(); + org.apache.storm.Config stormConfig = new org.apache.storm.Config(); int messageTimeoutSecs = config.hasPath(MESSAGE_TIMEOUT_SECS)?config.getInt(MESSAGE_TIMEOUT_SECS) : DEFAULT_MESSAGE_TIMEOUT_SECS; LOG.info("Set topology.message.timeout.secs as {}",messageTimeoutSecs); stormConfig.setMessageTimeoutSecs(messageTimeoutSecs); @@ -52,7 +52,8 @@ public static void submit(StormTopology topology, Config config){ props.put("metadata.broker.list", config.getString("dataSinkConfig.brokerList")); props.put("serializer.class", config.getString("dataSinkConfig.serializerClass")); props.put("key.serializer.class", config.getString("dataSinkConfig.keySerializerClass")); - stormConfig.put(KafkaBolt.KAFKA_BROKER_PROPERTIES, props); + // KafkaBolt.KAFKA_BROKER_PROPERTIES is removed, using direct string + stormConfig.put("kafka.broker.properties", props); } if(config.hasPath("dataSinkConfig.serializerClass")){ diff --git a/eagle-security/eagle-security-common/src/main/java/org/apache/eagle/security/traffic/HadoopLogAccumulatorBolt.java b/eagle-security/eagle-security-common/src/main/java/org/apache/eagle/security/traffic/HadoopLogAccumulatorBolt.java index 3377b4ae75..a15e24a942 100644 --- a/eagle-security/eagle-security-common/src/main/java/org/apache/eagle/security/traffic/HadoopLogAccumulatorBolt.java +++ b/eagle-security/eagle-security-common/src/main/java/org/apache/eagle/security/traffic/HadoopLogAccumulatorBolt.java @@ -17,13 +17,13 @@ package org.apache.eagle.security.traffic; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.Values; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.Values; import com.typesafe.config.Config; import org.apache.eagle.common.DateTimeUtil; import org.apache.eagle.common.utils.Tuple2; diff --git a/eagle-security/eagle-security-hbase-auditlog/src/main/java/org/apache/eagle/security/hbase/HBaseAuditLogApplication.java b/eagle-security/eagle-security-hbase-auditlog/src/main/java/org/apache/eagle/security/hbase/HBaseAuditLogApplication.java index 11a22e5d60..6bb91a12bb 100644 --- a/eagle-security/eagle-security-hbase-auditlog/src/main/java/org/apache/eagle/security/hbase/HBaseAuditLogApplication.java +++ b/eagle-security/eagle-security-hbase-auditlog/src/main/java/org/apache/eagle/security/hbase/HBaseAuditLogApplication.java @@ -16,18 +16,18 @@ */ package org.apache.eagle.security.hbase; -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.BoltDeclarer; -import backtype.storm.topology.IRichSpout; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.tuple.Fields; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.BoltDeclarer; +import org.apache.storm.topology.IRichSpout; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.tuple.Fields; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.apache.eagle.app.StormApplication; import org.apache.eagle.app.environment.impl.StormEnvironment; import org.apache.eagle.app.messaging.StormStreamSink; import org.apache.eagle.dataproc.impl.storm.kafka.KafkaSpoutProvider; -import storm.kafka.StringScheme; +import org.apache.storm.kafka.StringScheme; /** * Since 7/27/16. diff --git a/eagle-security/eagle-security-hbase-auditlog/src/main/java/org/apache/eagle/security/hbase/HBaseAuditLogParserBolt.java b/eagle-security/eagle-security-hbase-auditlog/src/main/java/org/apache/eagle/security/hbase/HBaseAuditLogParserBolt.java index ffed0ef950..eca7d348a3 100644 --- a/eagle-security/eagle-security-hbase-auditlog/src/main/java/org/apache/eagle/security/hbase/HBaseAuditLogParserBolt.java +++ b/eagle-security/eagle-security-hbase-auditlog/src/main/java/org/apache/eagle/security/hbase/HBaseAuditLogParserBolt.java @@ -17,12 +17,12 @@ */ package org.apache.eagle.security.hbase; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-security/eagle-security-hbase-auditlog/src/main/java/org/apache/eagle/security/hbase/HbaseResourceSensitivityDataJoinBolt.java b/eagle-security/eagle-security-hbase-auditlog/src/main/java/org/apache/eagle/security/hbase/HbaseResourceSensitivityDataJoinBolt.java index a1545c2915..baee4108ec 100644 --- a/eagle-security/eagle-security-hbase-auditlog/src/main/java/org/apache/eagle/security/hbase/HbaseResourceSensitivityDataJoinBolt.java +++ b/eagle-security/eagle-security-hbase-auditlog/src/main/java/org/apache/eagle/security/hbase/HbaseResourceSensitivityDataJoinBolt.java @@ -16,9 +16,9 @@ */ package org.apache.eagle.security.hbase; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import com.typesafe.config.Config; import org.apache.eagle.security.service.HBaseSensitivityEntity; import org.apache.eagle.security.enrich.AbstractDataEnrichBolt; diff --git a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/AbstractHdfsAuditLogApplication.java b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/AbstractHdfsAuditLogApplication.java index b21d62de11..d29accc338 100644 --- a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/AbstractHdfsAuditLogApplication.java +++ b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/AbstractHdfsAuditLogApplication.java @@ -19,11 +19,11 @@ package org.apache.eagle.security.auditlog; -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.BoltDeclarer; -import backtype.storm.topology.IRichSpout; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.topology.base.BaseRichBolt; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.BoltDeclarer; +import org.apache.storm.topology.IRichSpout; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.topology.base.BaseRichBolt; import com.typesafe.config.Config; import org.apache.commons.lang3.time.DateUtils; import org.apache.eagle.app.StormApplication; diff --git a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/HdfsAuditLogApplication.java b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/HdfsAuditLogApplication.java index 6f33517f2d..af82f00832 100644 --- a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/HdfsAuditLogApplication.java +++ b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/HdfsAuditLogApplication.java @@ -21,11 +21,11 @@ package org.apache.eagle.security.auditlog; -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.BoltDeclarer; -import backtype.storm.topology.IRichSpout; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.topology.base.BaseRichBolt; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.BoltDeclarer; +import org.apache.storm.topology.IRichSpout; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.topology.base.BaseRichBolt; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.apache.eagle.app.environment.impl.StormEnvironment; diff --git a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/HdfsAuditLogParserBolt.java b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/HdfsAuditLogParserBolt.java index 7b9d9a54c6..5bc4b6d48f 100644 --- a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/HdfsAuditLogParserBolt.java +++ b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/HdfsAuditLogParserBolt.java @@ -19,12 +19,12 @@ package org.apache.eagle.security.auditlog; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import com.typesafe.config.Config; import org.apache.eagle.common.DateTimeUtil; import org.apache.eagle.security.hdfs.HDFSAuditLogObject; diff --git a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/HdfsSensitivityDataEnrichBolt.java b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/HdfsSensitivityDataEnrichBolt.java index f8e7c4d8fb..f2c0347e92 100644 --- a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/HdfsSensitivityDataEnrichBolt.java +++ b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/HdfsSensitivityDataEnrichBolt.java @@ -16,9 +16,9 @@ */ package org.apache.eagle.security.auditlog; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import com.typesafe.config.Config; import org.apache.eagle.security.auditlog.util.SimplifyPath; import org.apache.eagle.security.service.HdfsSensitivityEntity; diff --git a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/HdfsUserCommandReassembler.java b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/HdfsUserCommandReassembler.java index e06143cda6..86862f93f8 100644 --- a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/HdfsUserCommandReassembler.java +++ b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/HdfsUserCommandReassembler.java @@ -18,7 +18,7 @@ */ package org.apache.eagle.security.auditlog; -import backtype.storm.task.OutputCollector; +import org.apache.storm.task.OutputCollector; import com.typesafe.config.Config; import org.apache.eagle.security.entity.HdfsUserCommandPatternEntity; import org.apache.eagle.service.client.EagleServiceConnector; diff --git a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/IPZoneDataEnrichBolt.java b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/IPZoneDataEnrichBolt.java index faab22a8f0..adb76cbc13 100644 --- a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/IPZoneDataEnrichBolt.java +++ b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/IPZoneDataEnrichBolt.java @@ -16,9 +16,9 @@ */ package org.apache.eagle.security.auditlog; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import com.typesafe.config.Config; import org.apache.eagle.security.service.IPZoneEntity; import org.apache.eagle.security.enrich.AbstractDataEnrichBolt; diff --git a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/kafka/MessageJsonScheme.java b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/kafka/MessageJsonScheme.java index 1d482085a3..5e30384548 100644 --- a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/kafka/MessageJsonScheme.java +++ b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/kafka/MessageJsonScheme.java @@ -18,14 +18,15 @@ package org.apache.eagle.security.auditlog.kafka; -import backtype.storm.spout.Scheme; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; +import org.apache.storm.spout.Scheme; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Values; import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.Logger; -import storm.kafka.StringScheme; +import org.apache.storm.kafka.StringScheme; import java.io.IOException; +import java.nio.ByteBuffer; import java.util.List; import java.util.Map; @@ -43,10 +44,10 @@ public Fields getOutputFields() { @Override @SuppressWarnings("rawtypes") - public List deserialize(byte[] ser) { + public List deserialize(ByteBuffer ser) { try { if (ser != null) { - Map map = mapper.readValue(ser, Map.class); + Map map = mapper.readValue(ser.array(), Map.class); Object message = map.get(MESSAGE_SCHEME_KEY); if (message != null) { return new Values(map.get(MESSAGE_SCHEME_KEY)); @@ -58,7 +59,7 @@ public List deserialize(byte[] ser) { } } catch (IOException e) { try { - LOG.error("Failed to deserialize as JSON: {}", new String(ser, "UTF-8"), e); + LOG.error("Failed to deserialize as JSON: {}", new String(ser.array(), "UTF-8"), e); } catch (Exception ex) { LOG.error(ex.getMessage(), ex); } diff --git a/eagle-security/eagle-security-hdfs-auditlog/src/test/java/org/apache/eagle/security/auditlog/TestUserCommandReassembler.java b/eagle-security/eagle-security-hdfs-auditlog/src/test/java/org/apache/eagle/security/auditlog/TestUserCommandReassembler.java index f7ddad2b64..7b8e67cb20 100644 --- a/eagle-security/eagle-security-hdfs-auditlog/src/test/java/org/apache/eagle/security/auditlog/TestUserCommandReassembler.java +++ b/eagle-security/eagle-security-hdfs-auditlog/src/test/java/org/apache/eagle/security/auditlog/TestUserCommandReassembler.java @@ -19,9 +19,9 @@ package org.apache.eagle.security.auditlog; -import backtype.storm.task.IOutputCollector; -import backtype.storm.task.OutputCollector; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.IOutputCollector; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.tuple.Tuple; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.apache.eagle.security.hdfs.HDFSAuditLogObject; @@ -80,6 +80,11 @@ public void fail(Tuple input) { } + @Override + public void resetTimeout(Tuple tuple) { + + } + @Override public void reportError(Throwable error) { @@ -128,6 +133,11 @@ public void fail(Tuple input) { } + @Override + public void resetTimeout(Tuple tuple) { + + } + @Override public void reportError(Throwable error) { @@ -183,6 +193,11 @@ public void fail(Tuple input) { } + @Override + public void resetTimeout(Tuple tuple) { + + } + @Override public void reportError(Throwable error) { diff --git a/eagle-security/eagle-security-hdfs-authlog/src/main/java/org/apache/eagle/security/securitylog/HdfsAuthLogMonitoringMain.java b/eagle-security/eagle-security-hdfs-authlog/src/main/java/org/apache/eagle/security/securitylog/HdfsAuthLogMonitoringMain.java index a495d920f0..24229a5c7f 100644 --- a/eagle-security/eagle-security-hdfs-authlog/src/main/java/org/apache/eagle/security/securitylog/HdfsAuthLogMonitoringMain.java +++ b/eagle-security/eagle-security-hdfs-authlog/src/main/java/org/apache/eagle/security/securitylog/HdfsAuthLogMonitoringMain.java @@ -17,17 +17,17 @@ */ package org.apache.eagle.security.securitylog; -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.BoltDeclarer; -import backtype.storm.topology.IRichSpout; -import backtype.storm.topology.TopologyBuilder; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.BoltDeclarer; +import org.apache.storm.topology.IRichSpout; +import org.apache.storm.topology.TopologyBuilder; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.apache.eagle.dataproc.impl.storm.kafka.KafkaSpoutProvider; import org.apache.eagle.security.topo.TopologySubmitter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import storm.kafka.bolt.KafkaBolt; +import org.apache.storm.kafka.bolt.KafkaBolt; public class HdfsAuthLogMonitoringMain { private static Logger LOG = LoggerFactory.getLogger(HdfsAuthLogMonitoringMain.class); diff --git a/eagle-security/eagle-security-hdfs-authlog/src/main/java/org/apache/eagle/security/securitylog/SecurityLogParserBolt.java b/eagle-security/eagle-security-hdfs-authlog/src/main/java/org/apache/eagle/security/securitylog/SecurityLogParserBolt.java index 43c189d244..a02bb59179 100644 --- a/eagle-security/eagle-security-hdfs-authlog/src/main/java/org/apache/eagle/security/securitylog/SecurityLogParserBolt.java +++ b/eagle-security/eagle-security-hdfs-authlog/src/main/java/org/apache/eagle/security/securitylog/SecurityLogParserBolt.java @@ -17,16 +17,16 @@ */ package org.apache.eagle.security.securitylog; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import storm.kafka.bolt.mapper.FieldNameBasedTupleToKafkaMapper; +import org.apache.storm.kafka.bolt.mapper.FieldNameBasedTupleToKafkaMapper; import java.util.Arrays; import java.util.Map; diff --git a/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/HiveQueryMonitoringApplication.java b/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/HiveQueryMonitoringApplication.java index 4df4a5b000..bd3c6b54bd 100644 --- a/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/HiveQueryMonitoringApplication.java +++ b/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/HiveQueryMonitoringApplication.java @@ -17,11 +17,11 @@ package org.apache.eagle.security.hive; -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.BoltDeclarer; -import backtype.storm.topology.IRichSpout; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.tuple.Fields; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.BoltDeclarer; +import org.apache.storm.topology.IRichSpout; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.tuple.Fields; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import org.apache.eagle.app.StormApplication; diff --git a/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/jobrunning/HiveJobFetchSpout.java b/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/jobrunning/HiveJobFetchSpout.java index 08a325126f..69a750444a 100644 --- a/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/jobrunning/HiveJobFetchSpout.java +++ b/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/jobrunning/HiveJobFetchSpout.java @@ -17,11 +17,11 @@ package org.apache.eagle.security.hive.jobrunning; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; import org.apache.commons.lang.StringUtils; import org.apache.eagle.dataproc.impl.storm.ValuesArray; import org.apache.eagle.jpm.util.*; diff --git a/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/jobrunning/HiveJobRunningSourcedStormSpoutProvider.java b/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/jobrunning/HiveJobRunningSourcedStormSpoutProvider.java index 597593b1de..13596184b8 100644 --- a/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/jobrunning/HiveJobRunningSourcedStormSpoutProvider.java +++ b/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/jobrunning/HiveJobRunningSourcedStormSpoutProvider.java @@ -16,7 +16,7 @@ */ package org.apache.eagle.security.hive.jobrunning; -import backtype.storm.topology.base.BaseRichSpout; +import org.apache.storm.topology.base.BaseRichSpout; import org.apache.eagle.jpm.util.DefaultJobIdPartitioner; import org.apache.eagle.jpm.util.Utils; import org.apache.eagle.security.hive.config.RunningJobCrawlConfig; diff --git a/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/jobrunning/HiveQueryParserBolt.java b/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/jobrunning/HiveQueryParserBolt.java index c9be0e8743..e3e4b0bd75 100644 --- a/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/jobrunning/HiveQueryParserBolt.java +++ b/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/jobrunning/HiveQueryParserBolt.java @@ -16,12 +16,12 @@ */ package org.apache.eagle.security.hive.jobrunning; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import org.apache.eagle.security.hive.ql.HiveQLParserContent; import org.apache.eagle.security.hive.ql.Parser; import org.slf4j.Logger; diff --git a/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/jobrunning/JobFilterBolt.java b/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/jobrunning/JobFilterBolt.java index 3a7c24f7a5..ac8ede3205 100644 --- a/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/jobrunning/JobFilterBolt.java +++ b/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/jobrunning/JobFilterBolt.java @@ -16,12 +16,12 @@ */ package org.apache.eagle.security.hive.jobrunning; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import org.apache.eagle.jpm.util.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/sensitivity/HiveSensitivityDataEnrichBolt.java b/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/sensitivity/HiveSensitivityDataEnrichBolt.java index 57b5700fa4..57c07799e7 100644 --- a/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/sensitivity/HiveSensitivityDataEnrichBolt.java +++ b/eagle-security/eagle-security-hive/src/main/java/org/apache/eagle/security/hive/sensitivity/HiveSensitivityDataEnrichBolt.java @@ -16,9 +16,9 @@ */ package org.apache.eagle.security.hive.sensitivity; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import com.typesafe.config.Config; import org.apache.eagle.security.service.HiveSensitivityEntity; import org.apache.eagle.security.enrich.AbstractDataEnrichBolt; diff --git a/eagle-security/eagle-security-hive/src/test/java/org/apache/eagle/security/hive/jobrunning/TestHiveJobFetchSpout.java b/eagle-security/eagle-security-hive/src/test/java/org/apache/eagle/security/hive/jobrunning/TestHiveJobFetchSpout.java index d674e0277a..b842fbaf3e 100644 --- a/eagle-security/eagle-security-hive/src/test/java/org/apache/eagle/security/hive/jobrunning/TestHiveJobFetchSpout.java +++ b/eagle-security/eagle-security-hive/src/test/java/org/apache/eagle/security/hive/jobrunning/TestHiveJobFetchSpout.java @@ -16,8 +16,8 @@ */ package org.apache.eagle.security.hive.jobrunning; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; import com.typesafe.config.ConfigFactory; import junit.framework.Assert; import org.apache.curator.framework.CuratorFramework; diff --git a/eagle-security/eagle-security-maprfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/MapRFSAuditLogApplication.java b/eagle-security/eagle-security-maprfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/MapRFSAuditLogApplication.java index b72cb1356f..9add539b2d 100644 --- a/eagle-security/eagle-security-maprfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/MapRFSAuditLogApplication.java +++ b/eagle-security/eagle-security-maprfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/MapRFSAuditLogApplication.java @@ -18,7 +18,7 @@ */ package org.apache.eagle.security.auditlog; -import backtype.storm.topology.base.BaseRichBolt; +import org.apache.storm.topology.base.BaseRichBolt; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; diff --git a/eagle-security/eagle-security-maprfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/MapRFSAuditLogParserBolt.java b/eagle-security/eagle-security-maprfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/MapRFSAuditLogParserBolt.java index b59cd5bfab..6f4e24ccb8 100644 --- a/eagle-security/eagle-security-maprfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/MapRFSAuditLogParserBolt.java +++ b/eagle-security/eagle-security-maprfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/MapRFSAuditLogParserBolt.java @@ -19,12 +19,12 @@ package org.apache.eagle.security.auditlog; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import org.apache.eagle.security.hdfs.MAPRFSAuditLogObject; import org.apache.eagle.security.hdfs.MAPRFSAuditLogParser; import org.slf4j.Logger; diff --git a/eagle-security/eagle-security-oozie-auditlog/src/main/java/org/apache/eagle/security/oozie/parse/OozieAuditLogApplication.java b/eagle-security/eagle-security-oozie-auditlog/src/main/java/org/apache/eagle/security/oozie/parse/OozieAuditLogApplication.java index 32dcc309dd..80ff3aca97 100644 --- a/eagle-security/eagle-security-oozie-auditlog/src/main/java/org/apache/eagle/security/oozie/parse/OozieAuditLogApplication.java +++ b/eagle-security/eagle-security-oozie-auditlog/src/main/java/org/apache/eagle/security/oozie/parse/OozieAuditLogApplication.java @@ -23,14 +23,14 @@ import org.apache.eagle.dataproc.impl.storm.kafka.KafkaSpoutProvider; import org.apache.eagle.security.oozie.parse.sensitivity.OozieResourceSensitivityDataJoinBolt; -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.BoltDeclarer; -import backtype.storm.topology.IRichSpout; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.tuple.Fields; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.BoltDeclarer; +import org.apache.storm.topology.IRichSpout; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.tuple.Fields; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; -import storm.kafka.StringScheme; +import org.apache.storm.kafka.StringScheme; /** * Since 8/12/16. diff --git a/eagle-security/eagle-security-oozie-auditlog/src/main/java/org/apache/eagle/security/oozie/parse/OozieAuditLogParserBolt.java b/eagle-security/eagle-security-oozie-auditlog/src/main/java/org/apache/eagle/security/oozie/parse/OozieAuditLogParserBolt.java index 7f8fa224da..8370276991 100644 --- a/eagle-security/eagle-security-oozie-auditlog/src/main/java/org/apache/eagle/security/oozie/parse/OozieAuditLogParserBolt.java +++ b/eagle-security/eagle-security-oozie-auditlog/src/main/java/org/apache/eagle/security/oozie/parse/OozieAuditLogParserBolt.java @@ -20,12 +20,12 @@ package org.apache.eagle.security.oozie.parse; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-security/eagle-security-oozie-auditlog/src/main/java/org/apache/eagle/security/oozie/parse/sensitivity/OozieResourceSensitivityDataJoinBolt.java b/eagle-security/eagle-security-oozie-auditlog/src/main/java/org/apache/eagle/security/oozie/parse/sensitivity/OozieResourceSensitivityDataJoinBolt.java index 6e5bc12a37..b3ff53ff74 100644 --- a/eagle-security/eagle-security-oozie-auditlog/src/main/java/org/apache/eagle/security/oozie/parse/sensitivity/OozieResourceSensitivityDataJoinBolt.java +++ b/eagle-security/eagle-security-oozie-auditlog/src/main/java/org/apache/eagle/security/oozie/parse/sensitivity/OozieResourceSensitivityDataJoinBolt.java @@ -20,10 +20,10 @@ import org.apache.eagle.security.enrich.AbstractDataEnrichBolt; import org.apache.eagle.security.entity.OozieResourceSensitivityAPIEntity; -import backtype.storm.task.OutputCollector; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import com.typesafe.config.Config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/TopologyCheckApp.java b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/TopologyCheckApp.java index df14bfacd1..de76215455 100644 --- a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/TopologyCheckApp.java +++ b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/TopologyCheckApp.java @@ -18,8 +18,8 @@ package org.apache.eagle.topology; -import backtype.storm.generated.StormTopology; -import backtype.storm.topology.TopologyBuilder; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.topology.TopologyBuilder; import com.typesafe.config.Config; import org.apache.eagle.app.StormApplication; import org.apache.eagle.app.environment.impl.StormEnvironment; diff --git a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/extractor/TopologyExtractorFactory.java b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/extractor/TopologyExtractorFactory.java index 17dec203e1..9903f6cb6b 100644 --- a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/extractor/TopologyExtractorFactory.java +++ b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/extractor/TopologyExtractorFactory.java @@ -18,7 +18,7 @@ package org.apache.eagle.topology.extractor; -import backtype.storm.spout.SpoutOutputCollector; +import org.apache.storm.spout.SpoutOutputCollector; import org.apache.eagle.topology.TopologyCheckAppConfig; import org.apache.eagle.topology.TopologyConstants; import org.apache.eagle.topology.extractor.hbase.HbaseTopologyCrawler; diff --git a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/extractor/hbase/HbaseTopologyCrawler.java b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/extractor/hbase/HbaseTopologyCrawler.java index 04a4aa1373..3045e92b29 100644 --- a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/extractor/hbase/HbaseTopologyCrawler.java +++ b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/extractor/hbase/HbaseTopologyCrawler.java @@ -18,8 +18,8 @@ package org.apache.eagle.topology.extractor.hbase; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.tuple.Values; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.tuple.Values; import org.apache.eagle.topology.TopologyCheckAppConfig; import org.apache.eagle.topology.TopologyCheckMessageId; import org.apache.eagle.topology.TopologyConstants; diff --git a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/extractor/hdfs/HdfsTopologyCrawler.java b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/extractor/hdfs/HdfsTopologyCrawler.java index f20204d4e5..c85324e5c0 100644 --- a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/extractor/hdfs/HdfsTopologyCrawler.java +++ b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/extractor/hdfs/HdfsTopologyCrawler.java @@ -18,8 +18,8 @@ package org.apache.eagle.topology.extractor.hdfs; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.tuple.Values; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.tuple.Values; import org.apache.eagle.topology.TopologyCheckAppConfig; import org.apache.eagle.topology.TopologyCheckMessageId; import org.apache.eagle.topology.TopologyConstants; diff --git a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/extractor/mr/MRTopologyCrawler.java b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/extractor/mr/MRTopologyCrawler.java index e843a77c27..fa5e605dd1 100644 --- a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/extractor/mr/MRTopologyCrawler.java +++ b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/extractor/mr/MRTopologyCrawler.java @@ -18,8 +18,8 @@ package org.apache.eagle.topology.extractor.mr; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.tuple.Values; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.tuple.Values; import org.apache.eagle.topology.TopologyCheckAppConfig; import org.apache.eagle.topology.TopologyCheckMessageId; import org.apache.eagle.topology.TopologyConstants; diff --git a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/storm/HealthCheckParseBolt.java b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/storm/HealthCheckParseBolt.java index a0b282bd95..7a1ee57156 100644 --- a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/storm/HealthCheckParseBolt.java +++ b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/storm/HealthCheckParseBolt.java @@ -17,17 +17,17 @@ */ package org.apache.eagle.topology.storm; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import org.apache.eagle.topology.entity.HealthCheckParseAPIEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import storm.kafka.bolt.mapper.FieldNameBasedTupleToKafkaMapper; +import org.apache.storm.kafka.bolt.mapper.FieldNameBasedTupleToKafkaMapper; import java.util.Arrays; import java.util.Map; diff --git a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/storm/TopologyCheckAppSpout.java b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/storm/TopologyCheckAppSpout.java index 0a9486ffff..d67e81051b 100644 --- a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/storm/TopologyCheckAppSpout.java +++ b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/storm/TopologyCheckAppSpout.java @@ -18,11 +18,11 @@ package org.apache.eagle.topology.storm; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; import org.apache.eagle.common.DateTimeUtil; import org.apache.eagle.topology.TopologyCheckAppConfig; import org.apache.eagle.topology.TopologyConstants; diff --git a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/storm/TopologyDataExtractor.java b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/storm/TopologyDataExtractor.java index 9c58f5f77e..1f477dc0f8 100644 --- a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/storm/TopologyDataExtractor.java +++ b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/storm/TopologyDataExtractor.java @@ -18,7 +18,7 @@ package org.apache.eagle.topology.storm; -import backtype.storm.spout.SpoutOutputCollector; +import org.apache.storm.spout.SpoutOutputCollector; import org.apache.eagle.topology.TopologyCheckAppConfig; import org.apache.eagle.topology.extractor.TopologyCrawler; import org.apache.eagle.topology.extractor.TopologyExtractorFactory; diff --git a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/storm/TopologyDataPersistBolt.java b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/storm/TopologyDataPersistBolt.java index 4a61c8917f..97d1259741 100644 --- a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/storm/TopologyDataPersistBolt.java +++ b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/storm/TopologyDataPersistBolt.java @@ -22,13 +22,13 @@ import static org.apache.eagle.topology.TopologyConstants.ROLE_TAG; import static org.apache.eagle.topology.TopologyConstants.SITE_TAG; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.Values; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.Values; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/pom.xml b/pom.xml index 34f73efa40..228f6b86d0 100755 --- a/pom.xml +++ b/pom.xml @@ -242,8 +242,8 @@ 0.8.2.0 kafka_2.11 0.9.0 - 0.10.0 - 0.9.3 + 1.0.2 + 1.0.3 0.9.0.0-mapr-1607 0.8.3-mapr-1509 From b729e1d62731aa66c7007a8fb7446a95500cdc6f Mon Sep 17 00:00:00 2001 From: Jay Date: Sat, 18 Feb 2017 01:40:47 -0800 Subject: [PATCH 2/5] [EAGLE-906] updating config for tests --- .../org.apache.eagle.gc.GCLogApplicationProvider.xml | 2 +- eagle-gc/src/main/resources/application-gclog.conf | 2 +- ...apache.eagle.security.hbase.HBaseAuditLogAppProvider.xml | 2 +- .../src/main/resources/application.conf | 2 +- ...ache.eagle.security.auditlog.HdfsAuditLogAppProvider.xml | 6 +++--- .../src/main/resources/application.conf | 2 +- .../src/main/resources/application.conf | 2 +- ...he.eagle.security.auditlog.MapRFSAuditLogAppProvider.xml | 2 +- .../src/main/resources/application.conf | 2 +- ....eagle.security.oozie.parse.OozieAuditLogAppProvider.xml | 2 +- .../src/main/resources/oozieAuditlogConf.conf | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eagle-gc/src/main/resources/META-INF/providers/org.apache.eagle.gc.GCLogApplicationProvider.xml b/eagle-gc/src/main/resources/META-INF/providers/org.apache.eagle.gc.GCLogApplicationProvider.xml index 49d54412f4..09f0a90417 100644 --- a/eagle-gc/src/main/resources/META-INF/providers/org.apache.eagle.gc.GCLogApplicationProvider.xml +++ b/eagle-gc/src/main/resources/META-INF/providers/org.apache.eagle.gc.GCLogApplicationProvider.xml @@ -78,7 +78,7 @@ dataSourceConfig.schemeCls dataSourceConfig.schemeCls - storm.kafka.StringScheme + org.apache.storm.kafka.StringScheme scheme class diff --git a/eagle-gc/src/main/resources/application-gclog.conf b/eagle-gc/src/main/resources/application-gclog.conf index 76d31e3609..7bfa079f3e 100644 --- a/eagle-gc/src/main/resources/application-gclog.conf +++ b/eagle-gc/src/main/resources/application-gclog.conf @@ -27,7 +27,7 @@ "topic": "gc_log", "zkConnection": "server.eagle.apache.org:2181", "txZkServers": "server.eagle.apache.org:2181", - "schemeCls": "storm.kafka.StringScheme" + "schemeCls": "org.apache.storm.kafka.StringScheme" }, "eagleService": { "host": "localhost", diff --git a/eagle-security/eagle-security-hbase-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.hbase.HBaseAuditLogAppProvider.xml b/eagle-security/eagle-security-hbase-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.hbase.HBaseAuditLogAppProvider.xml index 18b2ed34e5..e7cdc1b868 100644 --- a/eagle-security/eagle-security-hbase-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.hbase.HBaseAuditLogAppProvider.xml +++ b/eagle-security/eagle-security-hbase-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.hbase.HBaseAuditLogAppProvider.xml @@ -67,7 +67,7 @@ dataSourceConfig.schemeCls dataSourceConfig.schemeCls - storm.kafka.StringScheme + org.apache.storm.kafka.StringScheme scheme class diff --git a/eagle-security/eagle-security-hbase-auditlog/src/main/resources/application.conf b/eagle-security/eagle-security-hbase-auditlog/src/main/resources/application.conf index 784d75d626..a5bffd0898 100644 --- a/eagle-security/eagle-security-hbase-auditlog/src/main/resources/application.conf +++ b/eagle-security/eagle-security-hbase-auditlog/src/main/resources/application.conf @@ -28,7 +28,7 @@ "topic" : "hbase_audit_log", "zkConnection" : "server.eagle.apache.org:2181", "txZkServers" : "server.eagle.apache.org:2181", - "schemeCls" : "storm.kafka.StringScheme" + "schemeCls" : "org.apache.storm.kafka.StringScheme" }, "eagleService": { "host": "localhost", diff --git a/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.HdfsAuditLogAppProvider.xml b/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.HdfsAuditLogAppProvider.xml index d48340c34d..eef91259f9 100644 --- a/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.HdfsAuditLogAppProvider.xml +++ b/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.HdfsAuditLogAppProvider.xml @@ -99,9 +99,9 @@ dataSourceConfig.schemeCls - Kafka Consumer SchemeCls for Auditlog - storm.kafka.StringScheme - Kafka spout scheme class + Kafka Consumer SchemeCls + org.apache.storm.kafka.StringScheme + scheme class true diff --git a/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/application.conf b/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/application.conf index be357ad29f..9d221a6b28 100644 --- a/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/application.conf +++ b/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/application.conf @@ -28,7 +28,7 @@ "topic" : "hdfs_audit_log", "zkConnection" : "server.eagle.apache.org:2181", "txZkServers" : "server.eagle.apache.org:2181", - "schemeCls" : "storm.kafka.StringScheme" + "schemeCls" : "org.apache.storm.kafka.StringScheme" }, "eagleService": { "host": "localhost", diff --git a/eagle-security/eagle-security-hdfs-authlog/src/main/resources/application.conf b/eagle-security/eagle-security-hdfs-authlog/src/main/resources/application.conf index f38de11115..bd6be34e3f 100644 --- a/eagle-security/eagle-security-hdfs-authlog/src/main/resources/application.conf +++ b/eagle-security/eagle-security-hdfs-authlog/src/main/resources/application.conf @@ -25,7 +25,7 @@ "topic" : "hdfs_auth_log", "zkConnection" : "server.eagle.apache.org:2181", "txZkServers" : "server.eagle.apache.org:2181", - "schemeCls" : "storm.kafka.StringScheme" + "schemeCls" : "org.apache.storm.kafka.StringScheme" }, "dataSinkConfig": { "topic" : "hdfs_auth_log_parsed", diff --git a/eagle-security/eagle-security-maprfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.MapRFSAuditLogAppProvider.xml b/eagle-security/eagle-security-maprfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.MapRFSAuditLogAppProvider.xml index 768588eb39..47ad50aea5 100644 --- a/eagle-security/eagle-security-maprfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.MapRFSAuditLogAppProvider.xml +++ b/eagle-security/eagle-security-maprfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.MapRFSAuditLogAppProvider.xml @@ -79,7 +79,7 @@ dataSourceConfig.schemeCls dataSourceConfig.schemeCls - storm.kafka.StringScheme + org.apache.storm.kafka.StringScheme scheme class diff --git a/eagle-security/eagle-security-maprfs-auditlog/src/main/resources/application.conf b/eagle-security/eagle-security-maprfs-auditlog/src/main/resources/application.conf index 5327c74c90..3eaf18f62a 100644 --- a/eagle-security/eagle-security-maprfs-auditlog/src/main/resources/application.conf +++ b/eagle-security/eagle-security-maprfs-auditlog/src/main/resources/application.conf @@ -29,7 +29,7 @@ "topic" : "maprtest", "zkConnection" : "server.eagle.apache.org:5181", "txZkServers" : "server.eagle.apache.org:5181", - "schemeCls" : "storm.kafka.StringScheme" + "schemeCls" : "org.apache.storm.kafka.StringScheme" }, "eagleService": { "host": "localhost", diff --git a/eagle-security/eagle-security-oozie-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.oozie.parse.OozieAuditLogAppProvider.xml b/eagle-security/eagle-security-oozie-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.oozie.parse.OozieAuditLogAppProvider.xml index ee1715c003..b39d8da7fa 100644 --- a/eagle-security/eagle-security-oozie-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.oozie.parse.OozieAuditLogAppProvider.xml +++ b/eagle-security/eagle-security-oozie-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.oozie.parse.OozieAuditLogAppProvider.xml @@ -88,7 +88,7 @@ dataSourceConfig.schemeCls Kafka Consumer SchemeCls - storm.kafka.StringScheme + org.apache.storm.kafka.StringScheme scheme class diff --git a/eagle-security/eagle-security-oozie-auditlog/src/main/resources/oozieAuditlogConf.conf b/eagle-security/eagle-security-oozie-auditlog/src/main/resources/oozieAuditlogConf.conf index be5dd51f91..4b3261f6ce 100755 --- a/eagle-security/eagle-security-oozie-auditlog/src/main/resources/oozieAuditlogConf.conf +++ b/eagle-security/eagle-security-oozie-auditlog/src/main/resources/oozieAuditlogConf.conf @@ -38,7 +38,7 @@ "transactionZKRoot" : "/consumers", "consumerGroupId" : "eagle.ooziesecurity.consumer2", "transactionStateUpdateMS" : 2000, - "schemeCls" : "storm.kafka.StringScheme" , + "schemeCls" : "org.apache.storm.kafka.StringScheme" , "txZkServers" : "server.eagle.apache.org:2181" }, "eagleService": { From c4811d043ee598f91684dc274a4f5820c3fc198a Mon Sep 17 00:00:00 2001 From: Jay Date: Mon, 20 Feb 2017 17:29:28 -0800 Subject: [PATCH 3/5] [EAGLE-906] updating MR running test cases --- .../apache/eagle/jpm/mr/history/storm/JobHistorySpoutTest.java | 2 +- .../eagle/jpm/mr/running/MRRunningJobApplicationTest.java | 2 +- .../apache/eagle/jpm/mr/running/MRRunningJobManagerTest.java | 2 +- .../jpm/mr/running/parser/MRJobEntityCreationHandlerTest.java | 2 ++ .../org/apache/eagle/jpm/mr/running/parser/MRJobParserTest.java | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/eagle-jpm/eagle-jpm-mr-history/src/test/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpoutTest.java b/eagle-jpm/eagle-jpm-mr-history/src/test/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpoutTest.java index ffa3803aa1..4369d558c1 100644 --- a/eagle-jpm/eagle-jpm-mr-history/src/test/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpoutTest.java +++ b/eagle-jpm/eagle-jpm-mr-history/src/test/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpoutTest.java @@ -70,7 +70,7 @@ */ @RunWith(PowerMockRunner.class) @PrepareForTest( {CuratorFrameworkFactory.class, HDFSUtil.class, JobCountMetricsGenerator.class, JobHistorySpout.class}) -@PowerMockIgnore( {"javax.*", "com.sun.org.*", "org.apache.hadoop.conf.*"}) +@PowerMockIgnore( {"javax.*", "com.sun.org.*", "org.apache.hadoop.conf.*", "org.xml.sax.*", "org.w3c.dom.*"}) public class JobHistorySpoutTest { private static final Logger LOG = LoggerFactory.getLogger(JobHistorySpoutTest.class); diff --git a/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/MRRunningJobApplicationTest.java b/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/MRRunningJobApplicationTest.java index eac0c1ba65..689c74726e 100644 --- a/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/MRRunningJobApplicationTest.java +++ b/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/MRRunningJobApplicationTest.java @@ -56,7 +56,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest({InputStreamUtils.class, MRRunningJobFetchSpout.class, Executors.class, MRRunningJobParseBolt.class}) -@PowerMockIgnore({"javax.*"}) +@PowerMockIgnore({"javax.*", "com.sun.org.apache.xerces.*", "org.xml.sax.*", "org.w3c.dom.*"}) public class MRRunningJobApplicationTest { private static final String RM_URL = "http://sandbox.hortonworks.com:50030/ws/v1/cluster/apps?applicationTypes=MAPREDUCE&state=RUNNING&anonymous=true"; diff --git a/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/MRRunningJobManagerTest.java b/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/MRRunningJobManagerTest.java index 4c52e10cd3..16bc66a024 100644 --- a/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/MRRunningJobManagerTest.java +++ b/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/MRRunningJobManagerTest.java @@ -52,7 +52,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest({MRRunningJobManager.class, RunningJobManager.class, LoggerFactory.class}) -@PowerMockIgnore({"javax.*"}) +@PowerMockIgnore({"javax.*", "com.sun.org.apache.xerces.*", "org.xml.sax.*", "org.w3c.dom.*"}) public class MRRunningJobManagerTest { private static TestingServer zk; private static com.typesafe.config.Config config = ConfigFactory.load(); diff --git a/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/parser/MRJobEntityCreationHandlerTest.java b/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/parser/MRJobEntityCreationHandlerTest.java index 0ec1b8e4f4..3f46a2519f 100644 --- a/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/parser/MRJobEntityCreationHandlerTest.java +++ b/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/parser/MRJobEntityCreationHandlerTest.java @@ -31,6 +31,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -47,6 +48,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest({System.class, JobExecutionMetricsCreationListener.class, MRJobEntityCreationHandler.class}) +@PowerMockIgnore({"javax.*", "com.sun.org.apache.xerces.*", "org.xml.sax.*", "org.w3c.dom.*"}) public class MRJobEntityCreationHandlerTest { private static final ObjectMapper OBJ_MAPPER = new ObjectMapper(); diff --git a/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/parser/MRJobParserTest.java b/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/parser/MRJobParserTest.java index 227eecb949..62be114617 100644 --- a/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/parser/MRJobParserTest.java +++ b/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/parser/MRJobParserTest.java @@ -62,7 +62,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest({InputStreamUtils.class, MRJobParser.class, URLConnectionUtils.class, Math.class, MRJobEntityCreationHandler.class}) -@PowerMockIgnore({"javax.*", "org.w3c.*", "com.sun.org.apache.xerces.*","org.apache.xerces.*"}) +@PowerMockIgnore({"javax.*", "org.w3c.*", "com.sun.org.apache.xerces.*","org.apache.xerces.*", "org.xml.sax.*"}) public class MRJobParserTest { private static final String ZK_JOB_PATH = "/apps/mr/running/sandbox/jobs/application_1479206441898_30784/job_1479206441898_30784"; private static final String ZK_APP_PATH = "/apps/mr/running/sandbox/jobs/application_1479206441898_30784"; From 479142c41480403dd2f1556adb19085985a02662 Mon Sep 17 00:00:00 2001 From: Jay Date: Tue, 21 Feb 2017 22:55:00 -0800 Subject: [PATCH 4/5] [EAGLE-906] phase-2 nimbus.host to nimbus.seeds --- .../engine/coordinator/StreamingCluster.java | 8 +++---- .../coordinator/TopologyMgmtService.java | 4 ++-- .../mock/TestTopologyMgmtService.java | 3 ++- .../eagle/alert/engine/scheme/JsonScheme.java | 15 ++++++++++-- .../engine/scheme/PlainStringScheme.java | 12 +++++++--- .../impl/TopologyMgmtResourceImpl.java | 15 ++++-------- .../impl/StormExecutionRuntime.java | 24 ++++++++++--------- .../eagle/app/messaging/JsonSchema.java | 13 +++++++++- .../src/test/resources/application.conf | 2 +- .../src/main/resources/application.conf | 2 +- .../src/test/resources/application.conf | 2 +- .../src/main/resources/application.conf | 2 +- .../src/main/resources/application.conf | 2 +- .../src/test/resources/application-test.conf | 2 +- .../src/main/resources/application.conf | 2 +- .../metric/kafka/KafkaSourcedSpoutScheme.java | 3 ++- .../auditlog/kafka/MessageJsonScheme.java | 13 +++++++++- .../src/main/conf/eagle.conf | 2 +- .../src/main/resources/application.conf | 2 +- 19 files changed, 83 insertions(+), 45 deletions(-) diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-common/src/main/java/org/apache/eagle/alert/engine/coordinator/StreamingCluster.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-common/src/main/java/org/apache/eagle/alert/engine/coordinator/StreamingCluster.java index 1e40309215..62eafc048c 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-common/src/main/java/org/apache/eagle/alert/engine/coordinator/StreamingCluster.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-common/src/main/java/org/apache/eagle/alert/engine/coordinator/StreamingCluster.java @@ -39,7 +39,7 @@ public static enum StreamingType { * key - nimbus for storm. */ @JsonProperty - private Map deployments; + private Map deployments; public String getName() { return name; @@ -73,15 +73,15 @@ public void setDescription(String description) { this.description = description; } - public Map getDeployments() { + public Map getDeployments() { return deployments; } - public void setDeployments(Map deployments) { + public void setDeployments(Map deployments) { this.deployments = deployments; } - public static final String NIMBUS_HOST = "nimbusHost"; + public static final String NIMBUS_SEEDS = "nimbusSeeds"; public static final String NIMBUS_THRIFT_PORT = "nimbusThriftPort"; } diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/main/java/org/apache/eagle/alert/coordinator/TopologyMgmtService.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/main/java/org/apache/eagle/alert/coordinator/TopologyMgmtService.java index 4ca9d5ecd4..c54c55b7af 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/main/java/org/apache/eagle/alert/coordinator/TopologyMgmtService.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/main/java/org/apache/eagle/alert/coordinator/TopologyMgmtService.java @@ -38,14 +38,14 @@ public static class TopologyMeta { public TopologyUsage usage; public String clusterId; - public String nimbusHost; + public List nimbusSeeds; public String nimbusPort; } public static class StormClusterMeta { public String clusterId; - public String nimbusHost; + public List nimbusSeeds; public String nimbusPort; public String stormVersion; } diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/test/java/org/apache/alert/coordinator/mock/TestTopologyMgmtService.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/test/java/org/apache/alert/coordinator/mock/TestTopologyMgmtService.java index 80990a56a3..e32a7b81c5 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/test/java/org/apache/alert/coordinator/mock/TestTopologyMgmtService.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/test/java/org/apache/alert/coordinator/mock/TestTopologyMgmtService.java @@ -16,6 +16,7 @@ */ package org.apache.alert.coordinator.mock; +import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.tuple.Pair; @@ -62,7 +63,7 @@ public TopologyMeta creatTopology() { TopologyMeta tm = new TopologyMeta(); tm.topologyId = namePrefix + (i++); tm.clusterId = "default-cluster"; - tm.nimbusHost = "localhost"; + tm.nimbusSeeds = Arrays.asList("localhost"); tm.nimbusPort = "3000"; Pair pair = createEmptyTopology(tm.topologyId); tm.topology = pair.getLeft(); diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/scheme/JsonScheme.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/scheme/JsonScheme.java index 4e2ad59bf3..98c56bb79e 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/scheme/JsonScheme.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/scheme/JsonScheme.java @@ -19,13 +19,15 @@ package org.apache.eagle.alert.engine.scheme; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.storm.spout.Scheme; import org.apache.storm.tuple.Fields; -import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.storm.utils.Utils; import org.slf4j.Logger; import java.io.IOException; import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -50,12 +52,21 @@ public Fields getOutputFields() { return new Fields("f1"); } + public static String deserializeString(ByteBuffer buffer) { + if (buffer.hasArray()) { + int base = buffer.arrayOffset(); + return new String(buffer.array(), base + buffer.position(), buffer.remaining()); + } else { + return new String(Utils.toByteArray(buffer), StandardCharsets.UTF_8); + } + } + @Override @SuppressWarnings("rawtypes") public List deserialize(ByteBuffer ser) { try { if (ser != null) { - Map map = mapper.readValue(ser.array(), Map.class); + Map map = mapper.readValue(deserializeString(ser), Map.class); return Arrays.asList(topic, map); } else { if (LOG.isDebugEnabled()) { diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/scheme/PlainStringScheme.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/scheme/PlainStringScheme.java index 767379e61c..c36f60fd63 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/scheme/PlainStringScheme.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/scheme/PlainStringScheme.java @@ -22,6 +22,7 @@ import org.apache.storm.spout.Scheme; import org.apache.storm.tuple.Fields; import org.apache.storm.tuple.Values; +import org.apache.storm.utils.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,8 +50,13 @@ public PlainStringScheme(String topic, Map conf) { private static final Charset UTF8_CHARSET = StandardCharsets.UTF_8; public static final String STRING_SCHEME_KEY = "str"; - public static String deserializeString(byte[] buff) { - return new String(buff, UTF8_CHARSET); + public static String deserializeString(ByteBuffer buffer) { + if (buffer.hasArray()) { + int base = buffer.arrayOffset(); + return new String(buffer.array(), base + buffer.position(), buffer.remaining()); + } else { + return new String(Utils.toByteArray(buffer), StandardCharsets.UTF_8); + } } public Fields getOutputFields() { @@ -61,7 +67,7 @@ public Fields getOutputFields() { @Override public List deserialize(ByteBuffer ser) { Map m = new HashMap<>(); - m.put("value", deserializeString(ser.array())); + m.put("value", deserializeString(ser)); m.put("timestamp", System.currentTimeMillis()); return new Values(topic, m); } diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/service/topology/resource/impl/TopologyMgmtResourceImpl.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/service/topology/resource/impl/TopologyMgmtResourceImpl.java index 6eaae7b800..c68edef69a 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/service/topology/resource/impl/TopologyMgmtResourceImpl.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/service/topology/resource/impl/TopologyMgmtResourceImpl.java @@ -35,10 +35,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; public class TopologyMgmtResourceImpl { @@ -46,7 +43,7 @@ public class TopologyMgmtResourceImpl { @SuppressWarnings("unused") private static final Logger LOG = LoggerFactory.getLogger(TopologyMgmtResourceImpl.class); - private static final String DEFAULT_NIMBUS_HOST = "sandbox.hortonworks.com"; + private static final List DEFAULT_NIMBUS_SEEDS = Arrays.asList("sandbox.hortonworks.com"); private static final Integer DEFAULT_NIMBUS_THRIFT_PORT = 6627; private static final String STORM_JAR_PATH = "topology.stormJarPath"; @@ -55,8 +52,7 @@ public class TopologyMgmtResourceImpl { private Map getStormConf(List clusters, String clusterId) throws Exception { Map stormConf = Utils.readStormConfig(); if (clusterId == null) { - // TODO: change to NIMBUS_SEEDS list in EAGLE-907 - stormConf.put(Config.NIMBUS_HOST, DEFAULT_NIMBUS_HOST); + stormConf.put(Config.NIMBUS_SEEDS, DEFAULT_NIMBUS_SEEDS); stormConf.put(Config.NIMBUS_THRIFT_PORT, DEFAULT_NIMBUS_THRIFT_PORT); } else { if (clusters == null) { @@ -69,9 +65,8 @@ private Map getStormConf(List clusters, String clusterId) thro } else { throw new Exception("Fail to find cluster: " + clusterId); } - // TODO: change to NIMBUS_SEEDS list in EAGLE-907 - stormConf.put(Config.NIMBUS_HOST, cluster.getDeployments().getOrDefault(StreamingCluster.NIMBUS_HOST, DEFAULT_NIMBUS_HOST)); - stormConf.put(Config.NIMBUS_THRIFT_PORT, Integer.valueOf(cluster.getDeployments().get(StreamingCluster.NIMBUS_THRIFT_PORT))); + stormConf.put(Config.NIMBUS_SEEDS, cluster.getDeployments().getOrDefault(StreamingCluster.NIMBUS_SEEDS, DEFAULT_NIMBUS_SEEDS)); + stormConf.put(Config.NIMBUS_THRIFT_PORT, Integer.valueOf(String.valueOf(cluster.getDeployments().get(StreamingCluster.NIMBUS_THRIFT_PORT)))); } return stormConf; } diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/impl/StormExecutionRuntime.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/impl/StormExecutionRuntime.java index 7288700383..e92b044cc6 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/impl/StormExecutionRuntime.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/impl/StormExecutionRuntime.java @@ -30,12 +30,12 @@ import org.apache.eagle.app.utils.DynamicJarPathFinder; import org.apache.eagle.metadata.model.ApplicationEntity; import org.apache.storm.thrift.TException; -import org.apache.storm.utils.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import scala.Int; import org.apache.storm.trident.spout.RichSpoutBatchExecutor; +import java.util.Arrays; import java.util.List; import java.util.Objects; @@ -70,8 +70,8 @@ public StormEnvironment environment() { public static final String TOPOLOGY_MESSAGE_TIMEOUT_SECS = "topology.message.timeout.secs"; - private static final String STORM_NIMBUS_HOST_CONF_PATH = "application.storm.nimbusHost"; - private static final String STORM_NIMBUS_HOST_DEFAULT = "localhost"; + private static final String STORM_NIMBUS_SEEDS_CONF_PATH = "application.storm.nimbusSeeds"; + private static final List STORM_NIMBUS_HOST_DEFAULT = Arrays.asList("localhost"); private static final Integer STORM_NIMBUS_THRIFT_DEFAULT = 6627; private static final String STORM_NIMBUS_THRIFT_CONF_PATH = "application.storm.nimbusThriftPort"; @@ -80,17 +80,20 @@ public StormEnvironment environment() { private org.apache.storm.Config getStormConfig(com.typesafe.config.Config config) { org.apache.storm.Config conf = new org.apache.storm.Config(); conf.put(RichSpoutBatchExecutor.MAX_BATCH_SIZE_CONF, Int.box(64 * 1024)); - // TOPOLOGY_RECEIVER_BUFFER_SIZE has no effect, so no need to set. ref: STORM-596 + // TOPOLOGY_RECEIVER_BUFFER_SIZE has no effect, and it is removed. ref: STORM-596 conf.put(org.apache.storm.Config.TOPOLOGY_TRANSFER_BUFFER_SIZE, Int.box(32)); conf.put(org.apache.storm.Config.TOPOLOGY_EXECUTOR_RECEIVE_BUFFER_SIZE, Int.box(16384)); conf.put(org.apache.storm.Config.TOPOLOGY_EXECUTOR_SEND_BUFFER_SIZE, Int.box(16384)); conf.put(org.apache.storm.Config.NIMBUS_THRIFT_MAX_BUFFER_SIZE, Int.box(20480000)); - String nimbusHost = STORM_NIMBUS_HOST_DEFAULT; - if (environment.config().hasPath(STORM_NIMBUS_HOST_CONF_PATH)) { - nimbusHost = environment.config().getString(STORM_NIMBUS_HOST_CONF_PATH); - LOG.info("Overriding {} = {}",STORM_NIMBUS_HOST_CONF_PATH,nimbusHost); + conf.put(org.apache.storm.Config.STORM_NIMBUS_RETRY_TIMES, 5); + conf.put(org.apache.storm.Config.STORM_NIMBUS_RETRY_INTERVAL, 4000); + conf.put(org.apache.storm.Config.STORM_NIMBUS_RETRY_INTERVAL_CEILING, 60000); + List nimbusSeeds = STORM_NIMBUS_HOST_DEFAULT; + if (environment.config().hasPath(STORM_NIMBUS_SEEDS_CONF_PATH)) { + nimbusSeeds = environment.config().getStringList(STORM_NIMBUS_SEEDS_CONF_PATH); + LOG.info("Overriding {} = {}", STORM_NIMBUS_SEEDS_CONF_PATH,nimbusSeeds); } else { - LOG.info("Using default {} = {}",STORM_NIMBUS_HOST_CONF_PATH,STORM_NIMBUS_HOST_DEFAULT); + LOG.info("Using default {} = {}", STORM_NIMBUS_SEEDS_CONF_PATH,STORM_NIMBUS_HOST_DEFAULT); } Integer nimbusThriftPort = STORM_NIMBUS_THRIFT_DEFAULT; if (environment.config().hasPath(STORM_NIMBUS_THRIFT_CONF_PATH)) { @@ -99,8 +102,7 @@ private org.apache.storm.Config getStormConfig(com.typesafe.config.Config config } else { LOG.info("Using default {} = {}",STORM_NIMBUS_THRIFT_CONF_PATH,STORM_NIMBUS_THRIFT_DEFAULT); } - // TODO: change to NIMBUS_SEEDS list in EAGLE-907 - conf.put(Config.NIMBUS_HOST, nimbusHost); + conf.put(Config.NIMBUS_SEEDS, nimbusSeeds); conf.put(org.apache.storm.Config.NIMBUS_THRIFT_PORT, nimbusThriftPort); conf.put(Config.STORM_THRIFT_TRANSPORT_PLUGIN, "org.apache.storm.security.auth.SimpleTransportPlugin"); if (config.hasPath(WORKERS)) { diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/JsonSchema.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/JsonSchema.java index a4ade3cf2d..b6a14edc89 100644 --- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/JsonSchema.java +++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/messaging/JsonSchema.java @@ -19,10 +19,12 @@ import org.apache.storm.spout.Scheme; import org.apache.storm.tuple.Fields; import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.storm.utils.Utils; import org.slf4j.Logger; import java.io.IOException; import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -43,12 +45,21 @@ public Fields getOutputFields() { return new Fields("f1","f2"); } + public static String deserializeString(ByteBuffer buffer) { + if (buffer.hasArray()) { + int base = buffer.arrayOffset(); + return new String(buffer.array(), base + buffer.position(), buffer.remaining()); + } else { + return new String(Utils.toByteArray(buffer), StandardCharsets.UTF_8); + } + } + @Override @SuppressWarnings("rawtypes") public List deserialize(ByteBuffer ser) { try { if (ser != null) { - Map map = mapper.readValue(ser.array(), Map.class); + Map map = mapper.readValue(deserializeString(ser), Map.class); return Arrays.asList(map.hashCode(), map); } else { if (LOG.isDebugEnabled()) { diff --git a/eagle-examples/eagle-app-example/src/test/resources/application.conf b/eagle-examples/eagle-app-example/src/test/resources/application.conf index 0c9ba513fa..6a4c6fd225 100644 --- a/eagle-examples/eagle-app-example/src/test/resources/application.conf +++ b/eagle-examples/eagle-app-example/src/test/resources/application.conf @@ -51,7 +51,7 @@ } }, "storm": { - "nimbusHost": "localhost" + "nimbusSeeds": ["localhost"] "nimbusThriftPort": 6627 } }, diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/resources/application.conf b/eagle-jpm/eagle-hadoop-queue/src/main/resources/application.conf index 9d690846b2..9db6edf3b9 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/resources/application.conf +++ b/eagle-jpm/eagle-hadoop-queue/src/main/resources/application.conf @@ -31,7 +31,7 @@ } "appId":"hadoopQueueMonitorJob", "mode":"LOCAL", - application.storm.nimbusHost=localhost, + application.storm.nimbusSeeds=["localhost"], "workers":1, "dataSinkConfig": { diff --git a/eagle-jpm/eagle-hadoop-queue/src/test/resources/application.conf b/eagle-jpm/eagle-hadoop-queue/src/test/resources/application.conf index 9d690846b2..9db6edf3b9 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/test/resources/application.conf +++ b/eagle-jpm/eagle-hadoop-queue/src/test/resources/application.conf @@ -31,7 +31,7 @@ } "appId":"hadoopQueueMonitorJob", "mode":"LOCAL", - application.storm.nimbusHost=localhost, + application.storm.nimbusSeeds=["localhost"], "workers":1, "dataSinkConfig": { diff --git a/eagle-jpm/eagle-jpm-aggregation/src/main/resources/application.conf b/eagle-jpm/eagle-jpm-aggregation/src/main/resources/application.conf index 0421f0960b..9d5acc17da 100644 --- a/eagle-jpm/eagle-jpm-aggregation/src/main/resources/application.conf +++ b/eagle-jpm/eagle-jpm-aggregation/src/main/resources/application.conf @@ -48,6 +48,6 @@ "mode":"LOCAL", "workers" : 3, "siteId" : "sandbox", - application.storm.nimbusHost=localhost + application.storm.nimbusSeeds=["localhost"], topology.message.timeout.secs=1800 } \ No newline at end of file diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/resources/application.conf b/eagle-jpm/eagle-jpm-mr-history/src/main/resources/application.conf index 3836e3acd8..c2e6ef6210 100644 --- a/eagle-jpm/eagle-jpm-mr-history/src/main/resources/application.conf +++ b/eagle-jpm/eagle-jpm-mr-history/src/main/resources/application.conf @@ -18,7 +18,7 @@ "mode":"LOCAL", "workers" : 3, "siteId" : "sandbox", - application.storm.nimbusHost=localhost + application.storm.nimbusSeeds=["localhost"], "stormConfig" : { "mrHistoryJobSpoutTasks" : 6, diff --git a/eagle-jpm/eagle-jpm-mr-history/src/test/resources/application-test.conf b/eagle-jpm/eagle-jpm-mr-history/src/test/resources/application-test.conf index 057e189bd0..13f6d6c97a 100644 --- a/eagle-jpm/eagle-jpm-mr-history/src/test/resources/application-test.conf +++ b/eagle-jpm/eagle-jpm-mr-history/src/test/resources/application-test.conf @@ -34,7 +34,7 @@ application { type = org.apache.eagle.app.sink.KafkaStreamSink } storm { - nimbusHost = "server.eagle.apache.org" + nimbusSeeds = ["server.eagle.apache.org"] nimbusThriftPort = 6627 } mailService { diff --git a/eagle-jpm/eagle-jpm-mr-running/src/main/resources/application.conf b/eagle-jpm/eagle-jpm-mr-running/src/main/resources/application.conf index 6d1be06667..03f3b4ff49 100644 --- a/eagle-jpm/eagle-jpm-mr-running/src/main/resources/application.conf +++ b/eagle-jpm/eagle-jpm-mr-running/src/main/resources/application.conf @@ -16,7 +16,7 @@ { "appId":"mrRunningJob", "mode":"LOCAL", - application.storm.nimbusHost=localhost, + application.storm.nimbusSeeds=["localhost"], "workers" : 8, "siteId" : "sandbox", diff --git a/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaSourcedSpoutScheme.java b/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaSourcedSpoutScheme.java index e8c2451222..b829d4bea5 100644 --- a/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaSourcedSpoutScheme.java +++ b/eagle-security/eagle-metric-collection/src/main/java/org/apache/eagle/metric/kafka/KafkaSourcedSpoutScheme.java @@ -20,6 +20,7 @@ import org.apache.storm.tuple.Fields; import com.typesafe.config.Config; import org.apache.eagle.dataproc.impl.storm.kafka.SpoutKafkaMessageDeserializer; +import org.apache.storm.utils.Utils; import java.lang.reflect.Constructor; import java.nio.ByteBuffer; @@ -52,7 +53,7 @@ public KafkaSourcedSpoutScheme(String deserClsName, Config context){ @Override public List deserialize(ByteBuffer ser) { - Object tmp = deserializer.deserialize(ser.array()); + Object tmp = deserializer.deserialize(Utils.toByteArray(ser)); Map map = (Map)tmp; if(tmp == null) return null; return Arrays.asList(map.get("user"), map.get("timestamp")); diff --git a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/kafka/MessageJsonScheme.java b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/kafka/MessageJsonScheme.java index 5e30384548..2610febd25 100644 --- a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/kafka/MessageJsonScheme.java +++ b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/kafka/MessageJsonScheme.java @@ -22,11 +22,13 @@ import org.apache.storm.tuple.Fields; import org.apache.storm.tuple.Values; import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.storm.utils.Utils; import org.slf4j.Logger; import org.apache.storm.kafka.StringScheme; import java.io.IOException; import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; @@ -42,12 +44,21 @@ public Fields getOutputFields() { return new Fields(StringScheme.STRING_SCHEME_KEY); } + public static String deserializeString(ByteBuffer buffer) { + if (buffer.hasArray()) { + int base = buffer.arrayOffset(); + return new String(buffer.array(), base + buffer.position(), buffer.remaining()); + } else { + return new String(Utils.toByteArray(buffer), StandardCharsets.UTF_8); + } + } + @Override @SuppressWarnings("rawtypes") public List deserialize(ByteBuffer ser) { try { if (ser != null) { - Map map = mapper.readValue(ser.array(), Map.class); + Map map = mapper.readValue(deserializeString(ser), Map.class); Object message = map.get(MESSAGE_SCHEME_KEY); if (message != null) { return new Values(map.get(MESSAGE_SCHEME_KEY)); diff --git a/eagle-server-assembly/src/main/conf/eagle.conf b/eagle-server-assembly/src/main/conf/eagle.conf index a889914f29..a3cd623182 100644 --- a/eagle-server-assembly/src/main/conf/eagle.conf +++ b/eagle-server-assembly/src/main/conf/eagle.conf @@ -87,7 +87,7 @@ application { provider = org.apache.eagle.app.messaging.KafkaStreamProvider } storm { - nimbusHost = "server.eagle.apache.org" + nimbusSeeds = ["server.eagle.apache.org"] nimbusThriftPort = 6627 } mailService { diff --git a/eagle-server/src/main/resources/application.conf b/eagle-server/src/main/resources/application.conf index d657f54cc3..96370f743b 100644 --- a/eagle-server/src/main/resources/application.conf +++ b/eagle-server/src/main/resources/application.conf @@ -90,7 +90,7 @@ application { provider = org.apache.eagle.app.messaging.KafkaStreamProvider } storm { - nimbusHost = "server.eagle.apache.org" + nimbusSeeds = ["server.eagle.apache.org"] nimbusThriftPort = 6627 } updateStatus: { From 6dea5c3b7b9fef890d805d64afc0912657810e78 Mon Sep 17 00:00:00 2001 From: Jay Date: Sat, 18 Mar 2017 01:43:37 -0700 Subject: [PATCH 5/5] [EAGLE-906] rebased with new code --- .../queue/storm/HadoopQueueRunningSpout.java | 8 -------- .../jpm/mr/running/MRRunningJobApplication.java | 2 +- .../mr/running/storm/MRRunningAppMetricBolt.java | 14 +++++++------- .../eagle/security/auditlog/TrafficParserBolt.java | 14 +++++++------- .../extractor/system/SystemCheckPersistBolt.java | 12 ++++++------ 5 files changed, 21 insertions(+), 29 deletions(-) diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/storm/HadoopQueueRunningSpout.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/storm/HadoopQueueRunningSpout.java index 5c9d2c4a75..6a2b6d9bac 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/storm/HadoopQueueRunningSpout.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/storm/HadoopQueueRunningSpout.java @@ -21,20 +21,12 @@ import org.apache.eagle.hadoop.queue.HadoopQueueRunningAppConfig; import org.apache.eagle.hadoop.queue.common.HadoopClusterConstants; -<<<<<<< HEAD -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; -======= import org.apache.storm.spout.SpoutOutputCollector; import org.apache.storm.task.TopologyContext; import org.apache.storm.topology.OutputFieldsDeclarer; import org.apache.storm.topology.base.BaseRichSpout; import org.apache.storm.tuple.Fields; import com.typesafe.config.Config; ->>>>>>> [EAGLE-906] updating to use org.apache.storm==1.0.3 with compatibility changes import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/MRRunningJobApplication.java b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/MRRunningJobApplication.java index f2db715eb7..7267774f0e 100644 --- a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/MRRunningJobApplication.java +++ b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/MRRunningJobApplication.java @@ -27,7 +27,7 @@ import org.apache.storm.topology.TopologyBuilder; import org.apache.storm.tuple.Fields; import com.typesafe.config.Config; -import storm.trident.planner.SpoutNode; +import org.apache.storm.trident.planner.SpoutNode; import java.util.ArrayList; import java.util.List; diff --git a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/storm/MRRunningAppMetricBolt.java b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/storm/MRRunningAppMetricBolt.java index aa62d304fd..ee3112fd21 100644 --- a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/storm/MRRunningAppMetricBolt.java +++ b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/storm/MRRunningAppMetricBolt.java @@ -17,13 +17,13 @@ package org.apache.eagle.jpm.mr.running.storm; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.Values; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.Values; import org.apache.eagle.common.DateTimeUtil; import org.apache.eagle.jpm.mr.running.MRRunningJobConfig; import org.apache.eagle.jpm.mr.runningentity.AppStreamInfo; diff --git a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/TrafficParserBolt.java b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/TrafficParserBolt.java index 6388a8f493..f7b57b36dc 100644 --- a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/TrafficParserBolt.java +++ b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/TrafficParserBolt.java @@ -17,13 +17,13 @@ package org.apache.eagle.security.auditlog; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.Values; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.Values; import com.fasterxml.jackson.databind.ObjectMapper; import com.typesafe.config.Config; import org.apache.eagle.app.environment.builder.MetricDescriptor; diff --git a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/extractor/system/SystemCheckPersistBolt.java b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/extractor/system/SystemCheckPersistBolt.java index 255f7cab4c..56a62c009a 100644 --- a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/extractor/system/SystemCheckPersistBolt.java +++ b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/extractor/system/SystemCheckPersistBolt.java @@ -18,12 +18,12 @@ package org.apache.eagle.topology.extractor.system; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.eagle.log.entity.GenericServiceAPIResponseEntity;