Skip to content

v2: final source removal #17565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 1 commit into from
Aug 2, 2021
Merged

v2: final source removal #17565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions source/extensions/stat_sinks/metrics_service/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -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",
],
)

Expand Down
14 changes: 3 additions & 11 deletions source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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.
Expand Down