You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by lu...@apache.org on 2022/10/28 03:15:36 UTC

[skywalking] branch update-banyandb updated (e70d47bf94 -> adcee829a5)

This is an automated email from the ASF dual-hosted git repository.

lujiajing pushed a change to branch update-banyandb
in repository https://gitbox.apache.org/repos/asf/skywalking.git


    from e70d47bf94 support indexType
     add 9ba31b63a2 Do not log error logs when failed to create ElasticSearch index because the index is created already (#9856)
     add fb2ac0e7f9 Split TCP related service mesh metrics protobuffer definition (#9851)
     add adcee829a5 Merge branch 'master' into update-banyandb

No new revisions were added by this update.

Summary of changes:
 apm-protocol/apm-network/src/main/proto            |   2 +-
 docs/en/changes/changes.md                         |   7 +-
 docs/en/concepts-and-designs/scope-definitions.md  | 141 +++++++++----
 .../apache/skywalking/oal/rt/grammar/OALLexer.g4   |   6 +-
 .../apache/skywalking/oal/rt/grammar/OALParser.g4  |   6 +-
 .../server/core/analysis/DispatcherManager.java    |   8 +-
 ...cher.java => TCPInstanceTrafficDispatcher.java} |   6 +-
 ...tcher.java => TCPInstanceUpdateDispatcher.java} |   6 +-
 ... TCPServiceInstanceCallRelationDispatcher.java} |  10 +-
 ....java => TCPServiceCallRelationDispatcher.java} |  10 +-
 ...tcher.java => TCPServiceTrafficDispatcher.java} |   6 +-
 .../oap/server/core/source/DefaultScopeDefine.java |   6 +
 .../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 -
 .../skywalking/oap/server/core/source/TCPInfo.java |  36 ----
 .../core/source/{Service.java => TCPService.java}  |  33 +--
 ...erviceInstance.java => TCPServiceInstance.java} |  32 +--
 ...lation.java => TCPServiceInstanceRelation.java} |  37 +---
 ...ceUpdate.java => TCPServiceInstanceUpdate.java} |   8 +-
 ...erviceRelation.java => TCPServiceRelation.java} |  33 +--
 .../library/elasticsearch/client/IndexClient.java  |   3 +-
 .../exception/ResponseException.java}              |  14 +-
 .../envoy/AccessLogServiceGRPCHandler.java         |  56 ++---
 .../receiver/envoy/als/AbstractALSAnalyzer.java    |   6 +-
 .../receiver/envoy/als/AccessLogAnalyzer.java      |  15 +-
 .../envoy/als/LogEntry2MetricsAdapter.java         |  29 +--
 .../als/k8s/K8sALSServiceMeshHTTPAnalysis.java     |  54 +++--
 .../envoy/als/mx/MetaExchangeALSHTTPAnalyzer.java  |  38 ++--
 .../als/tcp/AbstractTCPAccessLogAnalyzer.java      |   6 +-
 .../envoy/als/tcp/TCPLogEntry2MetricsAdapter.java  |  35 ++--
 .../als/tcp/k8s/K8sALSServiceMeshTCPAnalysis.java  |  54 +++--
 .../tcp/mx/MetaExchangeTCPAccessLogAnalyzer.java   |  42 ++--
 .../envoy/persistence/LogsPersistence.java         |   4 +-
 .../envoy/persistence/TCPLogsPersistence.java      |  10 +-
 .../als/k8s/K8SALSServiceMeshHTTPAnalysisTest.java |  20 +-
 .../aop/server/receiver/mesh/MeshGRPCHandler.java  |  10 +-
 .../receiver/mesh/MeshGRPCHandlerCompat.java       |  35 ----
 .../server/receiver/mesh/MeshReceiverProvider.java |   1 -
 .../receiver/mesh/TelemetryDataDispatcher.java     | 227 +++++++++++++++++----
 .../oap/server/receiver/mesh/MeshDataMock.java     |  53 +++--
 .../server-starter/src/main/resources/oal/core.oal |   5 +-
 .../server-starter/src/main/resources/oal/tcp.oal  |  24 +--
 .../general/general-instance.json                  |   1 -
 .../mesh/mesh-instance.json                        |   1 -
 .../mesh/mesh-service.json                         |  10 +-
 .../elasticsearch/base/HistoryDeleteEsDAO.java     |  14 +-
 .../ServiceMeshMetricSenderController.java         |  46 +++--
 .../java-test-service/e2e-protocol/src/main/proto  |   2 +-
 50 files changed, 657 insertions(+), 564 deletions(-)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/instance/{InstanceTrafficDispatcher.java => TCPInstanceTrafficDispatcher.java} (86%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/instance/{InstanceUpdateDispatcher.java => TCPInstanceUpdateDispatcher.java} (85%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/{ServiceInstanceCallRelationDispatcher.java => TCPServiceInstanceCallRelationDispatcher.java} (86%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/service/{ServiceCallRelationDispatcher.java => TCPServiceCallRelationDispatcher.java} (86%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/service/{ServiceTrafficDispatcher.java => TCPServiceTrafficDispatcher.java} (86%)
 delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/TCPInfo.java
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{Service.java => TCPService.java} (80%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{ServiceInstance.java => TCPServiceInstance.java} (81%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{ServiceInstanceRelation.java => TCPServiceInstanceRelation.java} (83%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{ServiceInstanceUpdate.java => TCPServiceInstanceUpdate.java} (88%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{ServiceRelation.java => TCPServiceRelation.java} (83%)
 copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/AlarmTrend.java => server-library/library-elasticsearch-client/src/main/java/org/apache/skywalking/library/elasticsearch/exception/ResponseException.java} (75%)
 delete mode 100644 oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshGRPCHandlerCompat.java