Skip to content

Commit 65a6ad9

Browse files
committed
fix clang-tidy cppcoreguidelines-rvalue-reference-param-not-moved warnings
1 parent 3285226 commit 65a6ad9

File tree

7 files changed

+37
-16
lines changed

7 files changed

+37
-16
lines changed

api/test/logs/logger_test.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,10 @@ class TestLogger : public Logger
206206

207207
using Logger::EmitLogRecord;
208208

209-
void EmitLogRecord(nostd::unique_ptr<opentelemetry::logs::LogRecord> &&) noexcept override {}
209+
// NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
210+
void EmitLogRecord(
211+
nostd::unique_ptr<opentelemetry::logs::LogRecord> && /*log_record*/) noexcept override
212+
{}
210213
};
211214

212215
// Define a basic LoggerProvider class that returns an instance of the logger class defined above

exporters/otlp/src/otlp_grpc_client.cc

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,12 @@ static sdk::common::ExportResult InternalDelegateAsyncExport(
173173
OTEL_INTERNAL_LOG_ERROR("[OTLP GRPC Client] ERROR: Export "
174174
<< export_data_count << " " << export_data_name
175175
<< " failed, exporter queue is full");
176-
if (result_callback)
176+
177+
auto result_callback_fn = std::move(result_callback);
178+
if (result_callback_fn)
177179
{
178-
result_callback(opentelemetry::sdk::common::ExportResult::kFailureFull, std::move(arena),
179-
request, nullptr);
180+
result_callback_fn(opentelemetry::sdk::common::ExportResult::kFailureFull, std::move(arena),
181+
request, nullptr);
180182
}
181183
return opentelemetry::sdk::common::ExportResult::kFailureFull;
182184
}
@@ -205,7 +207,8 @@ static sdk::common::ExportResult InternalDelegateAsyncExport(
205207

206208
return opentelemetry::sdk::common::ExportResult::kFailure;
207209
}
208-
call_data->grpc_context.swap(context);
210+
auto context_ptr = std::move(context);
211+
call_data->grpc_context.swap(context_ptr);
209212

210213
call_data->grpc_async_callback = [](OtlpGrpcAsyncCallDataBase *base_call_data) {
211214
OtlpGrpcAsyncCallData<RequestType, ResponseType> *real_call_data =
@@ -519,31 +522,40 @@ OtlpGrpcClient::MakeLogsServiceStub()
519522
grpc::Status OtlpGrpcClient::DelegateExport(
520523
proto::collector::trace::v1::TraceService::StubInterface *stub,
521524
std::unique_ptr<grpc::ClientContext> &&context,
522-
std::unique_ptr<google::protobuf::Arena> && /*arena*/,
525+
std::unique_ptr<google::protobuf::Arena> &&arena,
523526
proto::collector::trace::v1::ExportTraceServiceRequest &&request,
524527
proto::collector::trace::v1::ExportTraceServiceResponse *response)
525528
{
526-
return stub->Export(context.get(), request, response);
529+
auto context_ptr = std::move(context);
530+
auto arena_ptr = std::move(arena);
531+
auto request_ptr = std::move(request);
532+
return stub->Export(context_ptr.get(), request_ptr, response);
527533
}
528534

529535
grpc::Status OtlpGrpcClient::DelegateExport(
530536
proto::collector::metrics::v1::MetricsService::StubInterface *stub,
531537
std::unique_ptr<grpc::ClientContext> &&context,
532-
std::unique_ptr<google::protobuf::Arena> && /*arena*/,
538+
std::unique_ptr<google::protobuf::Arena> &&arena,
533539
proto::collector::metrics::v1::ExportMetricsServiceRequest &&request,
534540
proto::collector::metrics::v1::ExportMetricsServiceResponse *response)
535541
{
536-
return stub->Export(context.get(), request, response);
542+
auto context_ptr = std::move(context);
543+
auto arena_ptr = std::move(arena);
544+
auto request_ptr = std::move(request);
545+
return stub->Export(context_ptr.get(), request_ptr, response);
537546
}
538547

539548
grpc::Status OtlpGrpcClient::DelegateExport(
540549
proto::collector::logs::v1::LogsService::StubInterface *stub,
541550
std::unique_ptr<grpc::ClientContext> &&context,
542-
std::unique_ptr<google::protobuf::Arena> && /*arena*/,
551+
std::unique_ptr<google::protobuf::Arena> &&arena,
543552
proto::collector::logs::v1::ExportLogsServiceRequest &&request,
544553
proto::collector::logs::v1::ExportLogsServiceResponse *response)
545554
{
546-
return stub->Export(context.get(), request, response);
555+
auto context_ptr = std::move(context);
556+
auto arena_ptr = std::move(arena);
557+
auto request_ptr = std::move(request);
558+
return stub->Export(context_ptr.get(), request_ptr, response);
547559
}
548560

549561
void OtlpGrpcClient::AddReference(OtlpGrpcClientReferenceGuard &guard,

exporters/otlp/src/otlp_grpc_exporter.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,10 @@ sdk::common::ExportResult OtlpGrpcExporter::Export(
151151
// called.
152152
[trace_service_stub = trace_service_stub_](
153153
opentelemetry::sdk::common::ExportResult result,
154-
std::unique_ptr<google::protobuf::Arena> &&,
154+
std::unique_ptr<google::protobuf::Arena> &&arena,
155155
const proto::collector::trace::v1::ExportTraceServiceRequest &request,
156156
proto::collector::trace::v1::ExportTraceServiceResponse *) {
157+
auto arena_ptr = std::move(arena);
157158
if (result != opentelemetry::sdk::common::ExportResult::kSuccess)
158159
{
159160
OTEL_INTERNAL_LOG_ERROR("[OTLP TRACE GRPC Exporter] ERROR: Export "

exporters/otlp/src/otlp_grpc_log_record_exporter.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,10 @@ opentelemetry::sdk::common::ExportResult OtlpGrpcLogRecordExporter::Export(
155155
// called.
156156
[log_service_stub = log_service_stub_](
157157
opentelemetry::sdk::common::ExportResult result,
158-
std::unique_ptr<google::protobuf::Arena> &&,
158+
std::unique_ptr<google::protobuf::Arena> &&arena,
159159
const proto::collector::logs::v1::ExportLogsServiceRequest &request,
160160
proto::collector::logs::v1::ExportLogsServiceResponse *) {
161+
auto arena_ptr = std::move(arena);
161162
if (result != opentelemetry::sdk::common::ExportResult::kSuccess)
162163
{
163164
OTEL_INTERNAL_LOG_ERROR("[OTLP LOG GRPC Exporter] ERROR: Export "

exporters/otlp/src/otlp_grpc_metric_exporter.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,10 @@ opentelemetry::sdk::common::ExportResult OtlpGrpcMetricExporter::Export(
165165
// called.
166166
[metrics_service_stub = metrics_service_stub_](
167167
opentelemetry::sdk::common::ExportResult result,
168-
std::unique_ptr<google::protobuf::Arena> &&,
168+
std::unique_ptr<google::protobuf::Arena> &&arena,
169169
const proto::collector::metrics::v1::ExportMetricsServiceRequest &request,
170170
proto::collector::metrics::v1::ExportMetricsServiceResponse *) {
171+
auto arena_ptr = std::move(arena);
171172
if (result != opentelemetry::sdk::common::ExportResult::kSuccess)
172173
{
173174
OTEL_INTERNAL_LOG_ERROR("[OTLP METRIC GRPC Exporter] ERROR: Export "

sdk/test/common/circular_buffer_benchmark.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ static uint64_t ConsumeBufferNumbers(BaselineCircularBuffer<uint64_t> &buffer) n
2929
{
3030
uint64_t result = 0;
3131
buffer.Consume([&](std::unique_ptr<uint64_t> &&x) {
32-
result += *x;
33-
x.reset();
32+
auto val = std::move(x);
33+
34+
result += *val;
35+
val.reset();
3436
});
3537
return result;
3638
}

sdk/test/logs/logger_provider_sdk_test.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ class DummyProcessor : public LogRecordProcessor
224224
return std::unique_ptr<Recordable>(new DummyLogRecordable());
225225
}
226226

227+
// NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
227228
void OnEmit(std::unique_ptr<Recordable> && /* record */) noexcept override {}
228229
bool ForceFlush(std::chrono::microseconds /* timeout */) noexcept override { return true; }
229230
bool Shutdown(std::chrono::microseconds /* timeout */) noexcept override { return true; }

0 commit comments

Comments
 (0)