This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch storage-elasticsearch-health
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 9f50fa8 nits
add 0339889 Fix backend-telemetry.md format (#5107)
add 7b9cbe2 Update NodeType.java (#5108)
add 8b46e5c Fix issue #3713 - Cannot get the TID (#5031)
add 62f7688 Fix issue 4965 (#5109)
add a5527de Merge branch 'master' into storage-elasticsearch-health
add 0cf9633 Polish codes
No new revisions were added by this update.
Summary of changes:
.../logback/v1/x/logstash/TraceIdJsonProvider.java | 15 +++--
.../org/apache/skywalking/apm/util/StringUtil.java | 8 +++
...PreparedStatementExecuteMethodsInterceptor.java | 12 ++--
.../TraceIdJsonProviderActivation.java} | 20 +++----
.../TraceIdJsonProviderInterceptor.java} | 19 +++---
.../src/main/resources/skywalking-plugin.def | 3 +-
docs/en/setup/backend/backend-setup.md | 4 +-
docs/en/setup/backend/backend-telemetry.md | 2 +-
.../src/main/resources/application.yml | 2 -
.../oap/server/core/analysis/NodeType.java | 2 +-
oap-server/server-library/library-client/pom.xml | 6 ++
.../client/elasticsearch/ElasticSearchClient.java | 19 +++---
...thListener.java => DelegatedHealthChecker.java} | 25 +++++---
.../{HealthListener.java => HealthCheckable.java} | 16 +++--
.../client/jdbc/hikaricp/JDBCHikariCPClient.java | 20 ++++---
...tringParseException.java => HealthChecker.java} | 18 ++++--
.../StorageModuleElasticsearchConfig.java | 2 -
.../StorageModuleElasticsearchProvider.java | 10 +---
.../StorageModuleElasticsearch7Provider.java | 10 +---
.../storage/plugin/jdbc/h2/H2StorageProvider.java | 7 +--
.../server/telemetry/api/HealthCheckMetrics.java} | 30 ++++------
.../oap/server/telemetry/api/MetricsCreator.java | 6 +-
.../mysql-scenario/config/expectedData.yaml | 69 +++++++++++++++++++++-
.../skywalking/apm/testcase/mysql/SQLExecutor.java | 21 ++++++-
.../testcase/mysql/controller/CaseController.java | 8 ++-
25 files changed, 237 insertions(+), 117 deletions(-)
copy
apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/{mdc/MDCConverterActivation.java
=> logstash/TraceIdJsonProviderActivation.java} (80%)
copy
apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/{mdc/PrintMDCTraceIdInterceptor.java
=> logstash/TraceIdJsonProviderInterceptor.java} (79%)
copy
oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/healthcheck/{HealthListener.java
=> DelegatedHealthChecker.java} (57%)
rename
oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/healthcheck/{HealthListener.java
=> HealthCheckable.java} (70%)
copy
oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/{ConnectStringParseException.java
=> HealthChecker.java} (75%)
rename
oap-server/{server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/healthcheck/HealthChecker.java
=>
server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/HealthCheckMetrics.java}
(59%)
