This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch envoy/mal
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 75e552d Fix test
add ff2ab69 Fix the uuid field in GRPCConfigWatcherRegister is not
updated. (#6115)
add 6101163 Support Envoy {AccessLog,Metrics}Service API V3 (#6116)
add d9b1f2f Merge branch 'master' into envoy/mal
add 54efea6 Unify the Service & ServiceInstance names with ALS
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 2 +
.../grpc/GRPCConfigWatcherRegister.java | 1 +
.../envoy/AccessLogServiceGRPCHandler.java | 5 +-
.../envoy/AccessLogServiceGRPCHandlerV3.java} | 20 +-
.../envoy/EnvoyMetricReceiverProvider.java | 8 +-
.../receiver/envoy/MetricServiceGRPCHandler.java | 45 +--
.../envoy/MetricServiceGRPCHandlerV3.java} | 16 +-
.../server/receiver/envoy/als/ALSHTTPAnalysis.java | 4 +-
.../receiver/envoy/als/AbstractALSAnalyzer.java | 6 +-
.../envoy/als/LogEntry2MetricsAdapter.java | 12 +-
.../als/k8s/K8sALSServiceMeshHTTPAnalysis.java | 10 +-
.../envoy/als/mx/MetaExchangeALSHTTPAnalyzer.java | 6 +-
.../envoy/MetricServiceGRPCHandlerTestMain.java | 4 +-
.../als/k8s/K8SALSServiceMeshHTTPAnalysisTest.java | 2 +-
.../receiver/envoy/als/mx/FieldsHelperTest.java | 2 +-
.../src/test/resources/envoy-ingress.msg | 5 +-
.../src/test/resources/envoy-ingress2sidecar.msg | 3 +-
.../test/resources/envoy-mesh-client-sidecar.msg | 5 +-
.../test/resources/envoy-mesh-server-sidecar.msg | 5 +-
.../src/test/resources/envoy-metric.msg | 3 +-
.../src/test/resources/field-helper.msg | 3 +-
.../src/main/proto/envoy/api/v2/core/base.proto | 256 ------------
.../{api/v2/core => config/core/v3}/address.proto | 97 +++--
.../main/proto/envoy/config/core/v3/backoff.proto | 36 ++
.../src/main/proto/envoy/config/core/v3/base.proto | 435 +++++++++++++++++++++
.../main/proto/envoy/config/core/v3/http_uri.proto | 56 +++
.../proto/envoy/config/core/v3/socket_option.proto | 56 +++
.../data/accesslog/{v2 => v3}/accesslog.proto | 78 +++-
.../proto/envoy/service/accesslog/v2/als.proto | 62 +--
.../envoy/service/accesslog/{v2 => v3}/als.proto | 56 ++-
.../envoy/service/metrics/v2/metrics_service.proto | 27 +-
.../metrics/{v2 => v3}/metrics_service.proto | 32 +-
.../main/proto/envoy/type/{ => v3}/percent.proto | 26 +-
.../proto/envoy/type/v3/semantic_version.proto | 26 ++
.../src/main/proto/udpa/annotations/migrate.proto | 49 +++
.../src/main/proto/udpa/annotations/status.proto | 34 ++
.../main/proto/udpa/annotations/versioning.proto | 17 +
.../src/main/proto/validate/validate.proto | 48 ++-
pom.xml | 1 +
39 files changed, 1045 insertions(+), 514 deletions(-)
copy
oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Storage.java
=>
server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/AccessLogServiceGRPCHandlerV3.java}
(60%)
copy
oap-server/server-receiver-plugin/{skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshGRPCHandlerCompat.java
=>
envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandlerV3.java}
(60%)
delete mode 100644
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/api/v2/core/base.proto
rename
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/{api/v2/core
=> config/core/v3}/address.proto (54%)
create mode 100644
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/config/core/v3/backoff.proto
create mode 100644
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/config/core/v3/base.proto
create mode 100644
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/config/core/v3/http_uri.proto
create mode 100644
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/config/core/v3/socket_option.proto
rename
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/data/accesslog/{v2
=> v3}/accesslog.proto (83%)
copy
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/service/accesslog/{v2
=> v3}/als.proto (58%)
copy
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/service/metrics/{v2
=> v3}/metrics_service.proto (58%)
rename
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/type/{ =>
v3}/percent.proto (67%)
create mode 100644
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/type/v3/semantic_version.proto
create mode 100644
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/udpa/annotations/migrate.proto
create mode 100644
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/udpa/annotations/status.proto
create mode 100644
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/udpa/annotations/versioning.proto
