grpc 1.52.0 → 1.53.0.pre2

data/src/core/ext/xds/xds_transport.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_XDS_XDS_TRANSPORT_H
-#define GRPC_CORE_EXT_XDS_XDS_TRANSPORT_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_H
+#define GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_H
 
 #include <grpc/support/port_platform.h>
 
@@ -83,4 +83,4 @@ class XdsTransportFactory : public InternallyRefCounted<XdsTransportFactory> {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_XDS_TRANSPORT_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_H

data/src/core/ext/xds/xds_transport_grpc.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_XDS_XDS_TRANSPORT_GRPC_H
-#define GRPC_CORE_EXT_XDS_XDS_TRANSPORT_GRPC_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_GRPC_H
+#define GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_GRPC_H
 
 #include <grpc/support/port_platform.h>
 
@@ -132,4 +132,4 @@ class GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_XDS_TRANSPORT_GRPC_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_GRPC_H

data/src/core/lib/address_utils/parse_address.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_ADDRESS_UTILS_PARSE_ADDRESS_H
-#define GRPC_CORE_LIB_ADDRESS_UTILS_PARSE_ADDRESS_H
+#ifndef GRPC_SRC_CORE_LIB_ADDRESS_UTILS_PARSE_ADDRESS_H
+#define GRPC_SRC_CORE_LIB_ADDRESS_UTILS_PARSE_ADDRESS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -83,4 +83,4 @@ grpc_error_handle UnixAbstractSockaddrPopulate(
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_ADDRESS_UTILS_PARSE_ADDRESS_H
+#endif  // GRPC_SRC_CORE_LIB_ADDRESS_UTILS_PARSE_ADDRESS_H

data/src/core/lib/address_utils/sockaddr_utils.cc

@@ -24,6 +24,7 @@
 #include <inttypes.h>
 #include <string.h>
 
+#include <initializer_list>
 #include <string>
 #include <utility>
 

data/src/core/lib/address_utils/sockaddr_utils.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_ADDRESS_UTILS_SOCKADDR_UTILS_H
-#define GRPC_CORE_LIB_ADDRESS_UTILS_SOCKADDR_UTILS_H
+#ifndef GRPC_SRC_CORE_LIB_ADDRESS_UTILS_SOCKADDR_UTILS_H
+#define GRPC_SRC_CORE_LIB_ADDRESS_UTILS_SOCKADDR_UTILS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -97,4 +97,4 @@ bool grpc_sockaddr_match_subnet(const grpc_resolved_address* address,
                                 const grpc_resolved_address* subnet_address,
                                 uint32_t mask_bits);
 
-#endif  // GRPC_CORE_LIB_ADDRESS_UTILS_SOCKADDR_UTILS_H
+#endif  // GRPC_SRC_CORE_LIB_ADDRESS_UTILS_SOCKADDR_UTILS_H

data/src/core/lib/avl/avl.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_AVL_AVL_H
-#define GRPC_CORE_LIB_AVL_AVL_H
+#ifndef GRPC_SRC_CORE_LIB_AVL_AVL_H
+#define GRPC_SRC_CORE_LIB_AVL_AVL_H
 
 #include <grpc/support/port_platform.h>
 
@@ -479,4 +479,4 @@ class AVL<K, void> {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_AVL_AVL_H
+#endif  // GRPC_SRC_CORE_LIB_AVL_AVL_H

data/src/core/lib/backoff/backoff.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_BACKOFF_BACKOFF_H
-#define GRPC_CORE_LIB_BACKOFF_BACKOFF_H
+#ifndef GRPC_SRC_CORE_LIB_BACKOFF_BACKOFF_H
+#define GRPC_SRC_CORE_LIB_BACKOFF_BACKOFF_H
 
 #include <grpc/support/port_platform.h>
 
@@ -86,4 +86,4 @@ class BackOff {
 };
 
 }  // namespace grpc_core
-#endif  // GRPC_CORE_LIB_BACKOFF_BACKOFF_H
+#endif  // GRPC_SRC_CORE_LIB_BACKOFF_BACKOFF_H

data/src/core/lib/channel/call_finalization.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_CHANNEL_CALL_FINALIZATION_H
-#define GRPC_CORE_LIB_CHANNEL_CALL_FINALIZATION_H
+#ifndef GRPC_SRC_CORE_LIB_CHANNEL_CALL_FINALIZATION_H
+#define GRPC_SRC_CORE_LIB_CHANNEL_CALL_FINALIZATION_H
 
 #include <grpc/support/port_platform.h>
 
@@ -85,4 +85,4 @@ struct ContextType<CallFinalization> {};
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_CHANNEL_CALL_FINALIZATION_H
+#endif  // GRPC_SRC_CORE_LIB_CHANNEL_CALL_FINALIZATION_H

data/src/core/lib/channel/call_tracer.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_CHANNEL_CALL_TRACER_H
-#define GRPC_CORE_LIB_CHANNEL_CALL_TRACER_H
+#ifndef GRPC_SRC_CORE_LIB_CHANNEL_CALL_TRACER_H
+#define GRPC_SRC_CORE_LIB_CHANNEL_CALL_TRACER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -100,4 +100,4 @@ class CallTracer {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_CHANNEL_CALL_TRACER_H
+#endif  // GRPC_SRC_CORE_LIB_CHANNEL_CALL_TRACER_H

data/src/core/lib/channel/channel_args.cc

@@ -25,6 +25,7 @@
 #include <string.h>
 
 #include <algorithm>
+#include <initializer_list>
 #include <map>
 #include <vector>
 

data/src/core/lib/channel/channel_args.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_CHANNEL_CHANNEL_ARGS_H
-#define GRPC_CORE_LIB_CHANNEL_CHANNEL_ARGS_H
+#ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_H
+#define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -188,8 +188,14 @@ struct GetObjectImpl<T, absl::enable_if_t<WrapInSharedPtr<T>::value, void>> {
   using Result = T*;
   using ReffedResult = std::shared_ptr<T>;
   using StoredType = std::shared_ptr<T>*;
-  static Result Get(StoredType p) { return p->get(); };
-  static ReffedResult GetReffed(StoredType p) { return ReffedResult(*p); };
+  static Result Get(StoredType p) {
+    if (p == nullptr) return nullptr;
+    return p->get();
+  };
+  static ReffedResult GetReffed(StoredType p) {
+    if (p == nullptr) return nullptr;
+    return ReffedResult(*p);
+  };
   static ReffedResult GetReffed(StoredType p,
                                 const DebugLocation& /* location */,
                                 const char* /* reason */) {
@@ -542,4 +548,4 @@ void grpc_channel_args_set_client_channel_creation_mutator(
 grpc_channel_args_client_channel_creation_mutator
 grpc_channel_args_get_client_channel_creation_mutator();
 
-#endif  // GRPC_CORE_LIB_CHANNEL_CHANNEL_ARGS_H
+#endif  // GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_H

data/src/core/lib/channel/channel_args_preconditioning.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_CHANNEL_CHANNEL_ARGS_PRECONDITIONING_H
-#define GRPC_CORE_LIB_CHANNEL_CHANNEL_ARGS_PRECONDITIONING_H
+#ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_PRECONDITIONING_H
+#define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_PRECONDITIONING_H
 
 #include <grpc/support/port_platform.h>
 
@@ -59,4 +59,4 @@ class ChannelArgsPreconditioning {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_CHANNEL_CHANNEL_ARGS_PRECONDITIONING_H
+#endif  // GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_PRECONDITIONING_H

data/src/core/lib/channel/channel_fwd.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_CHANNEL_CHANNEL_FWD_H
-#define GRPC_CORE_LIB_CHANNEL_CHANNEL_FWD_H
+#ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_FWD_H
+#define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_FWD_H
 
 typedef struct grpc_channel_stack grpc_channel_stack;
 typedef struct grpc_channel_filter grpc_channel_filter;
@@ -23,4 +23,4 @@ typedef struct grpc_call_element grpc_call_element;
 
 typedef struct grpc_call_stack grpc_call_stack;
 
-#endif  // GRPC_CORE_LIB_CHANNEL_CHANNEL_FWD_H
+#endif  // GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_FWD_H

data/src/core/lib/channel/channel_stack.cc

@@ -139,10 +139,9 @@ grpc_error_handle grpc_channel_stack_init(
 
   // init per-filter data
   grpc_error_handle first_error;
-  auto c_channel_args = channel_args.ToC();
   for (i = 0; i < filter_count; i++) {
     args.channel_stack = stack;
-    args.channel_args = c_channel_args.get();
+    args.channel_args = channel_args;
     args.is_first = i == 0;
     args.is_last = i == (filter_count - 1);
     elems[i].filter = filters[i];

data/src/core/lib/channel/channel_stack.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_CHANNEL_CHANNEL_STACK_H
-#define GRPC_CORE_LIB_CHANNEL_CHANNEL_STACK_H
+#ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_H
+#define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_H
 
 //////////////////////////////////////////////////////////////////////////////
 // IMPORTANT NOTE:
@@ -76,7 +76,7 @@
 
 struct grpc_channel_element_args {
   grpc_channel_stack* channel_stack;
-  const grpc_channel_args* channel_args;
+  grpc_core::ChannelArgs channel_args;
   int is_first;
   int is_last;
 };
@@ -391,4 +391,4 @@ extern grpc_core::TraceFlag grpc_trace_channel;
     }                                                  \
   } while (0)
 
-#endif  // GRPC_CORE_LIB_CHANNEL_CHANNEL_STACK_H
+#endif  // GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_H

data/src/core/lib/channel/channel_stack_builder.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_H
-#define GRPC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_H
+#ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_H
+#define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -117,4 +117,4 @@ class ChannelStackBuilder {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_H
+#endif  // GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_H

data/src/core/lib/channel/channel_stack_builder_impl.cc

@@ -37,6 +37,7 @@
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/surface/call_trace.h"
+#include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/lib/transport/error_utils.h"
 #include "src/core/lib/transport/transport.h"
 
@@ -53,12 +54,24 @@ absl::StatusOr<RefCountedPtr<grpc_channel_stack>>
 ChannelStackBuilderImpl::Build() {
   std::vector<const grpc_channel_filter*> stack;
   const bool is_promising = IsPromising();
+  const bool is_client =
+      grpc_channel_stack_type_is_client(channel_stack_type());
+  const bool client_promise_tracing =
+      is_client && is_promising && grpc_call_trace.enabled();
+  const bool server_promise_tracing =
+      !is_client && is_promising && grpc_call_trace.enabled();
 
   for (const auto* filter : this->stack()) {
-    if (is_promising && grpc_call_trace.enabled()) {
+    if (client_promise_tracing) {
       stack.push_back(PromiseTracingFilterFor(filter));
     }
     stack.push_back(filter);
+    if (server_promise_tracing) {
+      stack.push_back(PromiseTracingFilterFor(filter));
+    }
+  }
+  if (server_promise_tracing) {
+    stack.pop_back();  // connected_channel must be last => can't be traced
   }
 
   // calculate the size of the channel stack

data/src/core/lib/channel/channel_stack_builder_impl.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_IMPL_H
-#define GRPC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_IMPL_H
+#ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_IMPL_H
+#define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_IMPL_H
 
 #include <grpc/support/port_platform.h>
 
@@ -45,4 +45,4 @@ class ChannelStackBuilderImpl final : public ChannelStackBuilder {
 };
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_IMPL_H
+#endif  // GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_IMPL_H

data/src/core/lib/channel/channel_trace.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_CHANNEL_CHANNEL_TRACE_H
-#define GRPC_CORE_LIB_CHANNEL_CHANNEL_TRACE_H
+#ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_TRACE_H
+#define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_TRACE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -135,4 +135,4 @@ class ChannelTrace {
 }  // namespace channelz
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_CHANNEL_CHANNEL_TRACE_H
+#endif  // GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_TRACE_H

data/src/core/lib/channel/channelz.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_CHANNEL_CHANNELZ_H
-#define GRPC_CORE_LIB_CHANNEL_CHANNELZ_H
+#ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNELZ_H
+#define GRPC_SRC_CORE_LIB_CHANNEL_CHANNELZ_H
 
 #include <grpc/support/port_platform.h>
 
@@ -371,4 +371,4 @@ class ListenSocketNode : public BaseNode {
 }  // namespace channelz
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_CHANNEL_CHANNELZ_H
+#endif  // GRPC_SRC_CORE_LIB_CHANNEL_CHANNELZ_H

data/src/core/lib/channel/channelz_registry.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_CHANNEL_CHANNELZ_REGISTRY_H
-#define GRPC_CORE_LIB_CHANNEL_CHANNELZ_REGISTRY_H
+#ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNELZ_REGISTRY_H
+#define GRPC_SRC_CORE_LIB_CHANNEL_CHANNELZ_REGISTRY_H
 
 #include <grpc/support/port_platform.h>
 
@@ -97,4 +97,4 @@ class ChannelzRegistry {
 }  // namespace channelz
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_CHANNEL_CHANNELZ_REGISTRY_H
+#endif  // GRPC_SRC_CORE_LIB_CHANNEL_CHANNELZ_REGISTRY_H