| commit | caa6a0de5a9e3ad3a7fb0f66a2e0849889bd1906 | [log] [tgz] |
|---|---|---|
| author | Brandon Fergerson <bfergerson@apache.org> | Tue Aug 09 06:27:20 2022 +0400 |
| committer | GitHub <noreply@github.com> | Tue Aug 09 10:27:20 2022 +0800 |
| tree | dc44af7c352949871f9d591cde975a2d6a807fa7 | |
| parent | 9e15a170e8ec0f6dc1282d221ac39f233c028e17 [diff] |
refactor: make more consistent (#9439)
diff --git a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/ISegmentParserListenerManager.java b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/ISegmentParserListenerManager.java index e6aaed4..8d3f41b 100644 --- a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/ISegmentParserListenerManager.java +++ b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/ISegmentParserListenerManager.java
@@ -20,6 +20,10 @@ import org.apache.skywalking.oap.server.analyzer.provider.trace.parser.listener.AnalysisListenerFactory; +import java.util.List; + public interface ISegmentParserListenerManager { void add(AnalysisListenerFactory analysisListenerFactory); + + List<AnalysisListenerFactory> getSpanListenerFactories(); }
diff --git a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/SegmentParserListenerManager.java b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/SegmentParserListenerManager.java index ef1f07a..6663e70 100644 --- a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/SegmentParserListenerManager.java +++ b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/SegmentParserListenerManager.java
@@ -36,7 +36,8 @@ spanListenerFactories.add(analysisListenerFactory); } - List<AnalysisListenerFactory> getSpanListenerFactories() { + @Override + public List<AnalysisListenerFactory> getSpanListenerFactories() { return spanListenerFactories; } }
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MetricsEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MetricsEsDAO.java index 7ff7960..5d1290f 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MetricsEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MetricsEsDAO.java
@@ -44,7 +44,7 @@ public class MetricsEsDAO extends EsDAO implements IMetricsDAO { protected final StorageBuilder<Metrics> storageBuilder; - protected MetricsEsDAO(ElasticSearchClient client, + public MetricsEsDAO(ElasticSearchClient client, StorageBuilder<Metrics> storageBuilder) { super(client); this.storageBuilder = storageBuilder;