Chiebot-Mirror
/
grpc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[build] Remove linkage of logging_filter -> otel (#34729)

Browse Source 
Reverse dependency edge, so instead of saying `logging_filter _after_
otel`, instead say `otel _before_ logging_filter` - since this doesn't
inadvertently bring otel into builds where it's unnecessary.

Required moving filter class definitions into the header - which mirrors
all other filters, so I think this is fine.
Also required removing the bespoke visibility rules on logging_filter -
which also seems relatively fine (the defaults limit to grpc usage, and
it's hard to see a firm requirement for tighter visibility that that).
pull/34731/head
Craig Tiller 1 year ago committed by GitHub
parent 0cdcb2a2bf
commit c19e5dcd6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 219 additions and 200 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      BUILD
  2. 5
      src/core/BUILD
  3. 34
      src/core/ext/filters/logging/logging_filter.cc
  4. 39
      src/core/ext/filters/logging/logging_filter.h
  5. 8
      src/cpp/ext/filters/census/grpc_plugin.cc

1
BUILD
Unescape View File

@ -2372,6 +2372,7 @@ grpc_cc_library(
"//src/core:channel_stack_type",
"//src/core:context",
"//src/core:error",
"//src/core:logging_filter",
"//src/core:slice",
"//src/core:slice_buffer",
"//src/core:slice_refcount",

5
src/core/BUILD
Unescape View File

@ -6100,10 +6100,6 @@ grpc_cc_library(
"absl/types:optional",
],
language = "c++",
visibility = [
"//src/cpp/ext/gcp:__subpackages__",
"//test:__subpackages__",
],
deps = [
"arena",
"arena_promise",
@ -6124,7 +6120,6 @@ grpc_cc_library(
"//:gpr_platform",
"//:grpc_base",
"//:grpc_client_channel",
"//:grpc_opencensus_plugin",
"//:grpc_public_hdrs",
"//:grpc_resolver",
"//:legacy_context",

34
src/core/ext/filters/logging/logging_filter.cc
Unescape View File

@ -54,7 +54,6 @@
#include "src/core/lib/channel/channel_fwd.h"
#include "src/core/lib/channel/channel_stack.h"
#include "src/core/lib/channel/context.h"
#include "src/core/lib/channel/promise_based_filter.h"
#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/gprpp/host_port.h"
#include "src/core/lib/gprpp/time.h"
@ -71,7 +70,6 @@
#include "src/core/lib/transport/metadata_batch.h"
#include "src/core/lib/transport/transport.h"
#include "src/core/lib/uri/uri_parser.h"
#include "src/cpp/ext/filters/census/client_filter.h"
namespace grpc_core {
@ -342,11 +340,9 @@ class CallData {
LoggingSink::Config config_;
};
class ClientLoggingFilter final : public ChannelFilter {
public:
static const grpc_channel_filter kFilter;
} // namespace
static absl::StatusOr<ClientLoggingFilter> Create(
absl::StatusOr<ClientLoggingFilter> ClientLoggingFilter::Create(
const ChannelArgs& args, ChannelFilter::Args /*filter_args*/) {
absl::optional<absl::string_view> default_authority =
args.GetString(GRPC_ARG_DEFAULT_AUTHORITY);
@ -364,8 +360,8 @@ class ClientLoggingFilter final : public ChannelFilter {
}
// Construct a promise for one call.
ArenaPromise<ServerMetadataHandle> MakeCallPromise(
CallArgs call_args, NextPromiseFactory next_promise_factory) override {
ArenaPromise<ServerMetadataHandle> ClientLoggingFilter::MakeCallPromise(
CallArgs call_args, NextPromiseFactory next_promise_factory) {
CallData* calld = GetContext<Arena>()->ManagedNew<CallData>(
true, call_args, default_authority_);
if (!calld->ShouldLog()) {
@ -443,30 +439,20 @@ class ClientLoggingFilter final : public ChannelFilter {
});
}
private:
explicit ClientLoggingFilter(std::string default_authority)
: default_authority_(std::move(default_authority)) {}
std::string default_authority_;
};
const grpc_channel_filter ClientLoggingFilter::kFilter =
MakePromiseBasedFilter<ClientLoggingFilter, FilterEndpoint::kClient,
kFilterExaminesServerInitialMetadata |
kFilterExaminesInboundMessages |
kFilterExaminesOutboundMessages>("logging");
class ServerLoggingFilter final : public ChannelFilter {
public:
static const grpc_channel_filter kFilter;
static absl::StatusOr<ServerLoggingFilter> Create(
absl::StatusOr<ServerLoggingFilter> ServerLoggingFilter::Create(
const ChannelArgs& /*args*/, ChannelFilter::Args /*filter_args*/) {
return ServerLoggingFilter();
}
// Construct a promise for one call.
ArenaPromise<ServerMetadataHandle> MakeCallPromise(
CallArgs call_args, NextPromiseFactory next_promise_factory) override {
ArenaPromise<ServerMetadataHandle> ServerLoggingFilter::MakeCallPromise(
CallArgs call_args, NextPromiseFactory next_promise_factory) {
CallData* calld = GetContext<Arena>()->ManagedNew<CallData>(
false, call_args, /*default_authority=*/"");
if (!calld->ShouldLog()) {
@ -539,7 +525,6 @@ class ServerLoggingFilter final : public ChannelFilter {
/*is_client=*/false, call_tracer);
});
}
};
const grpc_channel_filter ServerLoggingFilter::kFilter =
MakePromiseBasedFilter<ServerLoggingFilter, FilterEndpoint::kServer,
@ -547,8 +532,6 @@ const grpc_channel_filter ServerLoggingFilter::kFilter =
kFilterExaminesInboundMessages |
kFilterExaminesOutboundMessages>("logging");
} // namespace
void RegisterLoggingFilter(LoggingSink* sink) {
g_logging_sink = sink;
CoreConfiguration::RegisterBuilder([](CoreConfiguration::Builder* builder) {
@ -559,8 +542,7 @@ void RegisterLoggingFilter(LoggingSink* sink) {
builder->channel_init()
->RegisterFilter(GRPC_CLIENT_CHANNEL, &ClientLoggingFilter::kFilter)
// TODO(yashykt) : Figure out a good place to place this channel arg
.IfChannelArg("grpc.experimental.enable_observability", true)
.After({&grpc::internal::OpenCensusClientFilter::kFilter});
.IfChannelArg("grpc.experimental.enable_observability", true);
});
}

39
src/core/ext/filters/logging/logging_filter.h
Unescape View File

@ -21,10 +21,49 @@
#include <grpc/support/port_platform.h>
#include <string>
#include <utility>
#include "absl/status/statusor.h"
#include "src/core/ext/filters/logging/logging_sink.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/channel_fwd.h"
#include "src/core/lib/channel/promise_based_filter.h"
#include "src/core/lib/promise/arena_promise.h"
#include "src/core/lib/transport/transport.h"
namespace grpc_core {
class ClientLoggingFilter final : public ChannelFilter {
public:
static const grpc_channel_filter kFilter;
static absl::StatusOr<ClientLoggingFilter> Create(
const ChannelArgs& args, ChannelFilter::Args /*filter_args*/);
// Construct a promise for one call.
ArenaPromise<ServerMetadataHandle> MakeCallPromise(
CallArgs call_args, NextPromiseFactory next_promise_factory) override;
private:
explicit ClientLoggingFilter(std::string default_authority)
: default_authority_(std::move(default_authority)) {}
std::string default_authority_;
};
class ServerLoggingFilter final : public ChannelFilter {
public:
static const grpc_channel_filter kFilter;
static absl::StatusOr<ServerLoggingFilter> Create(
const ChannelArgs& args, ChannelFilter::Args /*filter_args*/);
// Construct a promise for one call.
ArenaPromise<ServerMetadataHandle> MakeCallPromise(
CallArgs call_args, NextPromiseFactory next_promise_factory) override;
};
void RegisterLoggingFilter(LoggingSink* sink);
} // namespace grpc_core

8
src/cpp/ext/filters/census/grpc_plugin.cc
Unescape View File

@ -30,6 +30,7 @@
#include <grpcpp/opencensus.h>
#include <grpcpp/server_context.h>
#include "src/core/ext/filters/logging/logging_filter.h"
#include "src/core/lib/channel/call_tracer.h"
#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/surface/channel_stack_type.h"
@ -44,9 +45,10 @@ void RegisterOpenCensusPlugin() {
new grpc::internal::OpenCensusServerCallTracerFactory);
grpc_core::CoreConfiguration::RegisterBuilder(
[](grpc_core::CoreConfiguration::Builder* builder) {
builder->channel_init()->RegisterFilter(
GRPC_CLIENT_CHANNEL,
&grpc::internal::OpenCensusClientFilter::kFilter);
builder->channel_init()
->RegisterFilter(GRPC_CLIENT_CHANNEL,
&grpc::internal::OpenCensusClientFilter::kFilter)
.Before({&grpc_core::ClientLoggingFilter::kFilter});
});
// Access measures to ensure they are initialized. Otherwise, creating a view

Write Preview
Loading…
Cancel
Save