grpc 1.66.0 → 1.67.0.pre1

data/src/core/lib/security/authorization/grpc_authorization_engine.cc

@@ -20,7 +20,6 @@
 
 #include "absl/log/check.h"
 
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/security/authorization/audit_logging.h"

data/src/core/lib/security/authorization/grpc_server_authz_filter.cc

@@ -64,23 +64,21 @@ GrpcServerAuthzFilter::Create(const ChannelArgs& args, ChannelFilter::Args) {
 
 bool GrpcServerAuthzFilter::IsAuthorized(ClientMetadata& initial_metadata) {
   EvaluateArgs args(&initial_metadata, &per_channel_evaluate_args_);
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_authz_api)) {
-    VLOG(2) << "checking request: url_path=" << args.GetPath()
-            << ", transport_security_type=" << args.GetTransportSecurityType()
-            << ", uri_sans=[" << absl::StrJoin(args.GetUriSans(), ",")
-            << "], dns_sans=[" << absl::StrJoin(args.GetDnsSans(), ",")
-            << "], subject=" << args.GetSubject();
-  }
+  GRPC_TRACE_VLOG(grpc_authz_api, 2)
+      << "checking request: url_path=" << args.GetPath()
+      << ", transport_security_type=" << args.GetTransportSecurityType()
+      << ", uri_sans=[" << absl::StrJoin(args.GetUriSans(), ",")
+      << "], dns_sans=[" << absl::StrJoin(args.GetDnsSans(), ",")
+      << "], subject=" << args.GetSubject();
   grpc_authorization_policy_provider::AuthorizationEngines engines =
       provider_->engines();
   if (engines.deny_engine != nullptr) {
     AuthorizationEngine::Decision decision =
         engines.deny_engine->Evaluate(args);
     if (decision.type == AuthorizationEngine::Decision::Type::kDeny) {
-      if (GRPC_TRACE_FLAG_ENABLED(grpc_authz_api)) {
-        LOG(INFO) << "chand=" << this << ": request denied by policy "
-                  << decision.matching_policy_name;
-      }
+      GRPC_TRACE_LOG(grpc_authz_api, INFO)
+          << "chand=" << this << ": request denied by policy "
+          << decision.matching_policy_name;
       return false;
     }
   }
@@ -88,17 +86,14 @@ bool GrpcServerAuthzFilter::IsAuthorized(ClientMetadata& initial_metadata) {
     AuthorizationEngine::Decision decision =
         engines.allow_engine->Evaluate(args);
     if (decision.type == AuthorizationEngine::Decision::Type::kAllow) {
-      if (GRPC_TRACE_FLAG_ENABLED(grpc_authz_api)) {
-        VLOG(2) << "chand=" << this << ": request allowed by policy "
-                << decision.matching_policy_name;
-      }
+      GRPC_TRACE_VLOG(grpc_authz_api, 2)
+          << "chand=" << this << ": request allowed by policy "
+          << decision.matching_policy_name;
       return true;
     }
   }
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_authz_api)) {
-    LOG(INFO) << "chand=" << this
-              << ": request denied, no matching policy found.";
-  }
+  GRPC_TRACE_LOG(grpc_authz_api, INFO)
+      << "chand=" << this << ": request denied, no matching policy found.";
   return false;
 }
 

data/src/core/lib/security/authorization/stdout_logger.cc

@@ -27,7 +27,6 @@
 
 #include <grpc/grpc_audit_logging.h>
 #include <grpc/support/json.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
 namespace grpc_core {

data/src/core/lib/security/credentials/alts/check_gcp_environment.cc

@@ -25,7 +25,6 @@
 #include "absl/log/log.h"
 
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
 const size_t kBiosDataBufferSize = 256;

data/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc

@@ -26,7 +26,6 @@
 #include <windows.h>
 
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
 #include <grpc/support/sync.h>
 
 #include "src/core/lib/gprpp/crash.h"

data/src/core/lib/security/credentials/call_creds_util.cc

@@ -22,7 +22,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 

data/src/core/lib/security/credentials/composite/composite_credentials.cc

@@ -26,7 +26,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
 
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/debug/trace.h"

data/src/core/lib/security/credentials/composite/composite_credentials.h

@@ -102,6 +102,8 @@ class grpc_composite_call_credentials : public grpc_call_credentials {
       grpc_core::RefCountedPtr<grpc_call_credentials> creds2);
   ~grpc_composite_call_credentials() override = default;
 
+  void Orphaned() override { inner_.clear(); }
+
   grpc_core::ArenaPromise<absl::StatusOr<grpc_core::ClientMetadataHandle>>
   GetRequestMetadata(grpc_core::ClientMetadataHandle initial_metadata,
                      const GetRequestMetadataArgs* args) override;

data/src/core/lib/security/credentials/credentials.h

@@ -32,7 +32,6 @@
 #include <grpc/grpc_security.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/impl/grpc_types.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/channel_args.h"
@@ -184,7 +183,7 @@ using CredentialsMetadataArray = std::vector<std::pair<Slice, Slice>>;
 // class. Otherwise, compiler will complain about type mismatch due to
 // -Wmismatched-tags.
 struct grpc_call_credentials
-    : public grpc_core::RefCounted<grpc_call_credentials> {
+    : public grpc_core::DualRefCounted<grpc_call_credentials> {
  public:
   // TODO(roth): Consider whether security connector actually needs to
   // be part of this interface.  Currently, it is here only for the