This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch 9.2.0-master-tlsnoverify
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit d42c7e29d79844bb1da32409c431efc607357ce8
Merge: 8efcf8a345 097a9e8706
Author: jian.tan <jian....@daocloud.io>
AuthorDate: Fri Sep 2 14:40:07 2022 +0800

    Merge branch 'master' of https://github.com/apache/skywalking

 .dlc.json                                          |    2 +-
 .github/PULL_REQUEST_TEMPLATE                      |    2 +-
 .github/workflows/skywalking.yaml                  |  204 ++-
 .licenserc.yaml                                    |   52 +
 LICENSE                                            |    2 +
 NOTICE                                             |   21 +
 README.md                                          |   14 +-
 apm-dist/pom.xml                                   |    2 +-
 apm-dist/src/main/assembly/binary.xml              |    2 +-
 apm-protocol/apm-network/pom.xml                   |    2 +-
 .../command/EBPFProfilingTaskCommand.java          |   11 +-
 apm-protocol/apm-network/src/main/proto            |    2 +-
 apm-protocol/pom.xml                               |    2 +-
 apm-webapp/pom.xml                                 |    2 +-
 dist-material/release-docs/LICENSE                 |  670 ++++++---
 dist-material/release-docs/LICENSE.tpl             |   33 +
 .../release-docs/licenses/LICENSE-jopt-simple.txt  |   22 -
 ...icSearch-storage-option-explanation-in-9.2.0.md |   23 +
 docs/en/FAQ/README.md                              |    1 +
 docs/en/FAQ/install_agent_on_websphere.md          |    2 +-
 docs/en/academy/list.md                            |    4 +-
 docs/en/changes/changes-8.6.0.md                   |    2 +-
 docs/en/changes/{changes.md => changes-9.1.0.md}   |    0
 docs/en/changes/changes-9.2.0.md                   |  123 ++
 docs/en/changes/changes.md                         |  113 +-
 docs/en/concepts-and-designs/ebpf-cpu-profiling.md |  166 ++
 docs/en/concepts-and-designs/event.md              |   46 -
 docs/en/concepts-and-designs/lal.md                |    4 +-
 docs/en/concepts-and-designs/mal.md                |    6 +
 docs/en/concepts-and-designs/oal.md                |    2 -
 docs/en/concepts-and-designs/overview.md           |    8 +-
 docs/en/concepts-and-designs/probe-introduction.md |    2 +-
 docs/en/concepts-and-designs/sdk-profiling.md      |    2 +-
 docs/en/guides/How-to-release.md                   |   14 +-
 docs/en/guides/README.md                           |   14 +-
 docs/en/protocols/README.md                        |    6 +-
 docs/en/protocols/Trace-Data-Protocol-v3.md        |    4 +-
 docs/en/setup/backend/backend-alarm.md             |   85 +-
 docs/en/setup/backend/backend-docker.md            |    4 +-
 docs/en/setup/backend/backend-k8s-monitoring.md    |   14 +-
 .../backend/backend-k8s-network-monitoring.md      |   35 +
 docs/en/setup/backend/backend-meter.md             |    4 +
 docs/en/setup/backend/backend-mysql-monitoring.md  |   37 +
 .../setup/backend/backend-postgresql-monitoring.md |   51 +
 docs/en/setup/backend/backend-storage.md           |   21 +
 docs/en/setup/backend/backend-telemetry.md         |   26 +-
 docs/en/setup/backend/backend-vm-monitoring.md     |   16 +-
 docs/en/setup/backend/backend-zabbix.md            |    4 +
 docs/en/setup/backend/configuration-vocabulary.md  |   26 +-
 .../en/setup/backend/dashboards-so11y-satellite.md |   31 +
 docs/en/setup/backend/dashboards-so11y.md          |   54 +
 docs/en/setup/backend/dynamic-config-apollo.md     |    2 +-
 docs/en/setup/backend/dynamic-config-configmap.md  |    2 +-
 docs/en/setup/backend/dynamic-config.md            |    4 +-
 docs/en/setup/backend/dynamical-logging.md         |    2 +-
 docs/en/setup/backend/endpoint-grouping-rules.md   |    4 +-
 docs/en/setup/backend/on-demand-pod-log.md         |    2 +-
 docs/en/setup/backend/opentelemetry-receiver.md    |   28 +-
 docs/en/setup/backend/prometheus-metrics.md        |    4 +
 docs/en/setup/backend/spring-sleuth-setup.md       |   15 +-
 docs/en/setup/backend/zipkin-trace.md              |   25 +-
 docs/en/setup/envoy/metrics_service_setting.md     |    4 +
 docs/en/setup/service-agent/agent-compatibility.md |    6 +-
 docs/en/ui/README.md                               |   63 +
 docs/menu.yml                                      |   34 +-
 oap-server-bom/pom.xml                             |   11 +-
 oap-server/analyzer/agent-analyzer/pom.xml         |    2 +-
 .../provider/meter/config/MeterConfig.java         |    2 +
 .../parser/ISegmentParserListenerManager.java      |    4 +
 .../trace/parser/SegmentParserListenerManager.java |    3 +-
 ...EndpointDepFromCrossThreadAnalysisListener.java |    1 +
 .../trace/parser/listener/RPCAnalysisListener.java |    2 +-
 oap-server/analyzer/event-analyzer/pom.xml         |    2 +-
 .../oap/server/analyzer/event/EventAnalyzer.java   |    6 +-
 .../analyzer/event/EventAnalyzerServiceImpl.java   |    6 +-
 ...ger.java => IEventAnalyzerListenerManager.java} |    5 +-
 oap-server/analyzer/log-analyzer/pom.xml           |    2 +-
 ...nager.java => ILogAnalysisListenerManager.java} |    3 +-
 .../oap/log/analyzer/provider/log/LogAnalyzer.java |    2 +-
 .../provider/log/LogAnalyzerServiceImpl.java       |    2 +-
 oap-server/analyzer/meter-analyzer/pom.xml         |   11 +-
 .../skywalking/oap/meter/analyzer/Analyzer.java    |   76 +-
 .../oap/meter/analyzer/MetricConvert.java          |   42 +-
 .../oap/meter/analyzer/MetricRuleConfig.java       |   10 +
 .../skywalking/oap/meter/analyzer/dsl/DSL.java     |    9 +-
 .../oap/meter/analyzer/dsl/DownsamplingType.java   |    2 +-
 .../ProcessRelationEntityDescription.java          |   49 +
 .../oap/meter/analyzer/dsl/Expression.java         |    1 +
 .../analyzer/dsl/ExpressionParsingContext.java     |    5 -
 .../oap/meter/analyzer/dsl/SampleFamily.java       |   52 +-
 .../analyzer/dsl/registry/ProcessRegistry.java     |   84 ++
 .../oap/meter/analyzer/k8s/K8sInfoRegistry.java    |  198 +--
 .../oap/meter/analyzer/k8s/Kubernetes.java}        |   19 +-
 .../oap/meter/analyzer/prometheus/rule/Rule.java   |    2 +
 .../oap/meter/analyzer/dsl/FunctionTest.java       |   13 +
 .../oap/meter/analyzer/dsl/K8sTagTest.java         |   81 +-
 .../oap/meter/analyzer/dsl/ScopeTest.java          |   40 +
 oap-server/analyzer/pom.xml                        |    2 +-
 oap-server/exporter/pom.xml                        |    2 +-
 oap-server/microbench/pom.xml                      |    2 +-
 oap-server/oal-grammar/pom.xml                     |    2 +-
 oap-server/oal-rt/pom.xml                          |    2 +-
 oap-server/pom.xml                                 |    2 +-
 oap-server/server-alarm-plugin/pom.xml             |    2 +-
 .../core/alarm/provider/AlarmRulesWatcher.java     |   10 +
 .../server/core/alarm/provider/NotifyHandler.java  |    4 +
 .../oap/server/core/alarm/provider/Rules.java      |    4 +
 .../server/core/alarm/provider/RulesReader.java    |   48 +
 .../provider/discord/DiscordHookCallback.java      |  121 ++
 .../alarm/provider/discord/DiscordSettings.java}   |   56 +-
 .../provider/pagerduty/PagerDutyHookCallback.java  |  139 ++
 .../provider/pagerduty/PagerDutySettings.java}     |   32 +-
 .../core/alarm/provider/RulesReaderTest.java       |    9 +
 .../pagerduty/PagerDutyHookCallbackTest.java       |   74 +
 .../src/test/resources/alarm-settings.yml          |    8 +-
 .../cluster-consul-plugin/pom.xml                  |    2 +-
 .../cluster-etcd-plugin/pom.xml                    |    2 +-
 .../cluster-kubernetes-plugin/pom.xml              |    2 +-
 .../cluster-nacos-plugin/pom.xml                   |    2 +-
 .../cluster-standalone-plugin/pom.xml              |    2 +-
 .../cluster-zookeeper-plugin/pom.xml               |    2 +-
 oap-server/server-cluster-plugin/pom.xml           |    2 +-
 .../server-configuration/configuration-api/pom.xml |    2 +-
 .../configuration-apollo/pom.xml                   |    2 +-
 .../configuration-consul/pom.xml                   |    2 +-
 .../configuration-etcd/pom.xml                     |    2 +-
 .../configuration-k8s-configmap/pom.xml            |    2 +-
 .../configuration-nacos/pom.xml                    |    2 +-
 .../configuration-zookeeper/pom.xml                |    2 +-
 .../grpc-configuration-sync/pom.xml                |    2 +-
 oap-server/server-configuration/pom.xml            |    2 +-
 oap-server/server-core/pom.xml                     |    2 +-
 .../oap/server/core/CoreModuleProvider.java        |    6 +-
 .../oap/server/core/alarm/AlarmRecord.java         |    3 +-
 .../oap/server/core/analysis/IDManager.java        |   26 +
 .../skywalking/oap/server/core/analysis/Layer.java |   17 +-
 .../analysis/manual/endpoint/EndpointTraffic.java  |    1 +
 .../analysis/manual/instance/InstanceTraffic.java  |    2 +
 .../server/core/analysis/manual/log/LogRecord.java |    3 +
 .../analysis/manual/process/ProcessDetectType.java |    8 +-
 .../process/ProcessRelationClientSideMetrics.java  |  149 ++
 .../process/ProcessRelationDispatcher.java         |   61 +
 .../process/ProcessRelationServerSideMetrics.java  |  149 ++
 .../analysis/manual/segment/SegmentRecord.java     |    2 +
 .../analysis/manual/service/ServiceTraffic.java    |    1 +
 .../server/core/analysis/meter/MeterEntity.java    |   26 +
 .../oap/server/core/analysis/meter/ScopeType.java  |    3 +-
 .../analysis/meter/function/BucketedValues.java    |    7 +-
 .../analysis/meter/function/HistogramFunction.java |    2 +-
 .../meter/function/PercentileFunction.java         |    2 +
 .../analysis/meter/function/avg/AvgFunction.java   |   10 -
 .../meter/function/avg/AvgHistogramFunction.java   |    3 +
 .../avg/AvgHistogramPercentileFunction.java        |    4 +
 .../meter/function/avg/AvgLabeledFunction.java     |    4 +
 .../meter/function/latest/LatestFunction.java      |   10 -
 .../analysis/meter/function/sum/SumFunction.java   |   10 -
 .../SumHistogramPercentileFunction.java}           |   93 +-
 .../SumPerMinFunction.java}                        |   77 +-
 .../server/core/analysis/metrics/ApdexMetrics.java |   12 +-
 .../server/core/analysis/metrics/CPMMetrics.java   |   10 -
 .../server/core/analysis/metrics/CountMetrics.java |   10 -
 .../core/analysis/metrics/DoubleAvgMetrics.java    |   14 +-
 .../core/analysis/metrics/HavingDefaultValue.java  |   42 -
 .../core/analysis/metrics/LongAvgMetrics.java      |   10 -
 .../core/analysis/metrics/MaxDoubleMetrics.java    |   11 -
 .../core/analysis/metrics/MaxLongMetrics.java      |   15 +-
 .../oap/server/core/analysis/metrics/Metrics.java  |    2 +-
 .../core/analysis/metrics/MinDoubleMetrics.java    |   11 -
 .../core/analysis/metrics/MinLongMetrics.java      |   10 -
 .../server/core/analysis/metrics/P95Metrics.java   |   31 -
 .../server/core/analysis/metrics/P99Metrics.java   |   31 -
 .../core/analysis/metrics/PercentMetrics.java      |   12 +-
 .../core/analysis/metrics/PercentileMetrics.java   |    8 +-
 .../server/core/analysis/metrics/PxxMetrics.java   |  119 --
 .../server/core/analysis/metrics/RateMetrics.java  |   10 -
 .../server/core/analysis/metrics/SumMetrics.java   |   10 -
 .../analysis/worker/MetricsPersistentWorker.java   |   40 +-
 .../core/analysis/worker/PersistenceWorker.java    |    4 +-
 .../core/cache/NetworkAddressAliasCache.java       |    2 +-
 .../oap/server/core/command/CommandService.java    |    5 +-
 .../ui/template/UITemplateInitializer.java         |   17 +-
 .../ebpf/EBPFProfilingMutationService.java         |  118 +-
 .../profiling/ebpf/EBPFProfilingQueryService.java  |   22 +-
 .../EBPFProcessProfilingScheduleDispatcher.java    |    7 +-
 .../ebpf/storage/EBPFProfilingScheduleRecord.java  |   15 +-
 .../ebpf/storage/EBPFProfilingTargetType.java      |    2 +
 .../ebpf/storage/EBPFProfilingTaskRecord.java      |   24 +-
 .../core/profiling/trace/ProfileTaskLogRecord.java |    4 +-
 .../trace/ProfileTaskMutationService.java          |    2 +
 .../core/profiling/trace/ProfileTaskRecord.java    |    8 +-
 .../server/core/query/MetadataQueryService.java    |    9 +-
 .../server/core/query/ProcessTopologyBuilder.java  |  140 ++
 .../server/core/query/TopologyQueryService.java    |   14 +-
 .../oap/server/core/query/enumeration/Scope.java   |    3 +-
 .../input/EBPFProfilingNetworkTaskRequest.java     |   18 +-
 .../oap/server/core/query/input/Entity.java        |   20 +-
 .../oap/server/core/query/type/Call.java           |   10 +
 .../type/EBPFNetworkKeepProfilingResult.java}      |   24 +-
 .../server/core/query/type/EBPFProfilingTask.java  |   15 +
 .../oap/server/core/query/type/HeatMap.java        |    7 +-
 .../oap/server/core/query/type/Process.java        |    2 +
 .../type/ProcessNode.java}                         |   23 +-
 .../server/core/query/type/ProcessTopology.java}   |   20 +-
 .../oap/server/core/source/DefaultScopeDefine.java |   22 +
 .../oap/server/core/source/ProcessRelation.java    |   67 +
 .../oap/server/core/storage/IBatchDAO.java         |   10 +
 .../oap/server/core/storage/IHistoryDeleteDAO.java |   14 -
 .../oap/server/core/storage/PersistenceTimer.java  |    2 +
 .../core/storage/annotation/ElasticSearch.java     |   14 +
 .../core/storage/annotation/SQLDatabase.java       |   22 +
 .../core/storage/model/ElasticSearchExtension.java |    2 +
 .../oap/server/core/storage/model/Model.java       |    6 +-
 .../server/core/storage/model/StorageModels.java   |   48 +-
 .../profiling/ebpf/IEBPFProfilingTaskDAO.java      |   28 +-
 .../core/storage/query/IMetadataQueryDAO.java      |   46 +-
 .../core/storage/query/ITopologyQueryDAO.java      |   16 +
 .../server/core/storage/query/IZipkinQueryDAO.java |    6 +-
 .../core/storage/ttl/DataTTLKeeperTimer.java       |   36 +-
 .../ZipkinServiceRelationTraffic.java}             |  113 +-
 .../ZipkinServiceSpanTraffic.java}                 |   66 +-
 .../ZipkinServiceTraffic.java}                     |   79 +-
 .../oap/server/core/zipkin/ZipkinSpanRecord.java   |    4 +-
 .../dispatcher/ZipkinServiceDispatcher.java}       |   22 +-
 .../ZipkinServiceRelationDispatcher.java}          |   23 +-
 .../dispatcher/ZipkinServiceSpanDispatcher.java}   |   23 +-
 .../ZipkinSpanRecordDispatcher.java                |    4 +-
 .../source/ZipkinService.java}                     |   29 +-
 .../source/ZipkinServiceRelation.java}             |   33 +-
 .../source/ZipkinServiceSpan.java}                 |   33 +-
 .../core/zipkin/{ => source}/ZipkinSpan.java       |    5 +-
 .../sum/SumHistogramPercentileFunctionTest.java    |  254 ++++
 .../function/sumpermin/SumPerMinFunctionTest.java  |  132 ++
 .../core/analysis/metrics/PxxMetricsTest.java      |  170 ---
 .../server/core/storage/model/ModelColumnTest.java |   10 +-
 .../kafka-fetcher-plugin/pom.xml                   |    2 +-
 oap-server/server-fetcher-plugin/pom.xml           |    2 +-
 .../prometheus-fetcher-plugin/pom.xml              |    2 +-
 oap-server/server-health-checker/pom.xml           |    2 +-
 oap-server/server-library/library-client/pom.xml   |    2 +-
 .../client/elasticsearch/ElasticSearchClient.java  |   30 +-
 .../library-datacarrier-queue/pom.xml              |    2 +-
 .../library-elasticsearch-client/pom.xml           |    2 +-
 .../library/elasticsearch/bulk/BulkProcessor.java  |    2 +-
 .../elasticsearch/client/DocumentClient.java       |   31 +
 .../requests/factory/DocumentFactory.java          |    6 +
 .../requests/factory/v6/V6DocumentFactory.java     |   27 +
 .../requests/factory/v7/V7DocumentFactory.java     |   27 +
 .../library/elasticsearch/ITElasticSearchTest.java |   15 +
 .../library-kubernetes-support}/pom.xml            |   11 +-
 .../library/kubernetes/KubernetesClient.java       |   40 +
 .../kubernetes/KubernetesEndpointWatcher.java      |  107 ++
 .../kubernetes/KubernetesEndpointsListener.java    |   30 +
 .../library/kubernetes/KubernetesNodeListener.java |   30 +
 .../library/kubernetes/KubernetesNodeWatcher.java  |  106 ++
 .../library/kubernetes/KubernetesPodListener.java  |   30 +
 .../library/kubernetes/KubernetesPodWatcher.java   |  106 ++
 .../kubernetes/KubernetesServiceListener.java      |   30 +
 .../kubernetes/KubernetesServiceWatcher.java       |  106 ++
 oap-server/server-library/library-module/pom.xml   |    2 +-
 oap-server/server-library/library-server/pom.xml   |    2 +-
 oap-server/server-library/library-util/pom.xml     |    2 +-
 .../oap/server/library/util/ResourceUtils.java     |   18 -
 .../oap/server/library/util/ResourceUtilsTest.java |   10 +-
 oap-server/server-library/pom.xml                  |    3 +-
 oap-server/server-query-plugin/pom.xml             |    2 +-
 .../query-graphql-plugin/pom.xml                   |    2 +-
 .../resolver/EBPFProcessProfilingMutation.java     |   10 +
 .../resolver/EBPFProcessProfilingQuery.java        |    9 +-
 .../oap/query/graphql/resolver/TopologyQuery.java  |    5 +
 .../src/main/resources/query-protocol              |    2 +-
 .../zipkin-query-plugin/pom.xml                    |    2 +-
 .../handler/ZipkinQueryExceptionHandler.java       |   41 +
 .../query/zipkin/handler/ZipkinQueryHandler.java   |   14 +-
 .../pom.xml                                        |    2 +-
 .../envoy-metrics-receiver-plugin/pom.xml          |    7 +-
 .../receiver/envoy/als/k8s/K8SServiceRegistry.java |  307 ++--
 .../envoy/als/k8s/KubernetesNodeRegistry.java      |  129 --
 .../server/receiver/envoy/als/mx/FieldsHelper.java |    1 +
 .../receiver/envoy/als/mx/FieldsHelperTest.java    |   10 +-
 .../src/test/resources/field-helper.msg            |    2 +-
 .../otel-receiver-plugin/pom.xml                   |    2 +-
 .../oap/server/receiver/otel/Handler.java          |    7 +-
 .../receiver/otel/OtelMetricReceiverConfig.java    |    6 +-
 .../receiver/otel/OtelMetricReceiverProvider.java  |   14 +-
 .../server/receiver/otel/oc/OCMetricHandler.java   |   35 +-
 .../otel/otlp/OpenTelemetryMetricHandler.java      |  234 +++
 oap-server/server-receiver-plugin/pom.xml          |    2 +-
 .../server-receiver-plugin/receiver-proto/pom.xml  |    2 +-
 .../proto/collector/logs/v1/logs_service.proto     |   79 +
 .../collector/metrics/v1/metrics_service.proto     |   79 +
 .../proto/collector/trace/v1/trace_service.proto   |   79 +
 .../opentelemetry/proto/common/v1/common.proto     |   77 +
 .../proto/opentelemetry/proto/logs/v1/logs.proto   |  177 +++
 .../opentelemetry/proto/metrics/v1/metrics.proto   |  666 ++++++++
 .../opentelemetry/proto/resource/v1/resource.proto |   37 +
 .../proto/opentelemetry/proto/trace/v1/trace.proto |  280 ++++
 .../skywalking-browser-receiver-plugin/pom.xml     |    2 +-
 .../skywalking-clr-receiver-plugin/pom.xml         |    2 +-
 .../skywalking-ebpf-receiver-plugin/pom.xml        |    2 +-
 .../handler/EBPFProfilingServiceHandler.java       |   26 +-
 .../skywalking-event-receiver-plugin/pom.xml       |    2 +-
 .../skywalking-jvm-receiver-plugin/pom.xml         |    2 +-
 .../skywalking-log-recevier-plugin/pom.xml         |    2 +-
 .../skywalking-management-receiver-plugin/pom.xml  |    2 +-
 .../skywalking-mesh-receiver-plugin/pom.xml        |    2 +-
 .../skywalking-meter-receiver-plugin/pom.xml       |    2 +-
 .../skywalking-profile-receiver-plugin/pom.xml     |    2 +-
 .../skywalking-sharing-server-plugin/pom.xml       |    2 +-
 .../skywalking-trace-receiver-plugin/pom.xml       |    2 +-
 .../skywalking-zabbix-receiver-plugin/pom.xml      |    2 +-
 .../zabbix/provider/config/ZabbixConfig.java       |    2 +
 .../zipkin-receiver-plugin/pom.xml                 |    7 +-
 .../receiver/zipkin/ZipkinReceiverConfig.java      |   25 +
 .../receiver/zipkin/ZipkinReceiverProvider.java    |   52 +-
 .../zipkin/handler/ZipkinSpanHTTPHandler.java      |   44 +-
 .../server/receiver/zipkin/kafka/KafkaHandler.java |  158 ++
 .../server/receiver/zipkin/trace/SpanForward.java  |  102 +-
 oap-server/server-starter/pom.xml                  |    4 +-
 .../src/main/resources/alarm-settings.yml          |   22 +-
 .../src/main/resources/application.yml             |   30 +-
 .../src/main/resources/component-libraries.yml     |   26 +
 .../meter-analyzer-config/network-profiling.yaml   |  114 ++
 .../src/main/resources/oal/disable.oal             |    2 +-
 .../istio-controlplane.yaml                        |    0
 .../{otel-oc-rules => otel-rules}/k8s-cluster.yaml |    1 +
 .../k8s-instance.yaml                              |    1 +
 .../{otel-oc-rules => otel-rules}/k8s-node.yaml    |    0
 .../{otel-oc-rules => otel-rules}/k8s-service.yaml |    1 +
 .../src/main/resources/otel-rules/mysql.yaml       |   82 +
 .../{otel-oc-rules => otel-rules}/oap.yaml         |    0
 .../src/main/resources/otel-rules/postgresql.yaml  |  115 ++
 .../{otel-oc-rules => otel-rules}/vm.yaml          |    0
 .../browser/browser-app.json                       |  114 +-
 .../browser/browser-page.json                      |  254 +++-
 .../browser/browser-version.json                   |   76 +-
 .../faas/faas-function-relation.json               |  312 +++-
 .../faas/faas-function.json                        |  169 ++-
 .../faas/faas-instance-relation.json               |  290 +++-
 .../faas/faas-instance.json                        |   82 +-
 .../ui-initialized-templates/faas/faas-root.json   |    4 +-
 .../general/general-endpoint-relation.json         |   84 +-
 .../general/general-endpoint.json                  |  191 ++-
 .../general/general-instance-relation.json         |  288 +++-
 .../general/general-instance.json                  |  580 ++++++-
 .../general/general-root.json                      |   13 +
 .../general/general-service-relation.json          |  312 +++-
 .../general/general-service.json                   |  341 +++--
 .../k8s_service/k8s-process-relation.json          | 1586 +++++++++++++++++++
 .../k8s_service/k8s-service-pod.json               |   14 +
 .../mesh/mesh-endpoint.json                        |  193 ++-
 .../mesh/mesh-instance-relation.json               |  663 +++++++-
 .../mesh/mesh-instance.json                        |  163 +-
 .../mesh/mesh-service-relation.json                |  834 ++++++++--
 .../mesh/mesh-service.json                         |  275 +++-
 .../mesh_dp/mesh-data-plane-instance.json          |   73 +-
 .../mesh_dp/mesh-data-plane-process-relation.json  | 1587 ++++++++++++++++++++
 .../ui-initialized-templates/mysql/mysql-root.json |   63 +
 .../mysql/mysql-service.json                       |  333 ++++
 .../postgresql/postgresql-root.json                |   63 +
 .../postgresql/postgresql-service.json             |  700 +++++++++
 .../so11y_oap/so11y-instance.json                  |    4 +-
 .../virtual_database/virtual-database-service.json |   87 +-
 oap-server/server-storage-plugin/pom.xml           |    2 +-
 .../storage-banyandb-plugin/pom.xml                |    3 +-
 .../storage/plugin/banyandb/BanyanDBBatchDAO.java  |   46 +-
 .../banyandb/measure/BanyanDBMetadataQueryDAO.java |  147 +-
 .../banyandb/measure/BanyanDBTopologyQueryDAO.java |   39 +-
 .../banyandb/stream/AbstractBanyanDBDAO.java       |    4 +
 .../stream/BanyanDBEBPFProfilingTaskDAO.java       |   89 +-
 .../stream/BanyanDBProfileTaskQueryDAO.java        |    6 +-
 .../banyandb/stream/BanyanDBZipkinQueryDAO.java    |   10 +-
 .../storage-elasticsearch-plugin/pom.xml           |    2 +-
 .../plugin/elasticsearch/IndicesMetadataCache.java |   48 -
 .../StorageModuleElasticsearchConfig.java          |    8 +
 .../StorageModuleElasticsearchProvider.java        |    2 +
 .../elasticsearch/base/BatchProcessEsDAO.java      |   12 +-
 .../elasticsearch/base/ElasticSearchConverter.java |  100 ++
 .../elasticsearch/base/HistoryDeleteEsDAO.java     |   40 +-
 .../plugin/elasticsearch/base/IndexController.java |  149 +-
 .../plugin/elasticsearch/base/IndexStructures.java |    2 +-
 .../plugin/elasticsearch/base/ManagementEsDAO.java |    5 +-
 .../plugin/elasticsearch/base/MetricsEsDAO.java    |   97 +-
 .../plugin/elasticsearch/base/NoneStreamEsDAO.java |    5 +-
 .../plugin/elasticsearch/base/RecordEsDAO.java     |    5 +-
 .../elasticsearch/base/StorageEsInstaller.java     |   29 +-
 .../plugin/elasticsearch/base/TimeSeriesUtils.java |   28 +
 .../cache/NetworkAddressAliasEsDAO.java            |   34 +-
 .../elasticsearch/query/AggregationQueryEsDAO.java |   12 +-
 .../elasticsearch/query/AlarmQueryEsDAO.java       |    7 +-
 .../elasticsearch/query/BrowserLogQueryEsDAO.java  |    3 +
 .../query/EBPFProfilingDataEsDAO.java              |   15 +-
 .../query/EBPFProfilingScheduleEsDAO.java          |    8 +-
 .../query/EBPFProfilingTaskEsDAO.java              |   80 +-
 .../plugin/elasticsearch/query/LogQueryEsDAO.java  |   13 +-
 .../elasticsearch/query/MetadataQueryEsDAO.java    |  146 +-
 .../elasticsearch/query/MetricsQueryEsDAO.java     |   80 +-
 .../elasticsearch/query/ProfileTaskLogEsDAO.java   |    8 +-
 .../elasticsearch/query/ProfileTaskQueryEsDAO.java |    7 +-
 .../query/ProfileThreadSnapshotQueryEsDAO.java     |    7 +-
 .../elasticsearch/query/ServiceLabelEsDAO.java     |    6 +-
 .../query/TagAutoCompleteQueryDAO.java             |   10 +-
 .../elasticsearch/query/TopNRecordsQueryEsDAO.java |    3 +
 .../elasticsearch/query/TopologyQueryEsDAO.java    |  111 +-
 .../elasticsearch/query/TraceQueryEsDAO.java       |    7 +-
 .../query/UITemplateManagementEsDAO.java           |   14 +-
 .../query/zipkin/ZipkinQueryEsDAO.java             |  173 ++-
 .../elasticsearch/base/IndexStructuresTest.java    |    2 +
 .../elasticsearch/base/TimeSeriesUtilsTest.java    |   41 +-
 .../storage-jdbc-hikaricp-plugin/pom.xml           |    2 +-
 .../plugin/jdbc/h2/dao/H2AlarmQueryDAO.java        |    4 +-
 .../plugin/jdbc/h2/dao/H2EBPFProfilingTaskDAO.java |   80 +-
 .../plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java     |   11 +
 .../storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java  |    4 +-
 .../plugin/jdbc/h2/dao/H2MetadataQueryDAO.java     |  147 +-
 .../plugin/jdbc/h2/dao/H2ProfileTaskQueryDAO.java  |    5 +-
 .../plugin/jdbc/h2/dao/H2TopologyQueryDAO.java     |   50 +
 .../plugin/jdbc/h2/dao/H2TraceQueryDAO.java        |    4 +-
 .../plugin/jdbc/h2/dao/H2ZipkinQueryDAO.java       |  110 +-
 .../storage-tidb-plugin/pom.xml                    |    2 +-
 .../plugin/jdbc/tidb/TiDBHistoryDeleteDAO.java     |   13 +
 oap-server/server-telemetry/pom.xml                |    2 +-
 oap-server/server-telemetry/telemetry-api/pom.xml  |    2 +-
 .../server-telemetry/telemetry-prometheus/pom.xml  |    2 +-
 oap-server/server-testing/pom.xml                  |    2 +-
 oap-server/server-tools/data-generator/pom.xml     |    5 +-
 oap-server/server-tools/pom.xml                    |    2 +-
 oap-server/server-tools/profile-exporter/pom.xml   |    4 +-
 .../tool-profile-snapshot-bootstrap/pom.xml        |    4 +-
 .../tool-profile-snapshot-exporter/pom.xml         |    4 +-
 .../tool-profile-snapshot-server-mock/pom.xml      |    4 +-
 .../tool/profile/core/MockCoreModuleProvider.java  |    2 +-
 pom.xml                                            |    6 +-
 skywalking-ui                                      |    2 +-
 .../es/es-sharding}/docker-compose.yml             |   42 +-
 .../banyandb => alarm/es/es-sharding}/e2e.yaml     |   14 +-
 test/e2e-v2/cases/browser/browser-cases.yaml       |   94 ++
 test/e2e-v2/cases/browser/e2e.yaml                 |   80 +-
 test/e2e-v2/cases/browser/es/docker-compose.yml    |  136 ++
 .../{storage/banyandb => browser/es}/e2e.yaml      |   11 +-
 .../browser/es/es-sharding/docker-compose.yml      |  137 ++
 .../banyandb => browser/es/es-sharding}/e2e.yaml   |   13 +-
 test/e2e-v2/cases/istio/als/e2e.yaml               |    2 +-
 .../cases/istio/{kind.yaml => kind.k18.yaml}       |    8 +-
 .../cases/istio/{kind.yaml => kind.k19.yaml}       |    8 +-
 .../cases/istio/{kind.yaml => kind.k20.yaml}       |    8 +-
 test/e2e-v2/cases/istio/metrics/e2e.yaml           |    2 +-
 .../cases/kafka/log/expected/logs-filebeat.yml     |    1 +
 .../cases/kafka/log/expected/logs-fluentd.yml      |    1 +
 test/e2e-v2/cases/kafka/log/satellite_config.yaml  |    6 +-
 .../es/es-sharding}/docker-compose.yml             |   42 +-
 .../banyandb => log/es/es-sharding}/e2e.yaml       |    9 +-
 test/e2e-v2/cases/log/expected/logs.yml            |    7 +-
 .../expected/metrics-has-value.yml                 |    2 +-
 .../expected/service.yml}                          |   11 +-
 test/e2e-v2/cases/mysql/mysql-cases.yaml           |   55 +
 .../prometheus-mysql-exporter}/docker-compose.yml  |   37 +-
 .../prometheus-mysql-exporter}/e2e.yaml            |   15 +-
 .../mysql/prometheus-mysql-exporter/mock.sql}      |   30 +-
 .../otel-collector-config.yaml}                    |   35 +-
 .../expected/metrics-has-value-label.yml}          |    8 +-
 .../expected/metrics-has-value.yml                 |    2 +-
 .../expected/service.yml}                          |   11 +-
 .../postgres-exporter}/docker-compose.yml          |   41 +-
 .../postgres-exporter}/e2e.yaml                    |   15 +-
 .../cases/postgresql/postgres-exporter/mock.sql    |   26 +
 .../postgres-exporter/otel-collector-config.yaml}  |   36 +-
 test/e2e-v2/cases/postgresql/postgresql-cases.yaml |   58 +
 test/e2e-v2/cases/profiling/ebpf/network/e2e.yaml  |  102 ++
 .../profiling/ebpf/network/es-sharding/e2e.yaml    |  103 ++
 .../ebpf/network/expected/dependency-processs.yml  |  103 ++
 .../network/expected/metrics-has-value-label.yml}  |    6 +-
 .../ebpf/network}/expected/metrics-has-value.yml   |    2 +-
 .../profiling/ebpf/network/expected/process.yml    |   86 ++
 .../ebpf/network/expected/profiling-create.yml}    |    7 +-
 .../ebpf/network/expected/service-instance.yml}    |    7 +-
 .../profiling/ebpf/network/expected/service.yml    |   71 +
 .../istio => profiling/ebpf/network}/kind.yaml     |   19 +-
 .../profiling/ebpf/network/network-cases.yaml      |  100 ++
 .../istio => profiling/ebpf/network}/rover.yaml    |   13 +-
 .../ebpf/network/traffic-gen.yaml}                 |   48 +-
 .../ebpf/offcpu/expected/profiling-task-list.yml   |    2 +
 .../es-sharding}/docker-compose.yml                |   17 +-
 .../ebpf/oncpu/es/es-sharding}/e2e.yaml            |   14 +-
 .../ebpf/oncpu/expected/profiling-task-list.yml    |    2 +
 .../ebpf/oncpu/opensearch/docker-compose.yml       |    3 +-
 .../es/es-sharding}/docker-compose.yml             |   48 +-
 .../trace/es/es-sharding}/e2e.yaml                 |   16 +-
 test/e2e-v2/cases/rover/process/istio/kind.yaml    |    6 +-
 test/e2e-v2/cases/rover/process/istio/rover.yaml   |    1 +
 .../native-protocols/expected/logs-list.yml        |    5 +-
 test/e2e-v2/cases/simple/mtls/client/ca.crt        |   52 +-
 test/e2e-v2/cases/simple/mtls/client/client.crt    |   50 +-
 test/e2e-v2/cases/simple/mtls/client/client.pem    |  100 +-
 test/e2e-v2/cases/simple/mtls/server/ca.crt        |   52 +-
 test/e2e-v2/cases/simple/mtls/server/server.crt    |   50 +-
 test/e2e-v2/cases/simple/mtls/server/server.pem    |  100 +-
 test/e2e-v2/cases/storage/banyandb/e2e.yaml        |    5 +-
 test/e2e-v2/cases/storage/es/e2e.yaml              |    5 +-
 .../es/es-sharding}/docker-compose.yml             |   50 +-
 .../storage/{banyandb => es/es-sharding}/e2e.yaml  |    9 +-
 .../expected/dependency-endpoint-consumer.yml      |   53 +
 ...rvices.yml => dependency-endpoint-provider.yml} |   23 +-
 ...ndency-services.yml => dependency-instance.yml} |   22 +-
 ...rvices.yml => dependency-services-consumer.yml} |   19 +-
 ...rvices.yml => dependency-services-provider.yml} |   11 +
 ...-value.yml => metrics-has-value-percentile.yml} |   32 +-
 .../cases/storage/expected/metrics-has-value.yml   |    2 +-
 ...-endpoint.yml => service-endpoint-consumer.yml} |    6 +-
 ...has-value.yml => service-endpoint-provider.yml} |    6 +-
 ...-instance.yml => service-instance-consumer.yml} |   10 +-
 ...-instance.yml => service-instance-provider.yml} |    6 +-
 .../cases/storage/expected/trace-info-detail.yml   |   68 -
 .../cases/storage/expected/trace-users-detail.yml  |   54 +-
 test/e2e-v2/cases/storage/expected/traces-list.yml |    6 +-
 test/e2e-v2/cases/storage/h2/e2e.yaml              |    5 +-
 test/e2e-v2/cases/storage/mysql/e2e.yaml           |    5 +-
 test/e2e-v2/cases/storage/opensearch/e2e.yaml      |    5 +-
 test/e2e-v2/cases/storage/postgres/e2e.yaml        |    5 +-
 test/e2e-v2/cases/storage/storage-cases.yaml       |  129 +-
 test/e2e-v2/cases/storage/tidb/e2e.yaml            |    5 +-
 .../e2e-v2/cases/storage/tidb/tidbconfig/tidb.toml |    2 +-
 .../vm/prometheus-node-exporter/docker-compose.yml |    2 +-
 .../otel-collector-config.yaml                     |   10 +-
 .../es/es-sharding}/docker-compose.yml             |   54 +-
 .../banyandb => zipkin/es/es-sharding}/e2e.yaml    |    6 +-
 test/e2e-v2/cases/zipkin/kafka/docker-compose.yml  |  119 ++
 .../{storage/banyandb => zipkin/kafka}/e2e.yaml    |    4 +-
 .../java-test-service/e2e-mock-sender/pom.xml      |    9 +
 .../apache/skywalking/e2e/E2EConfiguration.java    |    3 +
 .../controller/ZipkinKafkaProduceController.java   |  118 ++
 .../src/main/resources/application.yml             |    5 +-
 test/e2e-v2/script/env                             |    8 +-
 .../script/prepare/setup-e2e-shell/install-yq.sh   |    2 +-
 .../script/prepare/setup-oap/download-mysql.sh     |    5 +
 tools/TLS/tls_key_generate.sh                      |    6 +-
 tools/dependencies/check-LICENSE.sh                |   38 -
 .../known-oap-backend-dependencies.txt             |  156 --
 tools/releasing/create_source_release.sh           |    1 +
 538 files changed, 20593 insertions(+), 4967 deletions(-)

diff --cc oap-server/server-starter/src/main/resources/application.yml
index 4ba7eb5ed3,9d6488e4d9..341aac6c29
mode 100755,100644..100644
--- a/oap-server/server-starter/src/main/resources/application.yml
+++ b/oap-server/server-starter/src/main/resources/application.yml

Reply via email to