This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch feature/envoy-tcp-log
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
discard 9dbcb15 Polish the status and add todo item
discard 20fa717 feature: Envoy access log receiver supports TCP logs
add 64ff030 test: add JDK 15 into test matrix (#6082)
add 16d441f Refine Component-library-settings.md (#6734)
add cbb6710 Fix K8s monitoring the incorrect metrics calculates. (#6739)
add aecb1b3 Add some defensive codes of new protobuffers' semantics
(#6737)
add 2af2103 Refine guides (#6741)
add a3d60a7 [Plugin] add Lua kong component ID (#6748)
add b472703 Add `trace_segment_ref_limit_per_span` configuration
mechanism to avoid OOM (#6715)
add 254a7b6 Refine How-to-release.md (#6754)
add be031ca Add APISIX plugin component id (#6757)
add b2216f9 Refine Java-Plugin-Development-Guide.md (#6756)
add bc1043e GlobalIdGenerator will produce a negative id when the time
shift back (#6729)
add 3a7d6c0 Add an agent plugin to support elasticsearch7 (#6759)
add 7f2dc00 DingtalkHook polish (#6773)
add f0ee75c Polish the doc of log feature (#6772)
add eba7a5f Sync all submodules. (#6777)
add e898886 feature: jsonrpc4j plugin (#6743)
add 10c4747 Add Docker image doc (#6780)
add 1fb2b01 fix: Receiver_zipkin missing ServiceInstanceID bug #6749
(#6763)
add 527d772 SkyWalking support Seata plugin (#6579)
add 2122990 Resolves #6751 - added kafka consumer assign method
interception to p… (#6753)
add 8fdae69 sync ui (#6793)
add 95feda2 Refine Java-Plugin-Development-Guide.md (#6796)
add 8ba5e01 Generate the corresponding event information for the alert.
(#6702)
add 4b6c620 Re-statement self-observability doc (#6802)
add 2d2ded4 Refine Plugin-test.md (#6805)
add 16b51d5 Support print SkyWalking context to logs (#6795)
add b4114ac enhancement agent kafka reporter plugin, add namespace
concept (#6781)
add 10e89aa Pin the openjdk docker version (#6814)
add 12fb38c optimize alarm (#6816)
add 0500e0f Refine README.md (#6818)
add 6c11787 Update architecture graph. (#6823)
add dbc62f8 Update README.md (#6824)
add 7a53331 Support alarm tags (#6820)
add 77ef3da Update commit hash for browser agent (#6812)
add f810246 fix a bug that bad namespace spell in agent.config (#6829)
add 883bd15 sync ui (#6830)
add b033dbe feature: Envoy access log receiver supports TCP logs
add 8349b80 Polish the status and add todo item
add 0a8dc72 Add TCP throughput and some basic metrics, will add more
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (9dbcb15)
\
N -- N -- N refs/heads/feature/envoy-tcp-log (0a8dc72)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.github/actions/skip/action.yml | 1 +
.../{e2e.jdk-versions.yaml => e2e.alarm.yaml} | 33 +-
.github/workflows/e2e.jdk-versions.yaml | 2 +-
.github/workflows/e2e.yaml | 2 -
.github/workflows/plugins-test.3.yaml | 1 +
CHANGES.md | 23 +-
README.md | 4 +-
...java => SkyWalkingContextPatternConverter.java} | 8 +-
.../log/log4j/v1/x/TraceIdPatternConverter.java | 2 +-
.../log/log4j/v1/x/TraceIdPatternLayout.java | 2 +-
.../log/log4j/v1/x/TraceIdPatternParser.java | 11 +-
.../log/log4j/v2/x/Log4j2OutputAppender.java | 2 +-
... => Log4j2SkyWalkingContextOutputAppender.java} | 6 +-
.../log/log4j/v2/x/SkyWalkingContextConverter.java | 53 +++
.../log/logback/v1/x/LogbackPatternConverter.java | 2 +-
... LogbackSkyWalkingContextPatternConverter.java} | 8 +-
.../logback/v1/x/TraceIdPatternLogbackLayout.java | 3 +-
.../x/logstash/SkyWalkingContextJsonProvider.java | 50 +++
.../v1/x/mdc/LogbackMDCPatternConverter.java | 24 +-
.../v1/x/mdc/TraceIdMDCPatternLogbackLayout.java | 3 +-
.../network/trace/component/ComponentsDefine.java | 4 +
apm-protocol/apm-network/src/main/proto | 2 +-
.../skywalking/apm/agent/core/conf/Config.java | 5 +
.../apm/agent/core/context/TracingContext.java | 6 +-
.../core/context/ids/DistributedTraceIds.java | 44 --
.../agent/core/context/ids/GlobalIdGenerator.java | 13 +-
.../core/context/trace/AbstractTracingSpan.java | 7 +
.../apm/agent/core/context/trace/TraceSegment.java | 53 ++-
.../apm/agent/core/context/ContextManagerTest.java | 9 +-
.../apm/plugin/dubbo/DubboInterceptorTest.java | 2 +-
.../apm/plugin/dubbo/DubboInterceptorTest.java | 2 +-
.../define/AdapterActionFutureInstrumentation.java | 17 +-
...terActionFutureActionGetMethodsInterceptor.java | 23 +-
.../elasticsearch/v6/interceptor/Constants.java | 1 +
.../elasticsearch-7.x-plugin/pom.xml | 52 +++
.../define/AdapterActionFutureInstrumentation.java | 21 +-
...terActionFutureActionGetMethodsInterceptor.java | 28 +-
.../src/main/resources/skywalking-plugin.def | 3 +-
.../ServerTracingFilterInterceptorTest.java | 2 +-
.../jetty/v9/server/HandleInterceptorTest.java | 2 +-
.../apm-sdk-plugin/jsonrpc4j-1.x-plugin/pom.xml | 57 +++
.../JsonRpcBasicServerInvokeInterceptor.java} | 24 +-
.../apm/plugin/jsonrpc4j/JsonRpcConstants.java | 17 +-
.../jsonrpc4j/JsonRpcHttpClientInterceptor.java | 82 ++++
...RpcHttpClientPrepareConnectionInterceptor.java} | 39 +-
.../apm/plugin/jsonrpc4j/JsonRpcPeerInfo.java | 43 +-
.../jsonrpc4j/JsonServiceExporterInterceptor.java | 82 ++++
.../define/JsonRpcBasicServerInstrumentation.java} | 57 ++-
.../define/JsonRpcHttpClientInstrumentation.java | 116 ++++++
.../JsonServiceExporterInstrumentation.java} | 57 ++-
.../src/main/resources/skywalking-plugin.def | 5 +-
.../plugin/jsonrpc4j/JsonRpcHttpClientTests.java | 121 ++++++
.../apm/plugin/jsonrpc4j/JsonRpcServerTests.java | 136 ++++++
.../apm/plugin/kafka/AssignMethodInterceptor.java} | 28 +-
.../kafka/define/KafkaConsumerInstrumentation.java | 22 +-
.../plugin/kafka/AssignMethodInterceptorTest.java | 70 ++++
.../apm/plugin/kafka/CallbackInterceptorTest.java | 12 +-
.../plugin/kafka/KafkaConsumerInterceptorTest.java | 6 +-
.../plugin/motan/MotanProviderInterceptorTest.java | 7 +-
apm-sniffer/apm-sdk-plugin/pom.xml | 2 +
.../pulsar/PulsarConsumerInterceptorTest.java | 6 +-
.../plugin/pulsar/SendCallbackInterceptorTest.java | 12 +-
.../SynchronousDispatcherInterceptorTest.java | 2 +-
.../apm/plugin/sjdbc/InterceptorTest.java | 4 +-
.../sofarpc/SofaRpcProviderInterceptorTest.java | 2 +-
.../apm/plugin/struts2/Struts2InterceptorTest.java | 2 +-
.../plugin/tomcat78x/TomcatInvokeInterceptor.java | 4 +-
.../tomcat78x/TomcatInvokeInterceptorTest.java | 2 +-
.../plugin/undertow/v2x/TracingHandlerTest.java | 2 +-
.../v1/x/PrintSkyWalkingContextInterceptor.java} | 17 +-
...yWalkingContextPatternConverterActivation.java} | 41 +-
.../src/main/resources/skywalking-plugin.def | 1 +
.../x/SkyWalkingContextConverterActivation.java} | 26 +-
...yWalkingContextConverterMethodInterceptor.java} | 20 +-
.../v2/x/TraceIdConverterMethodInterceptor.java | 7 +-
.../v2/x/async/AsyncAppenderMethodInterceptor.java | 6 +-
.../async/AsyncLoggerConfigMethodInterceptor.java | 8 +-
.../async/Log4jLogEventConstructorInterceptor.java | 5 +-
.../async/RingBufferLogEventMethodInterceptor.java | 7 +-
.../src/main/resources/skywalking-plugin.def | 1 +
...yWalkingContextPatternConverterActivation.java} | 41 +-
...java => PrintSkyWalkingContextInterceptor.java} | 14 +-
.../log/logback/v1/x/PrintTraceIdInterceptor.java | 7 +-
.../async/AsyncAppenderBaseMethodInterceptor.java | 6 +-
.../SkyWalkingContextJsonProviderActivation.java} | 20 +-
... SkyWalkingContextJsonProviderInterceptor.java} | 14 +-
.../x/logstash/TcpSocketAppenderInterceptor.java | 8 +-
.../x/logstash/TraceIdJsonProviderInterceptor.java | 7 +-
.../logback/v1/x/mdc/MDCConverterActivation.java | 26 +-
...a => PrintMDCSkyWalkingContextInterceptor.java} | 15 +-
.../v1/x/mdc/PrintMDCTraceIdInterceptor.java | 7 +-
.../src/main/resources/skywalking-plugin.def | 2 +
.../logging/common/log/SkyWalkingContext.java | 48 +++
.../opentracing/SkywalkingSpanActivationTest.java | 11 +-
apm-sniffer/config/agent.config | 2 +
.../agent/core/kafka/KafkaConnectionStatus.java | 10 +-
.../core/kafka/KafkaConnectionStatusListener.java | 10 +-
.../kafka/KafkaContextManagerExtendService.java | 9 +-
.../agent/core/kafka/KafkaJVMMetricsSender.java | 31 +-
.../apm/agent/core/kafka/KafkaMeterSender.java | 18 +-
.../apm/agent/core/kafka/KafkaProducerManager.java | 100 +++--
.../core/kafka/KafkaProfileSnapshotSender.java | 17 +-
.../core/kafka/KafkaReporterPluginConfig.java | 2 +
.../kafka/KafkaServiceManagementServiceClient.java | 18 +-
.../core/kafka/KafkaTraceSegmentServiceClient.java | 17 +-
.../agent/core/kafka/KafkaProducerManagerTest.java | 69 ++++
dist-material/config-examples/alarm-settings.yml | 4 +
docs/en/concepts-and-designs/event.md | 8 +
docs/en/guides/Component-library-settings.md | 26 +-
docs/en/guides/E2E-local-remote-debug.md | 6 +-
docs/en/guides/How-to-build.md | 50 +--
docs/en/guides/How-to-release.md | 129 +++---
docs/en/guides/Java-Plugin-Development-Guide.md | 241 ++++++-----
docs/en/guides/Plugin-test.md | 91 ++--
docs/en/guides/README.md | 64 ++-
docs/en/setup/backend/backend-alarm.md | 32 +-
docs/en/setup/backend/backend-fetcher.md | 12 +-
docs/en/setup/backend/backend-telemetry.md | 83 ++--
docs/en/setup/backend/configuration-vocabulary.md | 2 +
docs/en/setup/backend/log-analyzer.md | 18 +-
.../java-agent/Application-toolkit-log4j-1.x.md | 10 +-
.../java-agent/Application-toolkit-log4j-2.x.md | 8 +-
.../java-agent/Application-toolkit-logback-1.x.md | 33 +-
.../setup/service-agent/java-agent/Plugin-list.md | 2 +
docs/en/setup/service-agent/java-agent/README.md | 2 +
.../service-agent/java-agent/Supported-list.md | 1 +
.../service-agent/java-agent/containerization.md | 50 +++
docs/menu.yml | 8 +-
oap-server/server-alarm-plugin/pom.xml | 5 +
.../oap/server/core/alarm/provider/AlarmCore.java | 4 +-
.../core/alarm/provider/AlarmModuleProvider.java | 4 +-
.../oap/server/core/alarm/provider/AlarmRule.java | 2 +
.../core/alarm/provider/CompositeAlarmRule.java | 3 +
.../alarm/provider/CompositeRuleEvaluator.java | 4 +
.../core/alarm/provider/EventHookCallback.java | 153 +++++++
.../server/core/alarm/provider/NotifyHandler.java | 6 +-
.../server/core/alarm/provider/RulesReader.java | 4 +-
.../server/core/alarm/provider/RunningRule.java | 6 +
.../provider/dingtalk/DingtalkHookCallback.java | 13 +-
.../core/alarm/provider/grpc/GRPCCallback.java | 6 +-
.../src/main/proto/alarm-hook.proto | 11 +
.../core/alarm/provider/AlarmRulesWatcherTest.java | 5 +
.../alarm/provider/CompositeRuleEvaluatorTest.java | 27 +-
.../core/alarm/provider/EventHookCallbackTest.java | 133 ++++++
.../core/alarm/provider/NotifyHandlerTest.java | 6 +-
.../core/alarm/provider/RunningRuleTest.java | 37 +-
.../alarm/provider/grpc/GRPChookCallbackTest.java | 5 +-
.../src/main/resources/alarm-settings.yml | 2 +
.../src/main/resources/application.yml | 4 +
.../src/main/resources/component-libraries.yml | 15 +-
.../src/main/resources/oal/core.oal | 15 +
.../src/main/resources/otel-oc-rules/envoy.yaml | 40 ++
.../src/main/resources/otel-oc-rules/k8s-node.yaml | 6 +-
.../main/resources/otel-oc-rules/k8s-service.yaml | 10 +-
.../resources/ui-initialized-templates/apm.yml | 62 ++-
.../ui-initialized-templates/istio-dp.yml | 57 ++-
.../config/ApplicationConfigLoaderTestCase.java | 15 +-
.../oap/server/core/CoreModuleConfig.java | 9 +-
.../oap/server/core/alarm/AlarmMessage.java | 5 +
.../oap/server/core/alarm/AlarmRecord.java | 26 ++
.../core/alarm/AlarmStandardPersistence.java | 34 +-
.../oap/server/core/config/ConfigService.java | 2 +
.../oap/server/core/query/AlarmQueryService.java | 7 +-
.../oap/server/core/query/type/AlarmMessage.java | 8 +
.../skywalking/oap/server/core/source/Service.java | 3 +
.../oap/server/core/source/ServiceInstance.java | 4 +
.../core/source/ServiceInstanceRelation.java | 3 +
.../oap/server/core/source/ServiceRelation.java | 3 +
.../oap/server/core/source/TCPInfo.java} | 20 +-
.../server/core/storage/query/IAlarmQueryDAO.java | 28 +-
.../agent/kafka/module/KafkaFetcherConfig.java | 2 +
.../provider/handler/AbstractKafkaHandler.java | 54 +++
.../kafka/provider/handler/JVMMetricsHandler.java | 15 +-
.../provider/handler/MeterServiceHandler.java | 14 +-
.../kafka/provider/handler/ProfileTaskHandler.java | 15 +-
.../provider/handler/ServiceManagementHandler.java | 14 +-
.../provider/handler/TraceSegmentHandler.java | 17 +-
.../provider/handler/AbstractKafkaHandlerTest.java | 86 ++++
.../oap/query/graphql/resolver/AlarmQuery.java | 16 +-
.../src/main/resources/query-protocol | 2 +-
.../envoy/als/LogEntry2MetricsAdapter.java | 16 +-
.../server/receiver/envoy/als/k8s/Addresses.java} | 30 +-
.../als/k8s/K8sALSServiceMeshHTTPAnalysis.java | 20 +-
.../envoy/als/tcp/TCPLogEntry2MetricsAdapter.java | 8 +
.../receiver/mesh/TelemetryDataDispatcher.java | 8 +
.../receiver/zipkin/ZipkinReceiverConfig.java | 4 +
.../receiver/zipkin/handler/SpanProcessor.java | 3 +-
.../server/receiver/zipkin/trace/SpanForward.java | 20 +-
.../elasticsearch/query/AlarmQueryEsDAO.java | 27 +-
.../elasticsearch7/query/AlarmQueryEs7DAO.java | 20 +-
.../plugin/influxdb/base/InfluxInsertRequest.java | 3 +-
.../storage/plugin/influxdb/base/RecordDAO.java | 3 +
.../storage/plugin/influxdb/query/AlarmQuery.java | 19 +-
.../server/storage/plugin/jdbc/SQLExecutor.java | 4 +-
.../storage/plugin/jdbc/h2/H2StorageProvider.java | 7 +-
.../plugin/jdbc/h2/dao/H2AlarmQueryDAO.java | 61 ++-
.../plugin/jdbc/h2/dao/H2AlarmRecordBuilder.java | 79 ++++
.../storage/plugin/jdbc/h2/dao/H2RecordDAO.java | 13 +
.../plugin/jdbc/mysql/MySQLAlarmQueryDAO.java | 81 +---
.../plugin/jdbc/mysql/MySQLStorageProvider.java | 13 +-
.../jdbc/postgresql/PostgreSQLStorageProvider.java | 14 +-
.../postgresql/dao/PostgreSQLAlarmQueryDAO.java | 9 +-
.../plugin/jdbc/tidb/TiDBStorageProvider.java | 13 +-
.../elasticsearch/ZipkinTraceQueryEs7DAO.java | 14 +-
skywalking-ui | 2 +-
.../apache/skywalking/e2e/SimpleQueryClient.java | 5 +-
.../e2e/alarm/{GetAlarm.java => Alarm.java} | 12 +-
.../apache/skywalking/e2e/alarm/AlarmMatcher.java | 36 +-
.../apache/skywalking/e2e/alarm/AlarmQuery.java | 27 ++
.../apache/skywalking/e2e/alarm/AlarmsMatcher.java | 28 +-
.../org/apache/skywalking/e2e/alarm/GetAlarm.java | 2 +-
.../e2e/alarm/{GetAlarm.java => HookAlarm.java} | 14 +-
.../skywalking/e2e/alarm/HookAlarmMatcher.java | 44 +-
.../apache/skywalking/e2e/alarm/HookAlarms.java | 27 +-
.../{HookAlarms.java => HookAlarmsMatcher.java} | 6 +-
.../e2e-data/src/main/resources/read-alarms.gql | 11 +-
test/e2e/e2e-protocol/src/main/proto | 2 +-
.../java/org/apache/skywalking/e2e/KeyValue.java} | 15 +-
.../skywalking/e2e/controller/AlarmController.java | 2 +
test/e2e/e2e-test/docker/alarm/alarm-settings.yml | 6 +
.../{docker-compose.yml => docker-compose.es6.yml} | 20 +
.../{docker-compose.yml => docker-compose.es7.yml} | 22 +-
.../{docker-compose.yml => docker-compose.h2.yml} | 21 +
...ker-compose.yml => docker-compose.influxdb.yml} | 18 +
...docker-compose.yml => docker-compose.mysql.yml} | 23 ++
...ker-compose.yml => docker-compose.postgres.yml} | 22 +
.../with-skywalking-client-js/Dockerfile.test-ui | 4 +-
.../browser/with-skywalking-client-js/test.py | 2 +-
.../org/apache/skywalking/e2e/alarm/AlarmE2E.java | 20 +-
.../alarm/silence-after-graphql-critical.yml} | 49 +--
...-webhook.yml => silence-after-graphql-warn.yml} | 37 +-
.../expected/alarm/silence-after-graphql.yml | 34 --
.../expected/alarm/silence-after-webhook.yml | 20 +
...hql.yml => silence-before-graphql-critical.yml} | 22 +-
.../alarm/silence-before-graphql-warn.yml} | 21 +-
.../expected/alarm/silence-before-webhook.yml | 10 +
test/plugin/containers/jvm-container/pom.xml | 2 +-
.../dubbo-2.7.x-scenario/config/expectedData.yaml | 1 +
.../config/expectedData.yaml | 456 ++++++++++++++-------
.../scenarios/elasticsearch-7.x-scenario/pom.xml | 12 +
...ontroller.java => RestHighLevelClientCase.java} | 39 +-
.../elasticsearch/TransportClientCase.java | 100 +++++
.../config/TransportClientConfig.java | 71 ++++
.../elasticsearch/controller/CaseController.java | 237 +----------
.../src/main/resources/application.yaml | 4 +-
.../jsonrpc4j-1.x-scenario/bin/startup.sh | 7 +-
.../config/expectedData.yaml | 85 ++--
.../jsonrpc4j-1.x-scenario/configuration.yml | 6 +-
.../pom.xml | 84 ++--
.../src/main/assembly/assembly.xml | 41 ++
.../apm/testcase/jsonrpc4j/Application.java | 28 +-
.../jsonrpc4j/controller/CaseController.java | 52 +++
.../testcase/jsonrpc4j/services/DemoService.java} | 15 +-
.../jsonrpc4j/services/DemoServiceImp.java | 18 +-
.../src/main/resources/application.yml | 6 +-
.../jsonrpc4j-1.x-scenario/support-version.list | 6 +-
.../kafka-scenario/config/expectedData.yaml | 59 ++-
.../testcase/kafka/controller/CaseController.java | 67 +++
258 files changed, 4722 insertions(+), 1897 deletions(-)
copy .github/workflows/{e2e.jdk-versions.yaml => e2e.alarm.yaml} (69%)
copy
apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/{TraceIdPatternConverter.java
=> SkyWalkingContextPatternConverter.java} (81%)
copy
apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/{Log4j2OutputAppender.java
=> Log4j2SkyWalkingContextOutputAppender.java} (82%)
create mode 100644
apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/SkyWalkingContextConverter.java
copy
apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/{LogbackPatternConverter.java
=> LogbackSkyWalkingContextPatternConverter.java} (78%)
create mode 100644
apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/logstash/SkyWalkingContextJsonProvider.java
delete mode 100644
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/DistributedTraceIds.java
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-7.x-plugin/pom.xml
copy
apm-sniffer/apm-sdk-plugin/{elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6
=>
elasticsearch-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v7}/define/AdapterActionFutureInstrumentation.java
(77%)
copy
apm-sniffer/apm-sdk-plugin/{elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6
=>
elasticsearch-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v7}/interceptor/AdapterActionFutureActionGetMethodsInterceptor.java
(91%)
copy apm-sniffer/{apm-toolkit-activation/apm-toolkit-log4j-1.x-activation =>
apm-sdk-plugin/elasticsearch-7.x-plugin}/src/main/resources/skywalking-plugin.def
(78%)
create mode 100644 apm-sniffer/apm-sdk-plugin/jsonrpc4j-1.x-plugin/pom.xml
copy
apm-sniffer/{apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/RingBufferLogEventMethodInterceptor.java
=>
apm-sdk-plugin/jsonrpc4j-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jsonrpc4j/JsonRpcBasicServerInvokeInterceptor.java}
(69%)
copy
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/alarm/GetAlarm.java
=>
apm-sniffer/apm-sdk-plugin/jsonrpc4j-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jsonrpc4j/JsonRpcConstants.java
(71%)
create mode 100644
apm-sniffer/apm-sdk-plugin/jsonrpc4j-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jsonrpc4j/JsonRpcHttpClientInterceptor.java
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/logstash/TraceIdJsonProviderInterceptor.java
=>
apm-sdk-plugin/jsonrpc4j-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jsonrpc4j/JsonRpcHttpClientPrepareConnectionInterceptor.java}
(56%)
copy
oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/ZipkinReceiverConfig.java
=>
apm-sniffer/apm-sdk-plugin/jsonrpc4j-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jsonrpc4j/JsonRpcPeerInfo.java
(58%)
create mode 100644
apm-sniffer/apm-sdk-plugin/jsonrpc4j-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jsonrpc4j/JsonServiceExporterInterceptor.java
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
=>
apm-sdk-plugin/jsonrpc4j-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jsonrpc4j/define/JsonRpcBasicServerInstrumentation.java}
(57%)
create mode 100644
apm-sniffer/apm-sdk-plugin/jsonrpc4j-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jsonrpc4j/define/JsonRpcHttpClientInstrumentation.java
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
=>
apm-sdk-plugin/jsonrpc4j-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jsonrpc4j/define/JsonServiceExporterInstrumentation.java}
(57%)
copy apm-sniffer/{apm-toolkit-activation/apm-toolkit-log4j-1.x-activation =>
apm-sdk-plugin/jsonrpc4j-1.x-plugin}/src/main/resources/skywalking-plugin.def
(73%)
create mode 100644
apm-sniffer/apm-sdk-plugin/jsonrpc4j-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jsonrpc4j/JsonRpcHttpClientTests.java
create mode 100644
apm-sniffer/apm-sdk-plugin/jsonrpc4j-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jsonrpc4j/JsonRpcServerTests.java
copy
apm-sniffer/{apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/RingBufferLogEventMethodInterceptor.java
=>
apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/AssignMethodInterceptor.java}
(64%)
create mode 100644
apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/AssignMethodInterceptorTest.java
copy
apm-sniffer/apm-toolkit-activation/{apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/RingBufferLogEventMethodInterceptor.java
=>
apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/PrintSkyWalkingContextInterceptor.java}
(82%)
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
=>
apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/SkyWalkingContextPatternConverterActivation.java}
(66%)
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
=>
apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/SkyWalkingContextConverterActivation.java}
(69%)
copy
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/{TraceIdConverterMethodInterceptor.java
=> SkyWalkingContextConverterMethodInterceptor.java} (70%)
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
=> LogbackSkyWalkingContextPatternConverterActivation.java} (67%)
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/{PrintTraceIdInterceptor.java
=> PrintSkyWalkingContextInterceptor.java} (75%)
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/SkyWalkingContextJsonProviderActivation.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/logstash/{TraceIdJsonProviderInterceptor.java
=> SkyWalkingContextJsonProviderInterceptor.java} (77%)
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
=> PrintMDCSkyWalkingContextInterceptor.java} (75%)
create mode 100644
apm-sniffer/apm-toolkit-activation/apm-toolkit-logging-common/src/main/java/org/apache/skywalking/apm/toolkit/logging/common/log/SkyWalkingContext.java
copy
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/alarm/AlarmQuery.java
=>
apm-sniffer/optional-reporter-plugins/kafka-reporter-plugin/src/main/java/org/apache/skywalking/apm/agent/core/kafka/KafkaConnectionStatus.java
(79%)
copy
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/alarm/AlarmQuery.java
=>
apm-sniffer/optional-reporter-plugins/kafka-reporter-plugin/src/main/java/org/apache/skywalking/apm/agent/core/kafka/KafkaConnectionStatusListener.java
(78%)
create mode 100644
apm-sniffer/optional-reporter-plugins/kafka-reporter-plugin/src/test/java/org/apache/skywalking/apm/agent/core/kafka/KafkaProducerManagerTest.java
create mode 100644 docs/en/setup/service-agent/java-agent/containerization.md
create mode 100644
oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/EventHookCallback.java
create mode 100644
oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/EventHookCallbackTest.java
create mode 100644
oap-server/server-bootstrap/src/main/resources/otel-oc-rules/envoy.yaml
copy
oap-server/{server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/CompositeAlarmRule.java
=>
server-core/src/main/java/org/apache/skywalking/oap/server/core/source/TCPInfo.java}
(77%)
create mode 100644
oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/handler/AbstractKafkaHandler.java
create mode 100644
oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/test/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/handler/AbstractKafkaHandlerTest.java
copy oap-server/{server-alarm-plugin/src/main/proto/alarm-hook.proto =>
server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/k8s/Addresses.java}
(64%)
create mode 100644
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AlarmRecordBuilder.java
copy
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/alarm/{GetAlarm.java
=> Alarm.java} (76%)
copy
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/alarm/{GetAlarm.java
=> HookAlarm.java} (73%)
copy
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/alarm/{HookAlarms.java
=> HookAlarmsMatcher.java} (89%)
copy
test/e2e/{e2e-data/src/main/java/org/apache/skywalking/e2e/alarm/GetAlarm.java
=> e2e-service-provider/src/main/java/org/apache/skywalking/e2e/KeyValue.java}
(77%)
copy test/e2e/e2e-test/docker/alarm/{docker-compose.yml =>
docker-compose.es6.yml} (73%)
copy test/e2e/e2e-test/docker/alarm/{docker-compose.yml =>
docker-compose.es7.yml} (72%)
copy test/e2e/e2e-test/docker/alarm/{docker-compose.yml =>
docker-compose.h2.yml} (73%)
copy test/e2e/e2e-test/docker/alarm/{docker-compose.yml =>
docker-compose.influxdb.yml} (76%)
copy test/e2e/e2e-test/docker/alarm/{docker-compose.yml =>
docker-compose.mysql.yml} (68%)
copy test/e2e/e2e-test/docker/alarm/{docker-compose.yml =>
docker-compose.postgres.yml} (70%)
rename test/e2e/e2e-test/{docker/alarm/docker-compose.yml =>
src/test/resources/expected/alarm/silence-after-graphql-critical.yml} (57%)
copy
test/e2e/e2e-test/src/test/resources/expected/alarm/{silence-before-webhook.yml
=> silence-after-graphql-warn.yml} (57%)
delete mode 100644
test/e2e/e2e-test/src/test/resources/expected/alarm/silence-after-graphql.yml
rename
test/e2e/e2e-test/src/test/resources/expected/alarm/{silence-before-graphql.yml
=> silence-before-graphql-critical.yml} (65%)
copy
test/{plugin/scenarios/elasticsearch-7.x-scenario/src/main/resources/application.yaml
=>
e2e/e2e-test/src/test/resources/expected/alarm/silence-before-graphql-warn.yml}
(72%)
copy
test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/{controller/CaseController.java
=> RestHighLevelClientCase.java} (92%)
create mode 100644
test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/TransportClientCase.java
create mode 100644
test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/TransportClientConfig.java
copy
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/resources/skywalking-plugin.def
=> test/plugin/scenarios/jsonrpc4j-1.x-scenario/bin/startup.sh (78%)
copy test/plugin/scenarios/{dubbo-2.7.x-scenario =>
jsonrpc4j-1.x-scenario}/config/expectedData.yaml (51%)
copy
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/resources/skywalking-plugin.def
=> test/plugin/scenarios/jsonrpc4j-1.x-scenario/configuration.yml (78%)
copy test/plugin/scenarios/{elasticsearch-7.x-scenario =>
jsonrpc4j-1.x-scenario}/pom.xml (61%)
create mode 100644
test/plugin/scenarios/jsonrpc4j-1.x-scenario/src/main/assembly/assembly.xml
copy
apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternParser.java
=>
test/plugin/scenarios/jsonrpc4j-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/jsonrpc4j/Application.java
(58%)
create mode 100644
test/plugin/scenarios/jsonrpc4j-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/jsonrpc4j/controller/CaseController.java
copy
test/{e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/alarm/GetAlarm.java
=>
plugin/scenarios/jsonrpc4j-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/jsonrpc4j/services/DemoService.java}
(74%)
copy
apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/TraceIdMDCPatternLogbackLayout.java
=>
test/plugin/scenarios/jsonrpc4j-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/jsonrpc4j/services/DemoServiceImp.java
(71%)
copy
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/resources/skywalking-plugin.def
=>
test/plugin/scenarios/jsonrpc4j-1.x-scenario/src/main/resources/application.yml
(78%)
copy
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/resources/skywalking-plugin.def
=> test/plugin/scenarios/jsonrpc4j-1.x-scenario/support-version.list (78%)
