Address feedback from code review assistant

Author: kalragauri

google/cloud/storage/google_cloud_cpp_storage_grpc.cmake

@@ -253,20 +253,29 @@ if (GOOGLE_CLOUD_CPP_ENABLE_CTYPE_CORD_WORKAROUND)
         google_cloud_cpp_storage_grpc
         PRIVATE GOOGLE_CLOUD_CPP_ENABLE_CTYPE_CORD_WORKAROUND)
 endif ()
-if ((TARGET google-cloud-cpp::opentelemetry) AND (TARGET
-                                                  opentelemetry-cpp::metrics))
-    target_compile_definitions(
-        google_cloud_cpp_storage_grpc
-        PUBLIC GOOGLE_CLOUD_CPP_STORAGE_WITH_OTEL_METRICS
-               GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY)
-    target_link_libraries(
-        google_cloud_cpp_storage_grpc PUBLIC google-cloud-cpp::opentelemetry
-                                             opentelemetry-cpp::metrics)
-endif ()
-if (TARGET gRPC::grpcpp_otel_plugin)
+set(EXTRA_MODULES)
+
+if (TARGET google-cloud-cpp::opentelemetry)
+    target_compile_definitions(google_cloud_cpp_storage_grpc
+                               PUBLIC GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY)
     target_link_libraries(google_cloud_cpp_storage_grpc
-                          PUBLIC gRPC::grpcpp_otel_plugin)
-    set(EXTRA_MODULES "grpcpp_otel_plugin")
+                          PUBLIC google-cloud-cpp::opentelemetry)
+    list(APPEND EXTRA_MODULES "google_cloud_cpp_opentelemetry")
+
+    if (TARGET opentelemetry-cpp::metrics)
+        target_compile_definitions(
+            google_cloud_cpp_storage_grpc
+            PUBLIC GOOGLE_CLOUD_CPP_STORAGE_WITH_OTEL_METRICS)
+        target_link_libraries(google_cloud_cpp_storage_grpc
+                              PUBLIC opentelemetry-cpp::metrics)
+        list(APPEND EXTRA_MODULES "opentelemetry_metrics")
+
+        if (TARGET gRPC::grpcpp_otel_plugin)
+            target_link_libraries(google_cloud_cpp_storage_grpc
+                                  PUBLIC gRPC::grpcpp_otel_plugin)
+            list(APPEND EXTRA_MODULES "grpcpp_otel_plugin")
+        endif ()
+    endif ()
 endif ()
 set_target_properties(
     google_cloud_cpp_storage_grpc
@@ -501,8 +510,7 @@ foreach (fname ${storage_client_grpc_unit_tests})
                 CURL::libcurl
                 nlohmann_json::nlohmann_json)
     google_cloud_cpp_add_common_options(${target})
-    if ((TARGET gRPC::grpcpp_otel_plugin)
-        AND (TARGET google-cloud-cpp::opentelemetry)
+    if ((TARGET google-cloud-cpp::opentelemetry)
         AND (TARGET opentelemetry-cpp::metrics))
         target_compile_definitions(
             ${target} PRIVATE GOOGLE_CLOUD_CPP_STORAGE_WITH_OTEL_METRICS)