diff --git a/source/extensions/stat_sinks/metrics_service/BUILD b/source/extensions/stat_sinks/metrics_service/BUILD index 97d79e032f030..2f43ccf235035 100644 --- a/source/extensions/stat_sinks/metrics_service/BUILD +++ b/source/extensions/stat_sinks/metrics_service/BUILD @@ -7,7 +7,7 @@ load( licenses(["notice"]) # Apache 2 -# Stats sink for the gRPC metrics service: api/envoy/service/metrics/v2/metrics_service.proto +# Stats sink for the gRPC metrics service: api/envoy/service/metrics/v3/metrics_service.proto envoy_extension_package() @@ -34,8 +34,7 @@ envoy_cc_library( "//source/common/common:assert_lib", "//source/common/config:api_version_lib", "//source/common/protobuf", - "@envoy_api//envoy/config/metrics/v2:pkg_cc_proto", - "@envoy_api//envoy/service/metrics/v2:pkg_cc_proto", + "@envoy_api//envoy/config/metrics/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.cc b/source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.cc index 3987969712f28..0a9626db01e35 100644 --- a/source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.cc +++ b/source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.cc @@ -1,7 +1,6 @@ #include "source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.h" -#include "envoy/config/metrics/v2/metrics_service.pb.h" -#include "envoy/service/metrics/v2/metrics_service.pb.h" +#include "envoy/config/metrics/v3/metrics_service.pb.h" #include "source/common/common/assert.h" #include "source/common/common/fmt.h" @@ -14,19 +13,12 @@ namespace StatSinks { namespace MetricsService { void validateProtoDescriptors() { - // https://github.com/envoyproxy/envoy/issues/9639 - const API_NO_BOOST(envoy::service::metrics::v2::StreamMetricsMessage) _dummy_service_v2; - // https://github.com/envoyproxy/envoy/pull/9618 made it necessary to register the previous - // version's config descriptor by calling ApiTypeOracle::getEarlierVersionDescriptor which has an - // assertion for nullptr types. - const API_NO_BOOST(envoy::config::metrics::v2::MetricsServiceConfig) _dummy_config_v2; - - const auto method = "envoy.service.metrics.v2.MetricsService.StreamMetrics"; + const auto method = "envoy.service.metrics.v3.MetricsService.StreamMetrics"; RELEASE_ASSERT(Protobuf::DescriptorPool::generated_pool()->FindMethodByName(method) != nullptr, ""); - const auto config = "envoy.config.metrics.v2.MetricsServiceConfig"; + const auto config = "envoy.config.metrics.v3.MetricsServiceConfig"; // Keeping this as an ASSERT because ApiTypeOracle::getEarlierVersionDescriptor also has an // ASSERT.