This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch bootstrap-cl in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 0b44556 Document updated for bootstrap instrumentation. add 8d234a9 Feature of database session in OAP server. (#3147) add 924f25f Self observability of OAP backend (#3140) add c35ec55 Merge branch 'master' into bootstrap-cl No new revisions were added by this update. Summary of changes: docker/oap/docker-entrypoint.sh | 9 +- docs/en/setup/backend/backend-telemetry.md | 28 +- .../oap/server/core/CoreModuleConfig.java | 1 + .../oap/server/core/CoreModuleProvider.java | 75 +--- .../oap/server/core/analysis/metrics/Metrics.java | 1 + .../server/core/analysis/metrics/PxxMetrics.java | 2 +- .../analysis/worker/MetricsPersistentWorker.java | 81 +++-- .../analysis/worker/MetricsStreamProcessor.java | 10 +- .../core/analysis/worker/PersistenceWorker.java | 15 +- .../server/core/analysis/worker/TopNWorker.java | 12 +- .../oap/server/core/storage/IMetricsDAO.java | 4 +- .../oap/server/core/storage/PersistenceTimer.java | 11 +- oap-server/server-receiver-plugin/pom.xml | 1 + .../pom.xml | 11 +- .../receiver/so11y/So11yReceiverConfig.java} | 7 +- .../receiver/so11y/So11yReceiverModule.java} | 12 +- .../so11y/So11yReceiverModuleProvider.java | 381 +++++++++++++++++++++ ...ywalking.oap.server.library.module.ModuleDefine | 2 +- ...alking.oap.server.library.module.ModuleProvider | 2 +- oap-server/server-starter/pom.xml | 10 + .../src/main/assembly/application.yml | 9 +- .../src/main/resources/application.yml | 16 +- .../server-starter/src/main/resources/log4j2.xml | 4 +- .../plugin/elasticsearch/base/MetricsEsDAO.java | 13 +- .../storage/plugin/jdbc/h2/dao/H2MetricsDAO.java | 15 +- oap-server/server-telemetry/pom.xml | 1 + .../oap/server/telemetry/TelemetryModule.java | 3 +- .../oap/server/telemetry/api/MetricFamily.java | 64 ++++ .../server/telemetry/api/MetricsCollector.java} | 16 +- .../telemetry/none/MetricsCollectorNoop.java} | 23 +- .../telemetry/none/NoneTelemetryProvider.java | 2 + .../{telemetry-api => telemetry-so11y}/pom.xml | 9 +- .../oap/server/telemetry/so11y/So11yConfig.java} | 17 +- .../telemetry/so11y/So11yMetricsCollector.java | 53 +++ .../telemetry/so11y/So11yMetricsCreator.java} | 24 +- .../telemetry/so11y/So11yTelemetryProvider.java} | 36 +- ...alking.oap.server.library.module.ModuleProvider | 3 +- 37 files changed, 788 insertions(+), 195 deletions(-) copy oap-server/server-receiver-plugin/{skywalking-clr-receiver-plugin => skywalking-so11y-receiver-plugin}/pom.xml (77%) copy oap-server/{server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmSettings.java => server-receiver-plugin/skywalking-so11y-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/so11y/So11yReceiverConfig.java} (84%) copy oap-server/{server-configuration/configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationTestModule.java => server-receiver-plugin/skywalking-so11y-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/so11y/So11yReceiverModule.java} (78%) create mode 100644 oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/so11y/So11yReceiverModuleProvider.java copy oap-server/server-receiver-plugin/{skywalking-jvm-receiver-plugin => skywalking-so11y-receiver-plugin}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine (92%) copy oap-server/{server-core => server-receiver-plugin/skywalking-so11y-receiver-plugin}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (91%) create mode 100644 oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/MetricFamily.java copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/IModelOverride.java => server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/MetricsCollector.java} (75%) copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/query/QueryModule.java => server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/none/MetricsCollectorNoop.java} (66%) copy oap-server/server-telemetry/{telemetry-api => telemetry-so11y}/pom.xml (78%) copy oap-server/{server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosConfig.java => server-telemetry/telemetry-so11y/src/main/java/org/apache/skywalking/oap/server/telemetry/so11y/So11yConfig.java} (73%) create mode 100644 oap-server/server-telemetry/telemetry-so11y/src/main/java/org/apache/skywalking/oap/server/telemetry/so11y/So11yMetricsCollector.java copy oap-server/server-telemetry/{telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusMetricsCreator.java => telemetry-so11y/src/main/java/org/apache/skywalking/oap/server/telemetry/so11y/So11yMetricsCreator.java} (58%) copy oap-server/server-telemetry/{telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusTelemetryProvider.java => telemetry-so11y/src/main/java/org/apache/skywalking/oap/server/telemetry/so11y/So11yTelemetryProvider.java} (68%) copy oap-server/{server-receiver-plugin/jaeger-receiver-plugin => server-telemetry/telemetry-so11y}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (92%)