Skip to content

Commit 4928f6e

Browse files
committed
Fixes
1 parent 3473a49 commit 4928f6e

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

src/core/ext/transport/chaotic_good/data_endpoints.cc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -491,14 +491,14 @@ auto Endpoint::WriteLoop(uint32_t id,
491491
output_buffers = std::move(output_buffers),
492492
requested_metrics = std::move(requested_metrics),
493493
data_rate_metric, ztrace_collector,
494-
telemetry_info = std::move(telemetry_info)]() {
494+
telemetry_info = std::move(telemetry_info)]() mutable {
495495
return TrySeq(
496496
output_buffers->Next(id),
497497
[endpoint, id,
498498
requested_metrics = absl::Span<const size_t>(requested_metrics),
499499
data_rate_metric, output_buffers, ztrace_collector,
500500
telemetry_info = std::move(telemetry_info)](
501-
data_endpoints_detail::NextWrite next_write) {
501+
data_endpoints_detail::NextWrite next_write) mutable {
502502
GRPC_TRACE_LOG(chaotic_good, INFO)
503503
<< "CHAOTIC_GOOD: " << output_buffers.get() << " "
504504
<< ResolvedAddressToString(endpoint->GetPeerAddress())
@@ -519,8 +519,7 @@ auto Endpoint::WriteLoop(uint32_t id,
519519
absl::Time timestamp,
520520
std::vector<EventEngine::Endpoint::WriteMetric> metrics) {
521521
ztrace_collector->Append(
522-
[event, timestamp, &metrics,
523-
telemetry_info = std::move(telemetry_info)]() {
522+
[event, timestamp, &metrics, &telemetry_info]() {
524523
EndpointWriteMetricsTrace trace{timestamp, event, {}};
525524
trace.metrics.reserve(metrics.size());
526525
for (const auto [id, value] : metrics) {

src/core/ext/transport/chttp2/transport/chttp2_transport.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1186,6 +1186,7 @@ static void write_action(
11861186
// Choose max_frame_size as the preferred rx crypto frame size indicated by
11871187
// the peer.
11881188
grpc_event_engine::experimental::EventEngine::Endpoint::WriteArgs args;
1189+
std::vector<size_t> write_metrics;
11891190
int max_frame_size =
11901191
t->settings.peer().preferred_receive_crypto_message_size();
11911192
// Note: max frame size is 0 if the remote peer does not support adjusting the
@@ -1202,8 +1203,9 @@ static void write_action(
12021203
if (ee_ep != nullptr) {
12031204
auto telemetry_info = ee_ep->GetTelemetryInfo();
12041205
if (telemetry_info != nullptr) {
1206+
write_metrics = telemetry_info->AllWriteMetrics();
12051207
args.set_metrics_sink(WriteEventSink(
1206-
{telemetry_info->AllWriteMetrics()},
1208+
write_metrics,
12071209
{WriteEvent::kSendMsg, WriteEvent::kScheduled, WriteEvent::kSent,
12081210
WriteEvent::kAcked},
12091211
[tcp_call_tracers = std::move(tcp_call_tracers),

src/core/handshaker/security/secure_endpoint.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -702,8 +702,9 @@ class SecureEndpoint final : public EventEngine::Endpoint {
702702
public:
703703
class TelemetryInfo : public EventEngine::Endpoint::TelemetryInfo {
704704
public:
705-
TelemetryInfo(std::shared_ptr<EventEngine::Endpoint::TelemetryInfo>
706-
wrapped_telemetry_info)
705+
explicit TelemetryInfo(
706+
std::shared_ptr<EventEngine::Endpoint::TelemetryInfo>
707+
wrapped_telemetry_info)
707708
: wrapped_telemetry_info_(std::move(wrapped_telemetry_info)) {}
708709

709710
std::vector<size_t> AllWriteMetrics() const override {

test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -477,17 +477,15 @@ class FuzzingEventEngine::FuzzingEndpoint::TelemetryInfo
477477
return out;
478478
}
479479

480-
virtual std::optional<absl::string_view> GetMetricName(
481-
size_t key) const override {
480+
std::optional<absl::string_view> GetMetricName(size_t key) const override {
482481
auto it = g_fuzzing_event_engine->endpoint_metrics_by_id_.find(key);
483482
if (it == g_fuzzing_event_engine->endpoint_metrics_by_id_.end()) {
484483
return std::nullopt;
485484
}
486485
return it->second;
487486
}
488487

489-
virtual std::optional<size_t> GetMetricKey(
490-
absl::string_view name) const override {
488+
std::optional<size_t> GetMetricKey(absl::string_view name) const override {
491489
auto it = g_fuzzing_event_engine->endpoint_metrics_by_name_.find(
492490
std::string(name));
493491
if (it == g_fuzzing_event_engine->endpoint_metrics_by_name_.end()) {

0 commit comments

Comments
 (0)