This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a change to branch fix_browser_nodetype
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 72442eb fix h2 and influxdb
add dc05539 DataCarrier changes a `#consume` API to add properties as a
parameter to initialize consumer (#7452)
add cf08a2d refine backend doc (#7451)
add 4b66f1e fix: Fix MultiScopesAnalysisListener#setPublicAttrs log warn
frequently (#7271)
add ce45397 Fix kafka-reporter-plugin shade package conflict (#7463)
add 77bf5de Polish otel receiver doc (#7464)
add 39d23c1 Remove the duplicated tags to reduce the storage payload.
(#7469)
add 6bb4d35 Add all agent config to `agent.conf` file for convenient
containerization use cases (#7470)
add 1af2e46 Add a new API to test log analysis language (#7475)
add 09cc0f9 Harden the security of Groovy-based DSL, MAL and LAL (#7485)
add c04b4e0 Fix distinct in Service/Instance/Endpoint query is not
working. (#7482)
add ad0042f Add missing property set for new field
`httpResponseStatusCode` (#7486)
add cf03304 Simplify GitHub workflows by using `uses` in `composite`
actions (#7487)
add 8bd6520 Change the slack joining guidance. (#7512)
add 8f7d16a Refine backend doc (#1) (#7522)
add fb0f2cf sync ui (#7523)
add 1e87d2c sync ui (#7525)
add c133801 Use skywalking-eyes GHA instead of manually compile (#7524)
add 6d3a33e Add doc anchor (#7528)
add 7b20645 Fix NPE when OAP nodes synchronize events with each other in
cluster mode (#7531)
add a2e011f Kafka extra producer configuration enhancement (#7526)
add abcd87f Support collection type in dynamic configuration core and add
zookeeper implementation (#7509)
add db2bc93 Separate agent docs to avoid long single page. (#7537)
new a56a6af Merge branch 'master' of https://github.com/apache/skywalking
into fix_browser_nodetype
new 1f07f60 update CHANGES.md
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/actions/e2e-test/action.yml | 17 +-
.github/actions/plugins-test/action.yml | 17 +-
.github/workflows/ci-it.yaml | 10 +-
.github/workflows/codeql.yaml | 2 +-
.github/workflows/e2e.alarm.yaml | 8 -
.github/workflows/e2e.cluster.yaml | 8 -
.github/workflows/e2e.compat.yaml | 8 -
.github/workflows/e2e.event.yaml | 8 -
.github/workflows/e2e.go.yaml | 8 -
.github/workflows/e2e.istio.yaml | 12 +-
.github/workflows/e2e.jdk-versions.yaml | 8 -
.github/workflows/e2e.js.yaml | 16 -
.github/workflows/e2e.kafka.yaml | 8 -
.github/workflows/e2e.log.yaml | 16 -
.github/workflows/e2e.nodejs.yaml | 8 -
.github/workflows/e2e.php.yaml | 8 -
.github/workflows/e2e.profiling.yaml | 8 -
.github/workflows/e2e.python.yaml | 8 -
.github/workflows/e2e.so11y.yaml | 8 -
.github/workflows/e2e.storages.yaml | 9 -
.github/workflows/e2e.ttl.yaml | 8 -
.github/workflows/e2e.yaml | 16 -
.github/workflows/plugins-jdk14-test.0.yaml | 7 -
.github/workflows/plugins-test.0.yaml | 7 -
.github/workflows/plugins-test.1.yaml | 7 -
.github/workflows/plugins-test.2.yaml | 7 -
.github/workflows/plugins-test.3.yaml | 13 +-
CHANGES.md | 20 +-
README.md | 4 +-
.../apm/commons/datacarrier/DataCarrier.java | 11 +-
.../datacarrier/consumer/ConsumeDriver.java | 22 +-
.../commons/datacarrier/consumer/IConsumer.java | 3 +-
.../apm/commons/datacarrier/DataCarrierTest.java | 3 +-
.../commons/datacarrier/consumer/ConsumerTest.java | 3 +-
.../datacarrier/consumer/SampleConsumer.java | 3 +-
.../tag/{StringTag.java => IntegerTag.java} | 21 +-
.../apm/agent/core/context/tag/Tags.java | 8 +-
.../agent/core/remote/LogReportServiceClient.java | 3 +-
.../core/remote/TraceSegmentServiceClient.java | 3 +-
.../asynchttpclient/v2/AsyncHandlerWrapper.java | 2 +-
.../http/v9/DefaultHttpClientInterceptor.java | 2 +-
.../http/v9/LoadBalancerHttpClientInterceptor.java | 2 +-
.../plugin/grpc/v1/client/TracingClientCall.java | 20 +-
.../plugin/grpc/v1/server/TracingServerCall.java | 9 +-
.../v4/HttpClientExecuteInterceptor.java | 2 +-
.../wrapper/HttpAsyncResponseConsumerWrapper.java | 2 +-
.../v3/HttpClientExecuteInterceptor.java | 2 +-
.../plugin/jetty/v9/server/HandleInterceptor.java | 2 +-
.../jsonrpc4j/JsonServiceExporterInterceptor.java | 2 +-
.../plugin/light4j/HandleRequestInterceptor.java | 2 +-
.../nutz/http/sync/SenderSendInterceptor.java | 2 +-
.../plugin/nutz/mvc/ActionMethodInterceptor.java | 2 +-
.../plugin/okhttp/common/RealCallInterceptor.java | 2 +-
.../apm/plugin/play/v2x/TracingFilter.java | 2 +-
.../server/SynchronousDispatcherInterceptor.java | 2 +-
.../ProducerOperationHandlerInterceptor.java | 2 +-
.../TransportClientHandlerInterceptor.java | 2 +-
.../v1/ProducerOperationHandlerInterceptor.java | 2 +-
.../v1/TransportClientHandlerInterceptor.java | 2 +-
.../plugin/spring/mvc/v5/InvokeInterceptor.java | 2 +-
.../interceptor/AbstractMethodInterceptor.java | 2 +-
.../resttemplate/sync/RestResponseInterceptor.java | 2 +-
.../v5/webclient/WebFluxWebClientInterceptor.java | 2 +-
.../apm/plugin/struts2/Struts2Interceptor.java | 2 +-
.../plugin/tomcat78x/TomcatInvokeInterceptor.java | 2 +-
.../undertow/v2x/handler/TracingHandler.java | 2 +-
...ClientRequestImplHandleResponseInterceptor.java | 2 +-
...tpContextHandleDispatchResponseInterceptor.java | 2 +-
.../vertx3/HttpServerResponseImplInterceptor.java | 2 +-
.../jdk/http/HttpClientParseHttpInterceptor.java | 2 +-
apm-sniffer/config/agent.config | 245 +++++++---
.../gateway/v20x/HttpClientRequestInterceptor.java | 2 +-
...ientFinalizerResponseConnectionInterceptor.java | 2 +-
...ientFinalizerResponseConnectionInterceptor.java | 2 +-
.../DispatcherHandlerHandleMethodInterceptor.java | 10 +-
.../kafka-reporter-plugin/pom.xml | 75 +--
.../apm/agent/core/kafka/KafkaProducerManager.java | 27 +-
.../core/kafka/KafkaReporterPluginConfig.java | 13 +-
.../core/kafka/KafkaTraceSegmentServiceClient.java | 3 +-
docs/en/concepts-and-designs/scope-definitions.md | 28 +-
docs/en/guides/Java-Plugin-Development-Guide.md | 2 +-
docs/en/setup/backend/backend-receivers.md | 10 +-
docs/en/setup/backend/backend-start-up-mode.md | 22 +-
docs/en/setup/backend/backend-storage.md | 97 ++--
docs/en/setup/backend/backend-telemetry.md | 47 +-
docs/en/setup/backend/backend-token-auth.md | 23 +-
docs/en/setup/backend/backend-vm-monitoring.md | 10 +-
docs/en/setup/backend/backend-zabbix.md | 16 +-
docs/en/setup/backend/configuration-vocabulary.md | 506 ++++++++++-----------
docs/en/setup/backend/dynamic-config.md | 42 +-
docs/en/setup/backend/dynamical-logging.md | 24 +-
docs/en/setup/backend/endpoint-grouping-rules.md | 68 +--
.../java-agent/How-to-enable-kafka-reporter.md | 19 -
docs/en/setup/service-agent/java-agent/README.md | 155 +------
.../service-agent/java-agent/advanced-features.md | 15 +
.../service-agent/java-agent/advanced-reporters.md | 35 ++
.../java-agent/{README.md => configurations.md} | 155 +------
.../service-agent/java-agent/logic-endpoint.md | 12 +
docs/menu.yml | 10 +-
.../analyzer/provider/trace/parser/SpanTags.java | 9 +
.../listener/MultiScopesAnalysisListener.java | 11 +-
.../parser/listener/SegmentAnalysisListener.java | 8 +-
.../trace/parser/listener/SourceBuilder.java | 21 +
.../TraceLatencyThresholdsAndWatcherTest.java | 6 +
.../provider/trace/TraceSampleRateWatcherTest.java | 6 +
.../skywalking/oap/log/analyzer/dsl/Binding.java | 45 ++
.../skywalking/oap/log/analyzer/dsl/DSL.java | 25 +
.../analyzer/dsl/spec/extractor/ExtractorSpec.java | 18 +-
.../log/analyzer/dsl/spec/filter/FilterSpec.java | 21 +-
.../log/listener/RecordAnalysisListener.java | 2 +
.../oap/log/analyzer/dsl/DSLSecurityTest.java | 140 ++++++
.../skywalking/oap/meter/analyzer/dsl/DSL.java | 29 ++
.../exporter/provider/grpc/GRPCExporter.java | 3 +-
.../exporter/provider/grpc/GRPCExporterTest.java | 2 +-
.../src/main/resources/application.yml | 5 +
.../configuration/api/ConfigChangeWatcher.java | 6 +
.../oap/server/configuration/api/ConfigTable.java | 2 +-
.../configuration/api/ConfigWatcherRegister.java | 163 +++++--
.../api/GroupConfigChangeWatcher.java} | 34 +-
.../{ConfigTable.java => GroupConfigTable.java} | 23 +-
.../api/ConfigWatcherRegisterTest.java | 62 ++-
.../apollo/ApolloConfigWatcherRegister.java | 7 +
.../consul/ConsulConfigurationWatcherRegister.java | 7 +
.../etcd/EtcdConfigWatcherRegister.java | 7 +
.../ConfigmapConfigurationWatcherRegister.java | 7 +
.../nacos/NacosConfigWatcherRegister.java | 7 +
.../zookeeper/ZookeeperConfigWatcherRegister.java | 30 +-
.../zookeeper/it/ITZookeeperConfigurationTest.java | 53 ++-
.../it/MockZookeeperConfigurationProvider.java | 38 +-
.../ut/MockZookeeperConfigWatcherRegister.java | 6 +
.../grpc/GRPCConfigWatcherRegister.java | 7 +
.../analysis/worker/MetricsAggregateWorker.java | 3 +-
.../analysis/worker/MetricsPersistentWorker.java | 3 +-
.../server/core/analysis/worker/TopNWorker.java | 3 +-
.../oap/server/core/query/type/Database.java | 5 +-
.../oap/server/core/query/type/Endpoint.java | 2 +
.../oap/server/core/query/type/Service.java | 2 +
.../server/core/query/type/ServiceInstance.java | 2 +
.../core/remote/client/GRPCRemoteClient.java | 3 +-
.../skywalking/oap/server/core/source/All.java | 7 +
.../oap/server/core/source/Endpoint.java | 7 +
.../oap/server/core/source/EndpointRelation.java | 7 +
.../skywalking/oap/server/core/source/Event.java | 3 +-
.../skywalking/oap/server/core/source/Service.java | 7 +
.../oap/server/core/source/ServiceInstance.java | 7 +
.../core/source/ServiceInstanceRelation.java | 7 +
.../oap/server/core/source/ServiceRelation.java | 7 +
.../core/analysis/ApdexThresholdConfigTest.java | 6 +
.../query-graphql-plugin/pom.xml | 7 +-
.../oap/query/graphql/GraphQLQueryConfig.java | 4 +-
.../oap/query/graphql/GraphQLQueryProvider.java | 6 +-
.../oap/query/graphql/resolver/LogTestQuery.java | 128 ++++++
.../oap/query/graphql/type/LogTestRequest.java} | 9 +-
.../type/{TimeInfo.java => LogTestResponse.java} | 18 +-
.../oap/query/graphql/type/Metrics.java} | 20 +-
.../src/main/resources/query-protocol | 2 +-
.../query/graphql/resolver/LogTestQueryTest.java | 129 ++++++
.../receiver/mesh/TelemetryDataDispatcher.java | 6 +
.../server/receiver/trace/mock/ServiceAMock.java | 4 +-
.../listener/MultiScopesAnalysisListenerTest.java | 9 +-
.../storage/plugin/jdbc/h2/dao/H2BatchDAO.java | 3 +-
skywalking-ui | 2 +-
test/e2e/e2e-test/docker/Dockerfile.provider | 4 -
test/e2e/e2e-test/docker/kafka/Dockerfile.provider | 8 +-
.../config/expectedData.yaml | 2 +-
.../config/expectedData.yaml | 2 +-
.../config/expectedData.yaml | 4 +-
.../config/expectedData.yaml | 4 +-
.../gateway-3.x-scenario/config/expectedData.yaml | 4 +-
.../grpc-scenario/config/expectedData.yaml | 10 +-
.../config/expectedData.yaml | 2 +-
.../config/expectedData.yaml | 2 +-
.../config/expectedData.yaml | 2 +-
.../config/expectedData.yaml | 8 +-
.../config/expectedData.yaml | 16 +-
.../config/expectedData.yaml | 16 +-
.../webflux-scenario/config/expectedData.yaml | 26 +-
177 files changed, 2123 insertions(+), 1351 deletions(-)
copy
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/{StringTag.java
=> IntegerTag.java} (73%)
delete mode 100644
docs/en/setup/service-agent/java-agent/How-to-enable-kafka-reporter.md
create mode 100644 docs/en/setup/service-agent/java-agent/advanced-features.md
create mode 100644 docs/en/setup/service-agent/java-agent/advanced-reporters.md
copy docs/en/setup/service-agent/java-agent/{README.md => configurations.md}
(60%)
mode change 100755 => 100644
create mode 100644 docs/en/setup/service-agent/java-agent/logic-endpoint.md
create mode 100644
oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/dsl/DSLSecurityTest.java
copy
oap-server/{server-testing/src/main/java/org/apache/skywalking/oap/server/testing/module/ModuleManagerTesting.java
=>
server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/GroupConfigChangeWatcher.java}
(51%)
copy
oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/{ConfigTable.java
=> GroupConfigTable.java} (65%)
create mode 100644
oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQuery.java
copy
oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Endpoint.java
=>
server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/LogTestRequest.java}
(86%)
copy
oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/{TimeInfo.java
=> LogTestResponse.java} (80%)
copy
oap-server/{analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/counter/ID.java
=>
server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/Metrics.java}
(75%)
create mode 100644
oap-server/server-query-plugin/query-graphql-plugin/src/test/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQueryTest.java
