refactor code

Author: bajajneha27

google/cloud/storage/internal/async/connection_tracing_test.cc

@@ -543,8 +543,10 @@ TEST(ConnectionTracing, RewriteObjectSpanEnrichment) {
   auto span_catcher = InstallSpanCatcher();
   PromiseWithOTelContext<StatusOr<google::storage::v2::Bucket>> p;
 
-  auto options = TracingEnabled().set<
-      google::cloud::storage_experimental::OTelSpanEnrichmentOption>(true);
+  auto options =
+      TracingEnabled()
+          .set<google::cloud::storage_experimental::OTelSpanEnrichmentOption>(
+              true);
   auto mock = std::make_unique<MockAsyncConnection>();
   EXPECT_CALL(*mock, options).WillRepeatedly(Return(options));
 

google/cloud/storage/internal/async/rewriter_connection_tracing.cc

@@ -63,18 +63,11 @@ class AsyncRewriterTracingConnection : public storage::AsyncRewriterConnection {
 
 }  // namespace
 
-std::shared_ptr<storage::AsyncRewriterConnection>
-MakeTracingAsyncRewriterConnection(
-    std::shared_ptr<storage::AsyncRewriterConnection> impl, bool enabled) {
-  if (!enabled) return impl;
-  auto span = internal::MakeSpan("storage::AsyncConnection::RewriteObject");
-  return MakeTracingAsyncRewriterConnection(std::move(impl), std::move(span));
-}
-
 std::shared_ptr<storage::AsyncRewriterConnection>
 MakeTracingAsyncRewriterConnection(
     std::shared_ptr<storage::AsyncRewriterConnection> impl,
     opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span> span) {
+  if (!span) return impl;
   return std::make_shared<AsyncRewriterTracingConnection>(std::move(impl),
                                                           std::move(span));
 }

google/cloud/storage/internal/async/rewriter_connection_tracing.h

@@ -26,10 +26,6 @@ namespace cloud {
 namespace storage_internal {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
-std::shared_ptr<storage::AsyncRewriterConnection>
-MakeTracingAsyncRewriterConnection(
-    std::shared_ptr<storage::AsyncRewriterConnection> impl, bool enabled);
-
 std::shared_ptr<storage::AsyncRewriterConnection>
 MakeTracingAsyncRewriterConnection(
     std::shared_ptr<storage::AsyncRewriterConnection> impl,

google/cloud/storage/internal/async/rewriter_connection_tracing_test.cc

@@ -93,8 +93,9 @@ TEST(RewriterTracingConnection, Basic) {
         });
       });
 
+  auto span = internal::MakeSpan("storage::AsyncConnection::RewriteObject");
   auto actual =
-      MakeTracingAsyncRewriterConnection(std::move(mock), /*enabled=*/true);
+      MakeTracingAsyncRewriterConnection(std::move(mock), std::move(span));
   auto r1 = actual->Iterate();
   sequencer.PopFront().set_value();
   EXPECT_THAT(r1.get(), StatusIs(PermanentError().status().code()));
@@ -145,8 +146,9 @@ TEST(RewriterTracingConnection, Disabled) {
   auto mock = std::make_unique<MockAsyncRewriterConnection>();
   auto* const expected = mock.get();
 
-  auto actual =
-      MakeTracingAsyncRewriterConnection(std::move(mock), /*enabled=*/false);
+  auto actual = MakeTracingAsyncRewriterConnection(
+      std::move(mock),
+      opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span>{});
   EXPECT_EQ(actual.get(), expected);
 }