You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2020/12/27 13:27:31 UTC
[skywalking] branch issue/5860 updated (3a68510 -> ab94fea)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch issue/5860
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 3a68510 Support Envoy {AccessLog,Metrics}Service API V3
add 065a797 [Plugin] added component ID for Python aiohttp (#6006)
add 957d549 [ISSUE 5541] Fix H2 in-memory database table missing issues (#6008)
add 82f859d [Plugin] add Python Pyramid component ID (#6012)
add 08b31ad fix: grammar for Github Template (#6014)
add 1297d2e Add null-conditional operators on these 3 files (#6007)
add 8d33f02 chore: code polish (#6025)
add 6feeaf6 Update submodule to sync namespaced proto files (#6026)
add 5e9582e Add interceptors of method(analyze, searchScroll, clearScroll, searchTemplate and deleteByQuery) for elasticsearch-6.x-plugin. (#5962)
add de3ccec Trace method(clearScrollAsync) for elasticsearch-6.x-plugin and polishing elasticsearch-6.x-scenario. (#6031)
add b9c5776 [Plugin] add NodeJS Axios component ID (#6033)
add 7b9cff4 chore: fix typo gprc -> grpc (#6035)
add 40a98ee Update README.md (#6036)
add 9b7e663 Update byte-buddy to 1.10.19 (#6037)
add 098b919 ui sync (#6039)
add bf639d3 Fix some mistakes in the comments (#6038)
add 5426910 Fix thrift trace broken and wrong arg collected. (#5989)
add e6265ba Fix DataCarrier's `org.apache.skywalking.apm.commons.datacarrier.buffer.Buffer` implementation isn't activated in `IF_POSSIBLE` mode. (#6048)
add 1c534d8 Fix typo in README.md (#6052)
add 0950c1a ArrayBlockingQueueBuffer del IF_POSSIBLE strategy (#6053)
add 8899930 fix influx query error #6056 (#6057)
add e739ca2 Support building gRPC TLS channel but CA file is not required (#6060)
add d4175d8 test: add e2e for NodeJS agent (#6073)
add 04b536b Add JavaScript component id (#6075)
add 1cc68b4 correct the doc of backend trace sampling with the latest configuration (#6085)
add ab94fea Merge branch 'master' into issue/5860
No new revisions were added by this update.
Summary of changes:
.github/ISSUE_TEMPLATE | 2 +-
.github/PULL_REQUEST_TEMPLATE | 6 +-
.../workflows/{e2e.python.yaml => e2e.compat.yaml} | 22 +-
.../workflows/{e2e.python.yaml => e2e.nodejs.yaml} | 15 +-
CHANGES.md | 22 +-
README.md | 17 +-
.../apm/commons/datacarrier/DataCarrier.java | 18 +-
.../buffer/ArrayBlockingQueueBuffer.java | 16 +-
.../apm/commons/datacarrier/DataCarrierTest.java | 8 +-
apm-protocol/apm-network/src/main/proto | 2 +-
.../skywalking/apm/agent/core/conf/Config.java | 5 +
.../ClassInstanceMethodsEnhancePluginDefine.java | 2 +-
.../apm/agent/core/remote/TLSChannelBuilder.java | 8 +-
.../core/remote/TraceSegmentServiceClient.java | 3 +-
.../v6/define/IndicesClientInstrumentation.java | 16 ++
.../define/RestHighLevelClientInstrumentation.java | 74 +++++-
.../elasticsearch/v6/interceptor/Constants.java | 10 +
...=> IndicesClientAnalyzeMethodsInterceptor.java} | 20 +-
...hLevelClientClearScrollMethodsInterceptor.java} | 16 +-
...evelClientDeleteByQueryMethodsInterceptor.java} | 22 +-
...LevelClientSearchScrollMethodsInterceptor.java} | 14 +-
...velClientSearchTemplateMethodsInterceptor.java} | 19 +-
...ndicesClientAnalyzeMethodsInterceptorTest.java} | 48 ++--
...elClientClearScrollMethodsInterceptorTest.java} | 51 ++--
...ClientDeleteByQueryMethodsInterceptorTest.java} | 48 ++--
...lClientSearchScrollMethodsInterceptorTest.java} | 48 ++--
...lientSearchTemplateMethodsInterceptorTest.java} | 50 ++--
...reparedStatementIgnorableSetterInterceptor.java | 6 +-
...JDBCPreparedStatementNullSetterInterceptor.java | 6 +-
.../JDBCPreparedStatementSetterInterceptor.java | 8 +-
.../define/AbstractControllerInstrumentation.java | 2 +-
.../define/AbstractControllerInstrumentation.java | 2 +-
.../thrift/client/TServiceClientInterceptor.java | 1 +
.../thrift/wrapper/ServerInProtocolWrapper.java | 22 ++
apm-sniffer/config/agent.config | 4 +
.../core/kafka/KafkaTraceSegmentServiceClient.java | 3 +-
dist-material/release-docs/LICENSE | 6 +-
docs/en/setup/backend/trace-sampling.md | 2 +-
docs/en/setup/service-agent/java-agent/README.md | 1 +
docs/en/setup/service-agent/java-agent/TLS.md | 8 +-
docs/en/ui/README.md | 2 +-
docs/powered-by.md | 213 ----------------
.../src/main/resources/application.yml | 2 +-
.../src/main/resources/component-libraries.yml | 20 +-
.../browser/provider/BrowserModuleProvider.java | 8 +-
.../grpc/BrowserPerfServiceHandlerCompat.java} | 27 +-
.../receiver/clr/provider/CLRModuleProvider.java | 5 +-
.../CLRMetricReportServiceHandlerCompat.java | 26 +-
.../receiver/jvm/provider/JVMModuleProvider.java | 5 +-
.../JVMMetricReportServiceHandlerCompat.java | 26 +-
.../register/provider/RegisterModuleProvider.java | 5 +-
.../v8/grpc/ManagementServiceHandlerCompat.java | 42 ++++
...eiverModule.java => MeshGRPCHandlerCompat.java} | 19 +-
.../server/receiver/mesh/MeshReceiverProvider.java | 4 +-
.../meter/provider/MeterReceiverProvider.java | 5 +-
.../handler/MeterServiceHandlerCompat.java} | 36 +--
.../profile/provider/ProfileModuleProvider.java | 5 +-
.../handler/ProfileTaskServiceHandlerCompat.java | 48 ++++
.../trace/provider/TraceModuleProvider.java | 5 +-
.../TraceSegmentReportServiceHandlerCompat.java | 42 ++++
.../storage/plugin/influxdb/InfluxClient.java | 10 +-
.../plugin/influxdb/InfluxStorageProvider.java | 11 +-
.../plugin/influxdb/InfluxTableInstaller.java | 5 +-
.../storage/plugin/influxdb/TableMetaInfo.java | 8 +-
.../plugin/influxdb/base/InfluxInsertRequest.java | 10 +-
.../plugin/influxdb/base/InfluxStorageDAO.java | 2 +-
.../plugin/influxdb/base/ManagementDAO.java | 4 +-
.../storage/plugin/influxdb/base/MetricsDAO.java | 18 +-
.../plugin/influxdb/base/NoneStreamDAO.java | 11 +-
.../storage/plugin/influxdb/base/RecordDAO.java | 29 +--
.../plugin/influxdb/query/AggregationQuery.java | 22 +-
.../storage/plugin/influxdb/query/AlarmQuery.java | 4 +-
.../plugin/influxdb/query/MetadataQuery.java | 24 +-
.../plugin/influxdb/query/MetricsQuery.java | 54 ++--
.../influxdb/query/NetworkAddressAliasDAO.java | 2 +-
.../plugin/influxdb/query/ProfileTaskLogQuery.java | 22 +-
.../plugin/influxdb/query/ProfileTaskQuery.java | 14 +-
.../influxdb/query/ProfileThreadSnapshotQuery.java | 92 +++----
.../plugin/influxdb/query/TopNRecordsQuery.java | 14 +-
.../plugin/influxdb/query/TopologyQuery.java | 127 +++++-----
.../storage/plugin/influxdb/query/TraceQuery.java | 35 +--
.../query/UITemplateManagementDAOImpl.java | 36 +--
.../storage/plugin/jdbc/h2/H2StorageConfig.java | 2 +-
pom.xml | 2 +-
skywalking-ui | 2 +-
.../apache/skywalking/e2e/topo/TopoMatcher.java | 6 +-
.../Dockerfile.python => nodejs/Dockerfile.nodejs} | 17 +-
.../e2e/e2e-test/docker/nodejs/consumer.ts | 34 +--
.../docker/{go => nodejs}/docker-compose.yml | 60 +++--
.../e2e/e2e-test/docker/nodejs/provider.ts | 26 +-
.../simple/{auth => compat}/docker-compose.yml | 34 ++-
.../e2e/{PythonE2E.java => NodeJSE2E.java} | 27 +-
.../consumer-endpoints.yml} | 0
.../{python => nodejs}/consumer-instance-topo.yml | 0
.../{python => nodejs}/consumer-instances.yml | 0
.../{python => nodejs}/provider-endpoints.yml | 0
.../{python => nodejs}/provider-instances.yml | 0
.../expected/{python => nodejs}/services.yml | 2 -
.../resources/expected/{python => nodejs}/topo.yml | 14 +-
.../expected/{storage => nodejs}/traces.yml | 0
test/plugin/agent-test-tools/bin/fetch-code.sh | 6 +-
test/plugin/agent-test-tools/pom.xml | 4 +-
.../testcase/grpc/controller/CaseController.java | 4 +-
.../config/expectedData.yaml | 231 +++++++++++++++++-
.../elasticsearch/RestHighLevelClientCase.java | 271 ++++++++++++++++++++-
.../testcase/grpc/controller/CaseController.java | 4 +-
106 files changed, 1526 insertions(+), 972 deletions(-)
copy .github/workflows/{e2e.python.yaml => e2e.compat.yaml} (78%)
copy .github/workflows/{e2e.python.yaml => e2e.nodejs.yaml} (85%)
copy apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/{IndicesClientCreateMethodsInterceptor.java => IndicesClientAnalyzeMethodsInterceptor.java} (83%)
copy apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/{RestHighLevelClientSearchMethodsInterceptor.java => RestHighLevelClientClearScrollMethodsInterceptor.java} (85%)
copy apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/{RestHighLevelClientSearchMethodsInterceptor.java => RestHighLevelClientDeleteByQueryMethodsInterceptor.java} (80%)
copy apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/{RestHighLevelClientGetMethodsInterceptor.java => RestHighLevelClientSearchScrollMethodsInterceptor.java} (87%)
copy apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/{RestHighLevelClientSearchMethodsInterceptor.java => RestHighLevelClientSearchTemplateMethodsInterceptor.java} (82%)
copy apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/{RestHighLevelClientUpdateMethodsInterceptorTest.java => IndicesClientAnalyzeMethodsInterceptorTest.java} (75%)
copy apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/{RestHighLevelClientUpdateMethodsInterceptorTest.java => RestHighLevelClientClearScrollMethodsInterceptorTest.java} (74%)
copy apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/{RestHighLevelClientSearchMethodsInterceptorTest.java => RestHighLevelClientDeleteByQueryMethodsInterceptorTest.java} (74%)
copy apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/{RestHighLevelClientUpdateMethodsInterceptorTest.java => RestHighLevelClientSearchScrollMethodsInterceptorTest.java} (75%)
copy apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/{RestHighLevelClientSearchMethodsInterceptorTest.java => RestHighLevelClientSearchTemplateMethodsInterceptorTest.java} (74%)
delete mode 100644 docs/powered-by.md
copy oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/{parser/errorlog/listener/ErrorLogRecordSampler.java => handler/grpc/BrowserPerfServiceHandlerCompat.java} (52%)
copy test/e2e/e2e-common/src/main/java/org/apache/skywalking/e2e/retryable/RetryableTestContext.java => oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/clr/provider/handler/CLRMetricReportServiceHandlerCompat.java (53%)
copy test/e2e/e2e-common/src/main/java/org/apache/skywalking/e2e/retryable/RetryableTestContext.java => oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMMetricReportServiceHandlerCompat.java (53%)
create mode 100644 oap-server/server-receiver-plugin/skywalking-management-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v8/grpc/ManagementServiceHandlerCompat.java
copy oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/{MeshReceiverModule.java => MeshGRPCHandlerCompat.java} (57%)
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/server/GRPCHandlerRegisterImpl.java => server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/meter/provider/handler/MeterServiceHandlerCompat.java} (55%)
create mode 100644 oap-server/server-receiver-plugin/skywalking-profile-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/profile/provider/handler/ProfileTaskServiceHandlerCompat.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v8/grpc/TraceSegmentReportServiceHandlerCompat.java
copy test/e2e/e2e-test/docker/{python/Dockerfile.python => nodejs/Dockerfile.nodejs} (74%)
copy oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/clr/module/CLRModule.java => test/e2e/e2e-test/docker/nodejs/consumer.ts (60%)
copy test/e2e/e2e-test/docker/{go => nodejs}/docker-compose.yml (61%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageBuilder.java => test/e2e/e2e-test/docker/nodejs/provider.ts (69%)
copy test/e2e/e2e-test/docker/simple/{auth => compat}/docker-compose.yml (65%)
copy test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/{PythonE2E.java => NodeJSE2E.java} (94%)
copy test/e2e/e2e-test/src/test/resources/expected/{storage/endpoints.yml => nodejs/consumer-endpoints.yml} (100%)
copy test/e2e/e2e-test/src/test/resources/expected/{python => nodejs}/consumer-instance-topo.yml (100%)
copy test/e2e/e2e-test/src/test/resources/expected/{python => nodejs}/consumer-instances.yml (100%)
copy test/e2e/e2e-test/src/test/resources/expected/{python => nodejs}/provider-endpoints.yml (100%)
copy test/e2e/e2e-test/src/test/resources/expected/{python => nodejs}/provider-instances.yml (100%)
copy test/e2e/e2e-test/src/test/resources/expected/{python => nodejs}/services.yml (95%)
copy test/e2e/e2e-test/src/test/resources/expected/{python => nodejs}/topo.yml (85%)
copy test/e2e/e2e-test/src/test/resources/expected/{storage => nodejs}/traces.yml (100%)