You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2021/09/06 07:32:34 UTC
[skywalking] branch chore/checkstyle-cleanup updated (5272c23 ->
b9ba9d4)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch chore/checkstyle-cleanup
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 5272c23 Clean up checkstyle import control and unused licenses
add 26b81a2 Rebuilt ElasticSearch client on top of their REST API (#7634)
add b9ba9d4 Merge branch 'master' into chore/checkstyle-cleanup
No new revisions were added by this update.
Summary of changes:
.github/actions/e2e-test/action.yml | 2 +-
.github/workflows/ci-it.yaml | 3 +
.github/workflows/docker-ci.yaml | 4 +-
.github/workflows/e2e.istio.yaml | 5 +-
.github/workflows/e2e.jdk-versions.yaml | 1 -
.github/workflows/publish-docker.yaml | 5 -
CHANGES.md | 2 +
Makefile | 9 +-
apm-dist-es7/pom.xml | 105 ----
apm-dist-es7/src/main/assembly/binary-es7.xml | 103 ----
apm-dist/src/main/assembly/binary.xml | 2 +-
dist-material/release-docs/LICENSE | 27 +-
docker/.env | 3 +-
docker/README.md | 24 +-
docker/docker-compose.yml | 4 +-
docker/oap/log4j2.xml | 6 +-
docs/en/concepts-and-designs/event.md | 2 +-
docs/en/concepts-and-designs/mal.md | 2 +-
docs/en/guides/backend-profile.md | 4 +-
docs/en/setup/backend/backend-fetcher.md | 2 +-
docs/en/setup/backend/backend-meter.md | 2 +-
docs/en/setup/backend/backend-receivers.md | 5 +-
docs/en/setup/backend/backend-storage.md | 30 +-
docs/en/setup/backend/backend-telemetry.md | 2 +-
docs/en/setup/backend/configuration-vocabulary.md | 29 +-
docs/en/setup/backend/spring-sleuth-setup.md | 2 +-
docs/en/setup/envoy/als_setting.md | 2 +-
docs/en/setup/envoy/examples/metrics/log4j2.xml | 1 -
oap-server-bom-es7/pom.xml | 56 --
oap-server-bom/pom.xml | 60 +-
.../skywalking/oap/meter/analyzer/Analyzer.java | 13 +-
.../oap/meter/analyzer/MetricConvert.java | 4 +-
.../exporter/provider/grpc/GRPCExporterTest.java | 4 +-
oap-server/pom.xml | 2 -
oap-server/server-alarm-plugin/pom.xml | 6 +-
.../src/test/resources/log4j2-test.xml | 1 -
oap-server/server-bootstrap/pom.xml | 295 ---------
...TClusterModuleConsulProviderFunctionalTest.java | 2 +-
.../cluster-etcd-plugin/pom.xml | 22 -
.../cluster/plugin/etcd/EtcdCoordinator.java | 2 +-
.../plugin/etcd/ITClusterEtcdPluginTest.java | 23 +-
.../ITClusterModuleEtcdProviderFunctionalTest.java | 50 +-
.../cluster-nacos-plugin/pom.xml | 110 +---
...ITClusterModuleNacosProviderFunctionalTest.java | 50 +-
.../configuration-apollo/pom.xml | 5 +
.../configuration-etcd/pom.xml | 22 -
.../etcd/ITEtcdConfigurationTest.java | 63 +-
.../core/cluster/ServiceRegisterException.java | 4 +
.../core/profile/analyze/ProfileAnalyzer.java | 2 +-
.../server/core/query/AggregationQueryService.java | 4 +-
.../core/storage/ttl/DataTTLKeeperTimer.java | 7 +
.../storage/type/StorageDataComplexObject.java | 18 +
.../oap/server/core/remote/JettyServerTest.java | 145 ++---
oap-server/server-library/library-client/pom.xml | 114 +---
.../client/elasticsearch/ElasticSearchClient.java | 669 ++++++---------------
...InsertRequest.java => IndexRequestWrapper.java} | 25 +-
.../client/elasticsearch/UpdateRequestWrapper.java | 37 ++
.../client/jdbc/hikaricp/JDBCHikariCPClient.java | 5 +-
.../elasticsearch/bulk/ITElasticSearch.java | 255 ++++++++
.../elasticsearch/ITElasticSearchClient.java | 307 ----------
.../library-elasticsearch-client}/pom.xml | 37 +-
.../library/elasticsearch/ElasticSearch.java | 182 ++++++
.../elasticsearch/ElasticSearchBuilder.java | 189 ++++++
.../elasticsearch/ElasticSearchVersion.java | 99 +++
.../library/elasticsearch/bulk/BulkProcessor.java | 152 +++++
.../elasticsearch/bulk/BulkProcessorBuilder.java | 57 ++
.../library/elasticsearch/client/AliasClient.java | 71 +++
.../elasticsearch/client/DocumentClient.java | 157 +++++
.../library/elasticsearch/client/IndexClient.java | 167 +++++
.../library/elasticsearch/client/SearchClient.java | 75 +++
.../elasticsearch/client/TemplateClient.java | 149 +++++
.../elasticsearch/requests/IndexRequest.java} | 19 +-
.../elasticsearch/requests/UpdateRequest.java} | 19 +-
.../requests/factory/AliasFactory.java} | 11 +-
.../requests/factory/BulkFactory.java} | 17 +-
.../elasticsearch/requests/factory/Codec.java} | 22 +-
.../requests/factory/DocumentFactory.java | 57 ++
.../requests/factory/IndexFactory.java | 51 ++
.../requests/factory/RequestFactory.java | 62 ++
.../requests/factory/SearchFactory.java} | 25 +-
.../requests/factory/TemplateFactory.java} | 34 +-
.../factory/common/CommonAliasFactory.java | 41 ++
.../requests/factory/common/CommonBulkFactory.java | 52 ++
.../factory/common/CommonSearchFactory.java | 63 ++
.../requests/factory/v6/V6DocumentFactory.java | 174 ++++++
.../requests/factory/v6/V6IndexFactory.java | 105 ++++
.../requests/factory/v6/V6RequestFactory.java | 52 ++
.../requests/factory/v6/V6TemplateFactory.java | 87 +++
.../requests/factory/v6/codec/V6Codec.java | 81 +++
.../factory/v6/codec/V6IndexRequestSerializer.java | 48 ++
.../factory/v6/codec/V6MappingsDeserializer.java | 54 ++
.../factory/v6/codec/V6MappingsSerializer.java | 43 ++
.../v6/codec/V6UpdateRequestSerializer.java | 54 ++
.../requests/factory/v7/V78RequestFactory.java | 52 ++
.../requests/factory/v7/V78TemplateFactory.java | 86 +++
.../requests/factory/v7/V7DocumentFactory.java | 168 ++++++
.../requests/factory/v7/V7IndexFactory.java | 103 ++++
.../requests/factory/v7/V7RequestFactory.java | 52 ++
.../requests/factory/v7/V7TemplateFactory.java | 81 +++
.../requests/factory/v7/codec/V7Codec.java | 77 +++
.../factory/v7/codec/V7IndexRequestSerializer.java | 47 ++
.../factory/v7/codec/V7MappingsDeserializer.java | 49 ++
.../v7/codec/V7UpdateRequestSerializer.java | 53 ++
.../elasticsearch/requests/search/BoolQuery.java | 81 +++
.../requests/search/BoolQueryBuilder.java | 133 ++++
.../elasticsearch/requests/search/IdsQuery.java | 55 ++
.../requests/search/MatchPhaseQuery.java | 53 ++
.../elasticsearch/requests/search/MatchQuery.java | 49 ++
.../elasticsearch/requests/search/Query.java | 86 +++
.../requests/search/QueryBuilder.java} | 11 +-
.../elasticsearch/requests/search/RangeQuery.java | 77 +++
.../requests/search/RangeQueryBuilder.java | 70 +++
.../elasticsearch/requests/search/Search.java} | 37 +-
.../requests/search/SearchBuilder.java | 114 ++++
.../elasticsearch/requests/search/Sort.java} | 30 +-
.../elasticsearch/requests/search/Sorts.java | 70 +++
.../elasticsearch/requests/search/TermQuery.java | 55 ++
.../elasticsearch/requests/search/TermsQuery.java | 56 ++
.../requests/search/aggregation/Aggregation.java | 50 ++
.../search/aggregation/AggregationBuilder.java} | 7 +-
.../search/aggregation/AvgAggregation.java | 57 ++
.../search/aggregation/AvgAggregationBuilder.java} | 29 +-
.../requests/search/aggregation/BucketOrder.java} | 21 +-
.../search/aggregation/MaxAggregation.java | 57 ++
.../search/aggregation/MaxAggregationBuilder.java} | 27 +-
.../search/aggregation/MinAggregation.java | 57 ++
.../search/aggregation/MinAggregationBuilder.java} | 29 +-
.../search/aggregation/SumAggregation.java | 57 ++
.../search/aggregation/SumAggregationBuilder.java} | 29 +-
.../search/aggregation/TermsAggregation.java | 65 ++
.../aggregation/TermsAggregationBuilder.java | 87 +++
.../library/elasticsearch/response/Document.java} | 19 +-
.../library/elasticsearch/response/Documents.java} | 21 +-
.../library/elasticsearch/response/Index.java} | 14 +-
.../elasticsearch/response/IndexTemplate.java} | 18 +-
.../elasticsearch/response/IndexTemplates.java} | 33 +-
.../library/elasticsearch/response/Mappings.java} | 35 +-
.../library/elasticsearch/response/NodeInfo.java} | 15 +-
.../elasticsearch/response/search/SearchHit.java} | 40 +-
.../elasticsearch/response/search/SearchHits.java | 66 ++
.../response/search/SearchResponse.java} | 15 +-
.../library/elasticsearch/ITElasticSearchTest.java | 191 ++++++
oap-server/server-library/pom.xml | 3 +-
.../oap/query/graphql/resolver/MetricQuery.java | 9 +-
.../pom.xml | 2 +-
.../discovery/AgentConfigurationsReader.java | 12 +-
.../discovery/AgentConfigurationsWatcher.java | 12 +-
.../receiver/envoy/EnvoyMetricReceiverConfig.java | 2 +-
.../zipkin-receiver-plugin/pom.xml | 4 +-
oap-server/server-starter-es7/pom.xml | 92 ---
.../src/main/assembly/assembly.xml | 33 -
oap-server/server-starter/pom.xml | 257 +++++++-
.../oap/server/starter/OAPServerBootstrap.java | 0
.../oap/server/starter/OAPServerStartUp.java | 3 -
.../starter/config/ApplicationConfigLoader.java | 0
.../config/ConfigFileNotFoundException.java | 0
.../oap/server/starter/config/ConfigLoader.java | 0
.../src/main/resources/alarm-settings.yml | 0
.../src/main/resources/application.yml | 35 +-
.../src/main/resources/component-libraries.yml | 0
.../src/main/resources/endpoint-name-grouping.yml | 0
.../envoy-metrics-rules/envoy-svc-relation.yaml | 0
.../main/resources/envoy-metrics-rules/envoy.yaml | 0
.../main/resources/fetcher-prom-rules/self.yaml | 0
.../src/main/resources/gateways.yml | 0
.../src/main/resources/lal/default.yaml | 0
.../src/main/resources/lal/envoy-als.yaml | 0
.../main/resources/log-mal-rules/placeholder.yaml | 0
.../src/main/resources/log4j2.xml | 6 +-
.../main/resources/metadata-service-mapping.yaml | 0
.../meter-analyzer-config/spring-sleuth.yaml | 0
.../src/main/resources/oal/browser.oal | 0
.../src/main/resources/oal/core.oal | 0
.../src/main/resources/oal/disable.oal | 0
.../src/main/resources/oal/dotnet-agent.oal | 0
.../src/main/resources/oal/event.oal | 0
.../src/main/resources/oal/java-agent.oal | 0
.../src/main/resources/oal/tcp.oal | 0
.../serviceA/productAPI-v1.yaml | 0
.../otel-oc-rules/istio-controlplane.yaml | 0
.../main/resources/otel-oc-rules/k8s-cluster.yaml | 0
.../src/main/resources/otel-oc-rules/k8s-node.yaml | 0
.../main/resources/otel-oc-rules/k8s-service.yaml | 0
.../src/main/resources/otel-oc-rules/oap.yaml | 0
.../src/main/resources/otel-oc-rules/vm.yaml | 0
.../src/main/resources/service-apdex-threshold.yml | 0
.../resources/trace-sampling-policy-settings.yml | 0
.../resources/ui-initialized-templates/apm.yml | 0
.../resources/ui-initialized-templates/browser.yml | 0
.../ui-initialized-templates/database.yml | 0
.../resources/ui-initialized-templates/event.yml | 0
.../ui-initialized-templates/istio-dp.yml | 0
.../resources/ui-initialized-templates/istio.yml | 0
.../resources/ui-initialized-templates/k8s.yml | 0
.../self-observability.yml | 0
.../ui-initialized-templates/spring-sleuth.yml | 0
.../topology-endpoint-relation.yml | 0
.../ui-initialized-templates/topology-endpoint.yml | 0
.../ui-initialized-templates/topology-instance.yml | 0
.../topology-service-instance-relation.yml | 0
.../topology-service-relation.yml | 0
.../ui-initialized-templates/topology-service.yml | 0
.../main/resources/ui-initialized-templates/vm.yml | 0
.../src/main/resources/zabbix-rules/agent.yaml | 0
.../oap/server/starter/ComponentLibrariesTest.java | 0
.../oap/server/starter/UITemplateCheckerTest.java | 0
.../config/ApplicationConfigLoaderTestCase.java | 0
oap-server/server-storage-plugin/pom.xml | 5 +-
.../storage-elasticsearch-plugin/pom.xml | 8 +-
.../StorageModuleElasticsearchConfig.java | 6 +
.../StorageModuleElasticsearchProvider.java | 37 +-
.../elasticsearch/base/BatchProcessEsDAO.java | 12 +-
.../storage/plugin/elasticsearch/base/EsDAO.java | 22 -
.../elasticsearch/base/HistoryDeleteEsDAO.java | 26 +-
.../plugin/elasticsearch/base/IndexStructures.java | 109 ++--
.../plugin/elasticsearch/base/ManagementEsDAO.java | 16 +-
.../plugin/elasticsearch/base/MetricsEsDAO.java | 37 +-
.../plugin/elasticsearch/base/NoneStreamEsDAO.java | 7 +-
.../plugin/elasticsearch/base/RecordEsDAO.java | 6 +-
.../elasticsearch/base/StorageEsInstaller.java | 72 +--
...Maker.java => TimeRangeIndexNameGenerator.java} | 10 +-
.../plugin/elasticsearch/base/TimeSeriesUtils.java | 4 +-
.../cache/NetworkAddressAliasEsDAO.java | 25 +-
.../elasticsearch/query/AggregationQueryEsDAO.java | 109 ++--
.../elasticsearch/query/AlarmQueryEsDAO.java | 51 +-
.../elasticsearch/query/BrowserLogQueryEsDAO.java | 55 +-
.../elasticsearch/query/ESEventQueryDAO.java | 139 ++---
.../plugin/elasticsearch/query/LogQueryEsDAO.java | 90 +--
.../elasticsearch/query/MetadataQueryEsDAO.java | 165 +++--
.../elasticsearch/query/MetricsQueryEsDAO.java | 206 ++++---
.../elasticsearch/query/ProfileTaskLogEsDAO.java | 40 +-
.../elasticsearch/query/ProfileTaskQueryEsDAO.java | 91 +--
.../query/ProfileThreadSnapshotQueryEsDAO.java | 239 ++++----
.../elasticsearch/query/TopNRecordsQueryEsDAO.java | 50 +-
.../elasticsearch/query/TopologyQueryEsDAO.java | 339 ++++++-----
.../elasticsearch/query/TraceQueryEsDAO.java | 113 ++--
.../query/UITemplateManagementEsDAO.java | 92 +--
...alking.oap.server.library.module.ModuleProvider | 2 +-
.../elasticsearch/base/IndexStructuresTest.java | 87 ++-
.../elasticsearch/base/TimeSeriesUtilsTest.java | 2 +-
.../storage-elasticsearch7-plugin/pom.xml | 53 --
.../StorageModuleElasticsearch7Provider.java | 240 --------
.../elasticsearch7/base/StorageEs7Installer.java | 40 --
.../client/ElasticSearch7Client.java | 429 -------------
.../plugin/elasticsearch7/dao/MetricsEs7DAO.java | 31 -
.../plugin/elasticsearch7/dao/StorageEs7DAO.java | 63 --
.../query/AggregationQueryEs7DAO.java | 120 ----
.../elasticsearch7/query/AlarmQueryEs7DAO.java | 107 ----
.../query/BrowserLogQueryEs7DAO.java | 96 ---
.../elasticsearch7/query/ES7EventQueryDAO.java | 62 --
.../elasticsearch7/query/LogQueryEs7DAO.java | 165 -----
.../elasticsearch7/query/MetricsQueryEs7DAO.java | 102 ----
.../query/ProfileThreadSnapshotQueryEs7DAO.java | 48 --
.../elasticsearch7/query/TraceQueryEs7DAO.java | 151 -----
...alking.oap.server.library.module.ModuleProvider | 19 -
.../storage/plugin/influxdb/query/AlarmQuery.java | 5 +-
.../storage/plugin/influxdb/query/LogQuery.java | 2 +-
.../influxdb/query/ProfileThreadSnapshotQuery.java | 2 +-
.../storage/plugin/influxdb/query/TraceQuery.java | 2 +-
.../plugin/jdbc/h2/dao/H2AlarmQueryDAO.java | 21 +-
.../storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java | 3 +-
.../h2/dao/H2ProfileThreadSnapshotQueryDAO.java | 6 +-
.../plugin/jdbc/h2/dao/H2TraceQueryDAO.java | 5 +-
.../pom.xml | 15 +-
.../server/storage/plugin/zipkin/ZipkinSpan.java | 0
.../storage/plugin/zipkin/ZipkinSpanRecord.java | 0
.../plugin/zipkin/ZipkinSpanRecordDispatcher.java | 0
.../ZipkinStorageModuleElasticsearchProvider.java | 9 +-
.../elasticsearch/ZipkinTraceQueryEsDAO.java} | 83 ++-
...alking.oap.server.library.module.ModuleProvider | 0
oap-server/server-tools/pom.xml | 4 +-
oap-server/server-tools/profile-exporter/pom.xml | 7 +-
.../tool-profile-snapshot-bootstrap/pom.xml | 5 +-
.../pom.xml | 9 +-
.../profile/exporter/ProfileSnapshotExporter.java | 0
.../tool-profile-snapshot-exporter/pom.xml | 5 +-
pom.xml | 4 -
test/e2e/e2e-common/pom.xml | 2 +-
test/e2e/e2e-data/pom.xml | 2 +-
.../e2e-test/docker/alarm/docker-compose.es7.yml | 4 +-
test/e2e/e2e-test/docker/base-compose.yml | 23 -
.../e2e-test/docker/browser/docker-compose.es7.yml | 6 +-
.../docker/cluster/docker-compose.zk.es7.yml | 8 +-
.../e2e-test/docker/event/docker-compose.es7.0.yml | 4 +-
.../e2e-test/docker/log/docker-compose.es7.14.yml | 4 +-
.../e2e/e2e-test/docker/log/docker-compose.es7.yml | 4 +-
test/e2e/e2e-test/docker/nodejs/Dockerfile.nodejs | 2 +-
.../e2e-test/docker/profile/docker-compose.es7.yml | 4 +-
.../docker/storage/docker-compose.es7.0.yml | 4 +-
.../docker/storage/docker-compose.es7.10.yml | 4 +-
.../docker/storage/docker-compose.es7.14.yml | 4 +-
.../docker/storage/docker-compose.opensearch.yml | 4 +-
.../e2e/e2e-test/docker/ttl/docker-compose.es7.yml | 4 +-
test/e2e/e2e-test/pom.xml | 2 +-
.../apache/skywalking/e2e/ttl/StorageTTLE2E.java | 8 +-
test/e2e/pom.xml | 32 +-
tools/dependencies/check-LICENSE.sh | 15 +-
.../known-oap-backend-dependencies-es7.txt | 174 ------
.../known-oap-backend-dependencies.txt | 53 +-
tools/profile-exporter/application.yml | 20 -
300 files changed, 7481 insertions(+), 5621 deletions(-)
delete mode 100644 apm-dist-es7/pom.xml
delete mode 100644 apm-dist-es7/src/main/assembly/binary-es7.xml
delete mode 100644 oap-server-bom-es7/pom.xml
delete mode 100644 oap-server/server-bootstrap/pom.xml
rename oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/{ElasticSearchInsertRequest.java => IndexRequestWrapper.java} (61%)
create mode 100644 oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/UpdateRequestWrapper.java
create mode 100644 oap-server/server-library/library-client/src/test/java/org/apache/skywalking/library/elasticsearch/bulk/ITElasticSearch.java
delete mode 100644 oap-server/server-library/library-client/src/test/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ITElasticSearchClient.java
copy {test/e2e/e2e-common => oap-server/server-library/library-elasticsearch-client}/pom.xml (62%)
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearch.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearchBuilder.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/ElasticSearchVersion.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/bulk/BulkProcessor.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/bulk/BulkProcessorBuilder.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/client/AliasClient.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/client/DocumentClient.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/client/IndexClient.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/client/SearchClient.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/client/TemplateClient.java
copy oap-server/server-library/{library-client/src/test/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ITElasticSearchClientOfNamespace.java => library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/IndexRequest.java} (70%)
copy oap-server/server-library/{library-client/src/test/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ITElasticSearchClientOfNamespace.java => library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/UpdateRequest.java} (69%)
rename oap-server/{server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/StorageModuleElasticsearch7Config.java => server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/AliasFactory.java} (74%)
rename oap-server/server-library/{library-client/src/main/java/org/apache/skywalking/oap/server/library/client/ClientException.java => library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/BulkFactory.java} (70%)
rename oap-server/{server-starter-es7/src/main/java/org/apache/skywalking/oap/server/starter/OAPServerStartUp.java => server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/Codec.java} (58%)
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/DocumentFactory.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/IndexFactory.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/RequestFactory.java
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/type/StorageDataComplexObject.java => server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/SearchFactory.java} (60%)
rename oap-server/server-library/{library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/IndexNameConverter.java => library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/TemplateFactory.java} (51%)
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/common/CommonAliasFactory.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/common/CommonBulkFactory.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/common/CommonSearchFactory.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/v6/V6DocumentFactory.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/v6/V6IndexFactory.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/v6/V6RequestFactory.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/v6/V6TemplateFactory.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/v6/codec/V6Codec.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/v6/codec/V6IndexRequestSerializer.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/v6/codec/V6MappingsDeserializer.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/v6/codec/V6MappingsSerializer.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/v6/codec/V6UpdateRequestSerializer.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/v7/V78RequestFactory.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/v7/V78TemplateFactory.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/v7/V7DocumentFactory.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/v7/V7IndexFactory.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/v7/V7RequestFactory.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/v7/V7TemplateFactory.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/v7/codec/V7Codec.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/v7/codec/V7IndexRequestSerializer.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/v7/codec/V7MappingsDeserializer.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/factory/v7/codec/V7UpdateRequestSerializer.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/BoolQuery.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/BoolQueryBuilder.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/IdsQuery.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/MatchPhaseQuery.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/MatchQuery.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/Query.java
rename oap-server/server-library/{library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/IndexNameMaker.java => library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/QueryBuilder.java} (79%)
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/RangeQuery.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/RangeQueryBuilder.java
copy oap-server/{server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/TimeRangeIndexNameMaker.java => server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/Search.java} (50%)
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/SearchBuilder.java
copy oap-server/server-library/{library-client/src/main/java/org/apache/skywalking/oap/server/library/client/grpc/GRPCClientException.java => library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/Sort.java} (59%)
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/Sorts.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/TermQuery.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/TermsQuery.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/aggregation/Aggregation.java
copy oap-server/{server-bootstrap/src/main/java/org/apache/skywalking/oap/server/starter/config/ConfigLoader.java => server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/aggregation/AggregationBuilder.java} (84%)
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/aggregation/AvgAggregation.java
copy oap-server/{server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7InsertRequest.java => server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/aggregation/AvgAggregationBuilder.java} (57%)
rename oap-server/server-library/{library-client/src/main/java/org/apache/skywalking/oap/server/library/client/grpc/GRPCClientException.java => library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/aggregation/BucketOrder.java} (64%)
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/aggregation/MaxAggregation.java
rename oap-server/{server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7UpdateRequest.java => server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/aggregation/MaxAggregationBuilder.java} (57%)
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/aggregation/MinAggregation.java
copy oap-server/{server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7InsertRequest.java => server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/aggregation/MinAggregationBuilder.java} (57%)
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/aggregation/SumAggregation.java
rename oap-server/{server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7InsertRequest.java => server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/aggregation/SumAggregationBuilder.java} (57%)
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/aggregation/TermsAggregation.java
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/requests/search/aggregation/TermsAggregationBuilder.java
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ServiceRegisterException.java => server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/response/Document.java} (70%)
rename oap-server/{server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/MetadataQueryEs7DAO.java => server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/response/Documents.java} (62%)
copy oap-server/server-library/{library-client/src/test/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ITElasticSearchClientOfNamespace.java => library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/response/Index.java} (76%)
copy oap-server/server-library/{library-client/src/test/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ITElasticSearchClientOfNamespace.java => library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/response/IndexTemplate.java} (68%)
copy oap-server/{server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/base/IndexEs7Structures.java => server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/response/IndexTemplates.java} (53%)
rename oap-server/server-library/{library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchUpdateRequest.java => library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/response/Mappings.java} (58%)
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ServiceRegisterException.java => server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/response/NodeInfo.java} (74%)
rename oap-server/{server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/base/IndexEs7Structures.java => server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/response/search/SearchHit.java} (51%)
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/response/search/SearchHits.java
rename oap-server/server-library/{library-client/src/test/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ITElasticSearchClientOfNamespace.java => library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/response/search/SearchResponse.java} (74%)
create mode 100644 oap-server/server-library/library-elasticsearch-client/src/test/java/org/apache/skywalking/library/elasticsearch/ITElasticSearchTest.java
delete mode 100644 oap-server/server-starter-es7/pom.xml
delete mode 100644 oap-server/server-starter-es7/src/main/assembly/assembly.xml
rename oap-server/{server-bootstrap => server-starter}/src/main/java/org/apache/skywalking/oap/server/starter/OAPServerBootstrap.java (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/java/org/apache/skywalking/oap/server/starter/config/ApplicationConfigLoader.java (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/java/org/apache/skywalking/oap/server/starter/config/ConfigFileNotFoundException.java (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/java/org/apache/skywalking/oap/server/starter/config/ConfigLoader.java (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/alarm-settings.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/application.yml (89%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/component-libraries.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/endpoint-name-grouping.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/envoy-metrics-rules/envoy-svc-relation.yaml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/envoy-metrics-rules/envoy.yaml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/fetcher-prom-rules/self.yaml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/gateways.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/lal/default.yaml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/lal/envoy-als.yaml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/log-mal-rules/placeholder.yaml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/log4j2.xml (85%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/metadata-service-mapping.yaml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/meter-analyzer-config/spring-sleuth.yaml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/oal/browser.oal (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/oal/core.oal (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/oal/disable.oal (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/oal/dotnet-agent.oal (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/oal/event.oal (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/oal/java-agent.oal (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/oal/tcp.oal (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/openapi-definitions/serviceA/productAPI-v1.yaml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/otel-oc-rules/istio-controlplane.yaml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/otel-oc-rules/k8s-cluster.yaml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/otel-oc-rules/k8s-node.yaml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/otel-oc-rules/k8s-service.yaml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/otel-oc-rules/oap.yaml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/otel-oc-rules/vm.yaml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/service-apdex-threshold.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/trace-sampling-policy-settings.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/ui-initialized-templates/apm.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/ui-initialized-templates/browser.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/ui-initialized-templates/database.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/ui-initialized-templates/event.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/ui-initialized-templates/istio-dp.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/ui-initialized-templates/istio.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/ui-initialized-templates/k8s.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/ui-initialized-templates/self-observability.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/ui-initialized-templates/spring-sleuth.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/ui-initialized-templates/topology-endpoint-relation.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/ui-initialized-templates/topology-endpoint.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/ui-initialized-templates/topology-instance.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/ui-initialized-templates/topology-service-instance-relation.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/ui-initialized-templates/topology-service-relation.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/ui-initialized-templates/topology-service.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/ui-initialized-templates/vm.yml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/main/resources/zabbix-rules/agent.yaml (100%)
rename oap-server/{server-bootstrap => server-starter}/src/test/java/org/apache/skywalking/oap/server/starter/ComponentLibrariesTest.java (100%)
rename oap-server/{server-bootstrap => server-starter}/src/test/java/org/apache/skywalking/oap/server/starter/UITemplateCheckerTest.java (100%)
rename oap-server/{server-bootstrap => server-starter}/src/test/java/org/apache/skywalking/oap/server/starter/config/ApplicationConfigLoaderTestCase.java (100%)
rename oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/{TimeRangeIndexNameMaker.java => TimeRangeIndexNameGenerator.java} (79%)
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/pom.xml
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/StorageModuleElasticsearch7Provider.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/base/StorageEs7Installer.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7Client.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/dao/MetricsEs7DAO.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/dao/StorageEs7DAO.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/AggregationQueryEs7DAO.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/AlarmQueryEs7DAO.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/BrowserLogQueryEs7DAO.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/ES7EventQueryDAO.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/LogQueryEs7DAO.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/MetricsQueryEs7DAO.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/ProfileThreadSnapshotQueryEs7DAO.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/TraceQueryEs7DAO.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
rename oap-server/server-storage-plugin/{storage-zipkin-elasticsearch7-plugin => storage-zipkin-elasticsearch-plugin}/pom.xml (79%)
rename oap-server/server-storage-plugin/{storage-zipkin-elasticsearch7-plugin => storage-zipkin-elasticsearch-plugin}/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpan.java (100%)
rename oap-server/server-storage-plugin/{storage-zipkin-elasticsearch7-plugin => storage-zipkin-elasticsearch-plugin}/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpanRecord.java (100%)
rename oap-server/server-storage-plugin/{storage-zipkin-elasticsearch7-plugin => storage-zipkin-elasticsearch-plugin}/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpanRecordDispatcher.java (100%)
rename oap-server/server-storage-plugin/{storage-zipkin-elasticsearch7-plugin => storage-zipkin-elasticsearch-plugin}/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/elasticsearch/ZipkinStorageModuleElasticsearchProvider.java (87%)
rename oap-server/server-storage-plugin/{storage-zipkin-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/elasticsearch/ZipkinTraceQueryEs7DAO.java => storage-zipkin-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/elasticsearch/ZipkinTraceQueryEsDAO.java} (78%)
rename oap-server/server-storage-plugin/{storage-zipkin-elasticsearch7-plugin => storage-zipkin-elasticsearch-plugin}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (100%)
rename oap-server/server-tools/profile-exporter/{tool-profile-snapshot-exporter-es7 => tool-profile-snapshot-exporter-es}/pom.xml (85%)
rename oap-server/server-tools/profile-exporter/{tool-profile-snapshot-exporter-es7 => tool-profile-snapshot-exporter-es}/src/main/java/org/apache/skywalking/oap/server/tool/profile/exporter/ProfileSnapshotExporter.java (100%)
delete mode 100755 tools/dependencies/known-oap-backend-dependencies-es7.txt