draft: fix conflicts

lhh · lhh · commit 83c150d9b1cc · 2026-01-19T08:54:18.000+08:00
diff --git a/src/brpc/policy/couchbase_protocol.cpp b/src/brpc/policy/couchbase_protocol.cpp
@@ -160,7 +160,7 @@ void ProcessCouchbaseResponse(InputMessageBase* msg_base) {
   }
 
   ControllerPrivateAccessor accessor(cntl);
-  Span* span = accessor.span();
+  std::shared_ptr<Span> span = accessor.span();
   if (span) {
     span->set_base_real_us(msg->base_real_us());
     span->set_received_us(msg->received_us());

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ void ProcessCouchbaseResponse(InputMessageBase* msg_base) {`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`ControllerPrivateAccessor accessor(cntl);`
`163`		`- Span* span = accessor.span();`
	`163`	`+ std::shared_ptr<Span> span = accessor.span();`
`164`	`164`	`if (span) {`
`165`	`165`	`span->set_base_real_us(msg->base_real_us());`
`166`	`166`	`span->set_received_us(msg->received_us());`