Skip to content

metrics service: force link v2 config #9875

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
lizan merged 3 commits into from
Feb 7, 2020
Merged

metrics service: force link v2 config #9875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b454c8f
metrics service: force link v2 config
Jan 29, 2020
f547e7c
fmt
Jan 30, 2020
698818b
comments
Feb 5, 2020
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
2 changes: 2 additions & 0 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 @@ -32,7 +32,9 @@ envoy_cc_library(
hdrs = ["grpc_metrics_proto_descriptors.h"],
deps = [
"//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",
],
)
Expand Down
14 changes: 13 additions & 1 deletion 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,9 +1,11 @@
#include "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 "common/common/assert.h"
#include "common/common/fmt.h"
#include "common/config/api_version.h"
#include "common/protobuf/protobuf.h"

namespace Envoy {
Expand All @@ -13,12 +15,22 @@ namespace MetricsService {

void validateProtoDescriptors() {
// https://github.com/envoyproxy/envoy/issues/9639
const envoy::service::metrics::v2::StreamMetricsMessage _dummy_v2;
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";

RELEASE_ASSERT(Protobuf::DescriptorPool::generated_pool()->FindMethodByName(method) != nullptr,
"");

const auto config = "envoy.config.metrics.v2.MetricsServiceConfig";

// Keeping this as an ASSERT because ApiTypeOracle::getEarlierVersionDescriptor also has an
// ASSERT.
ASSERT(Protobuf::DescriptorPool::generated_pool()->FindMessageTypeByName(config) != nullptr, "");
};
} // namespace MetricsService
} // namespace StatSinks
Expand Down