Skip to content

Automated fix for refs/heads/per-channel-stats-plugin #128

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

Open
github-actions wants to merge 1 commit into
base: per-channel-stats-plugin
Choose a base branch
from
Open

Automated fix for refs/heads/per-channel-stats-plugin #128

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
4 changes: 1 addition & 3 deletions src/core/lib/channel/context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@
/// Call context is represented as an array of \a grpc_call_context_elements.
/// This enum represents the indexes into the array, where each index
/// contains a different type of value.
typedef enum {
GRPC_CONTEXT_COUNT
} grpc_context_index;
typedef enum { GRPC_CONTEXT_COUNT } grpc_context_index;

struct grpc_call_context_element {
void* value = nullptr;
Expand Down
7 changes: 3 additions & 4 deletions src/core/telemetry/metrics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,13 +292,12 @@ class StatsPlugin {
const ChannelArgs& args) const = 0;
// Gets a scope config for the client channel specified by \a scope. Note that
// the stats plugin should have been enabled for the channel.
virtual std::shared_ptr<grpc_core::StatsPlugin::ScopeConfig>
GetChannelScopeConfig(
virtual std::shared_ptr<StatsPlugin::ScopeConfig> GetChannelScopeConfig(
const experimental::StatsPluginChannelScope& scope) const = 0;
// Gets a scope config for the server specified by \a args. Note that the
// stats plugin should have been enabled for the server.
virtual std::shared_ptr<grpc_core::StatsPlugin::ScopeConfig>
GetServerScopeConfig(const grpc_core::ChannelArgs& args) const = 0;
virtual std::shared_ptr<StatsPlugin::ScopeConfig> GetServerScopeConfig(
const ChannelArgs& args) const = 0;

// Adds \a value to the uint64 counter specified by \a handle. \a label_values
// and \a optional_label_values specify attributes that are associated with
Expand Down
6 changes: 3 additions & 3 deletions test/core/test_util/fake_stats_plugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,12 +270,12 @@ class FakeStatsPlugin : public StatsPlugin {
const ChannelArgs& /*args*/) const override {
return {true, nullptr};
}
std::shared_ptr<grpc_core::StatsPlugin::ScopeConfig> GetChannelScopeConfig(
std::shared_ptr<StatsPlugin::ScopeConfig> GetChannelScopeConfig(
const experimental::StatsPluginChannelScope& scope) const override {
return nullptr;
}
std::shared_ptr<grpc_core::StatsPlugin::ScopeConfig> GetServerScopeConfig(
const grpc_core::ChannelArgs& args) const override {
std::shared_ptr<StatsPlugin::ScopeConfig> GetServerScopeConfig(
const ChannelArgs& args) const override {
return nullptr;
}

Expand Down