Skip to content

mobile: Add the stats prefix to the ADS xDS registration #25560

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
abeyad merged 1 commit into from
Feb 15, 2023
Merged

mobile: Add the stats prefix to the ADS xDS registration #25560

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
3 changes: 3 additions & 0 deletions .github/workflows/compile_time_options.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ jobs:
--define=admin_html=enabled \
--define=envoy_mobile_request_compression=disabled \
--@envoy//bazel:http3=False \
--@com_envoyproxy_protoc_gen_validate//bazel:template-flavor= \
//library/cc/...
swift_build:
if: github.repository == 'envoyproxy/envoy'
Expand Down Expand Up @@ -67,6 +68,7 @@ jobs:
--define=admin_html=enabled \
--define=envoy_mobile_request_compression=disabled \
--@envoy//bazel:http3=False \
--@com_envoyproxy_protoc_gen_validate//bazel:template-flavor= \
//library/swift:ios_framework
kotlin_build:
if: github.repository == 'envoyproxy/envoy'
Expand Down Expand Up @@ -102,4 +104,5 @@ jobs:
--define=admin_html=enabled \
--define=envoy_mobile_request_compression=disabled \
--@envoy//bazel:http3=False \
--@com_envoyproxy_protoc_gen_validate//bazel:template-flavor= \
//:android_dist
4 changes: 3 additions & 1 deletion mobile/library/cc/engine_builder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,7 +1043,9 @@ std::unique_ptr<envoy::config::bootstrap::v3::Bootstrap> EngineBuilder::generate
envoy::config::core::v3::ApiConfigSource::ApiType api_type_enum;
envoy::config::core::v3::ApiConfigSource::ApiType_Parse(ads_api_type_, &api_type_enum);
ads_config->set_api_type(api_type_enum);
ads_config->add_grpc_services()->mutable_google_grpc()->set_target_uri(target_uri);
auto& grpc_service = *ads_config->add_grpc_services();
grpc_service.mutable_google_grpc()->set_target_uri(target_uri);
grpc_service.mutable_google_grpc()->set_stat_prefix("ads");
}
if (enable_cds_) {
auto* cds_config = bootstrap->mutable_dynamic_resources()->mutable_cds_config();
Expand Down
3 changes: 2 additions & 1 deletion mobile/library/common/config/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,8 @@ const char* ads_insert = R"(
set_node_on_first_message_only: true
grpc_services:
google_grpc:
target_uri: '{}:{}')";
target_uri: '{}:{}'
stat_prefix: ads)";

const char* cds_layer_insert = R"(
cds_config:
Expand Down
16 changes: 16 additions & 0 deletions mobile/test/cc/unit/envoy_config_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,22 @@ TEST(TestConfig, RtdsWithoutAds) {
}
}

TEST(TestConfig, AdsConfig) {
EngineBuilder engine_builder;
engine_builder.setAggregatedDiscoveryService(
/*api_type=*/"GRPC", /*target_uri=*/"fake-td.googleapis.com", /*port=*/12345);
std::unique_ptr<envoy::config::bootstrap::v3::Bootstrap> bootstrap =
engine_builder.generateBootstrap();
auto& ads_config = bootstrap->dynamic_resources().ads_config();
EXPECT_EQ(ads_config.api_type(), envoy::config::core::v3::ApiConfigSource::GRPC);
EXPECT_EQ(ads_config.grpc_services(0).google_grpc().target_uri(), "fake-td.googleapis.com:12345");
EXPECT_EQ(ads_config.grpc_services(0).google_grpc().stat_prefix(), "ads");
const std::string config_str = engine_builder.generateConfigStr();
EXPECT_THAT(config_str, HasSubstr("api_type: GRPC"));
EXPECT_THAT(config_str, HasSubstr("target_uri: 'fake-td.googleapis.com:12345'"));
EXPECT_THAT(config_str, HasSubstr("stat_prefix: ads"));
}

TEST(TestConfig, EnablePlatformCertificatesValidation) {
EngineBuilder engine_builder;
envoy::config::bootstrap::v3::Bootstrap bootstrap;
Expand Down