Fixes IWYU issue

Author: owent

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_client.h

@@ -35,6 +35,11 @@ class Arena;
 }
 }  // namespace google
 
+namespace grpc
+{
+class ChannelArguments;
+}  // namespace grpc
+
 namespace opentelemetry
 {
 namespace proto
@@ -256,8 +261,10 @@ class OtlpGrpcClient
 private:
   friend class OtlpGrpcClientTestPeer;
 
-  // Build gRPC channel arguments from exporter options. Shared by MakeChannel() and unit tests.
-  static grpc::ChannelArguments BuildChannelArguments(const OtlpGrpcClientOptions &options);
+  // Populate gRPC channel arguments from exporter options. Shared by MakeChannel() and unit
+  // tests.
+  static void PopulateChannelArguments(const OtlpGrpcClientOptions &options,
+                                       grpc::ChannelArguments &grpc_arguments);
 
   // Stores if this gRPC client had its Shutdown() method called
   std::atomic<bool> is_shutdown_;

exporters/otlp/src/otlp_grpc_client.cc

@@ -355,7 +355,8 @@ std::shared_ptr<grpc::Channel> OtlpGrpcClient::MakeChannel(const OtlpGrpcClientO
     return nullptr;
   }
 
-  grpc::ChannelArguments grpc_arguments = BuildChannelArguments(options);
+  grpc::ChannelArguments grpc_arguments;
+  PopulateChannelArguments(options, grpc_arguments);
 
   if (options.use_ssl_credentials)
   {
@@ -394,9 +395,11 @@ std::shared_ptr<grpc::Channel> OtlpGrpcClient::MakeChannel(const OtlpGrpcClientO
   return channel;
 }
 
-grpc::ChannelArguments OtlpGrpcClient::BuildChannelArguments(const OtlpGrpcClientOptions &options)
+void OtlpGrpcClient::PopulateChannelArguments(const OtlpGrpcClientOptions &options,
+                                              grpc::ChannelArguments &grpc_arguments)
 {
-  grpc::ChannelArguments grpc_arguments;
+  grpc_arguments = grpc::ChannelArguments{};
+
   if (options.channel_arguments != nullptr)
   {
     grpc_arguments = *options.channel_arguments;
@@ -455,8 +458,6 @@ grpc::ChannelArguments OtlpGrpcClient::BuildChannelArguments(const OtlpGrpcClien
     grpc_arguments.SetServiceConfigJSON(service_config);
   }
 #endif  // ENABLE_OTLP_RETRY_PREVIEW
-
-  return grpc_arguments;
 }
 
 std::unique_ptr<grpc::ClientContext> OtlpGrpcClient::MakeClientContext(

exporters/otlp/test/otlp_grpc_target_test.cc

@@ -1,10 +1,12 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <grpc/grpc.h>
 #include <grpcpp/support/channel_arguments.h>
 #include <gtest/gtest.h>
 
 #include <cstring>
+#include <string>
 
 #include "opentelemetry/exporters/otlp/otlp_grpc_client.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_client_options.h"
@@ -40,7 +42,9 @@ class OtlpGrpcClientTestPeer : public ::testing::Test
 public:
   static grpc::ChannelArguments BuildChannelArguments(const OtlpGrpcClientOptions &options)
   {
-    return OtlpGrpcClient::BuildChannelArguments(options);
+    grpc::ChannelArguments grpc_arguments;
+    OtlpGrpcClient::PopulateChannelArguments(options, grpc_arguments);
+    return grpc_arguments;
   }
 };