Skip to content
This repository was archived by the owner on Jul 31, 2023. It is now read-only.

Commit f663320

Browse files
authored
Adding in MessageEvents for client and server. (#87)
Adding in MessageEvents for client and server.
1 parent f752b0c commit f663320

File tree

4 files changed

+18
-11
lines changed

4 files changed

+18
-11
lines changed

opencensus/plugins/grpc/internal/client_filter.cc

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ void CensusClientCallData::OnDoneRecvTrailingMetadataCb(void *user_data,
5252
CensusClientCallData *calld =
5353
reinterpret_cast<CensusClientCallData *>(elem->call_data);
5454
GPR_ASSERT(calld != nullptr);
55-
if ((*calld->recv_message_) != nullptr) {
56-
++calld->recv_message_count_;
57-
}
5855
if (error == GRPC_ERROR_NONE) {
5956
GPR_ASSERT(calld->recv_trailing_metadata_ != nullptr);
6057
FilterTrailingMetadata(calld->recv_trailing_metadata_,
@@ -75,7 +72,9 @@ void CensusClientCallData::OnDoneRecvMessageCb(void *user_data,
7572
GPR_ASSERT(channeld != nullptr);
7673
// Stream messages are no longer valid after receiving trailing metadata.
7774
if ((*calld->recv_message_) != nullptr) {
78-
calld->recv_message_count_++;
75+
calld->context_.Span().AddReceivedMessageEvent(
76+
calld->recv_message_count_++, (*calld->recv_message_)->length,
77+
(*calld->recv_message_)->length);
7978
}
8079
GRPC_CLOSURE_RUN(calld->initial_on_done_recv_message_, GRPC_ERROR_REF(error));
8180
}
@@ -116,7 +115,10 @@ void CensusClientCallData::StartTransportStreamOpBatch(
116115
}
117116

118117
if (op->send_message() != nullptr) {
119-
++sent_message_count_;
118+
context_.Span().AddSentMessageEvent(
119+
sent_message_count_++,
120+
op->op()->payload->send_message.send_message->length,
121+
op->op()->payload->send_message.send_message->length);
120122
}
121123
if (op->recv_message() != nullptr) {
122124
recv_message_ = op->op()->payload->recv_message.recv_message;

opencensus/plugins/grpc/internal/client_filter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ class CensusClientCallData : public grpc::CallData {
8080
// The received message--may be null.
8181
grpc_byte_stream **recv_message_; // Not owned.
8282
// Number of messages in this RPC.
83-
uint64_t recv_message_count_;
84-
uint64_t sent_message_count_;
83+
uint32_t recv_message_count_;
84+
uint32_t sent_message_count_;
8585
};
8686

8787
} // namespace opencensus

opencensus/plugins/grpc/internal/server_filter.cc

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ void CensusServerCallData::OnDoneRecvMessageCb(void *user_data,
7272
GPR_ASSERT(channeld != nullptr);
7373
// Stream messages are no longer valid after receiving trailing metadata.
7474
if ((*calld->recv_message_) != nullptr) {
75-
++calld->recv_message_count_;
75+
calld->context_.Span().AddReceivedMessageEvent(
76+
calld->recv_message_count_++, (*calld->recv_message_)->length,
77+
(*calld->recv_message_)->length);
7678
}
7779
GRPC_CLOSURE_RUN(calld->initial_on_done_recv_message_, GRPC_ERROR_REF(error));
7880
}
@@ -141,7 +143,10 @@ void CensusServerCallData::StartTransportStreamOpBatch(
141143
op->set_recv_initial_metadata_ready(&on_done_recv_initial_metadata_);
142144
}
143145
if (op->send_message() != nullptr) {
144-
++sent_message_count_;
146+
context_.Span().AddSentMessageEvent(
147+
sent_message_count_++,
148+
op->op()->payload->send_message.send_message->length,
149+
op->op()->payload->send_message.send_message->length);
145150
}
146151
if (op->recv_message() != nullptr) {
147152
recv_message_ = op->op()->payload->recv_message.recv_message;

opencensus/plugins/grpc/internal/server_filter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ class CensusServerCallData : public grpc::CallData {
7979
absl::Time start_time_; // For measuring elapsed time.
8080
absl::Duration elapsed_time_;
8181
grpc_byte_stream **recv_message_;
82-
uint64_t recv_message_count_;
83-
uint64_t sent_message_count_;
82+
uint32_t recv_message_count_;
83+
uint32_t sent_message_count_;
8484
};
8585

8686
} // namespace opencensus

0 commit comments

Comments
 (0)