Allow to share gRPC Client in sync mode

owent · owent · commit 3547800a193f · 2024-09-25T21:19:24.000+08:00
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h
@@ -34,14 +34,12 @@ class OPENTELEMETRY_EXPORT OtlpGrpcExporterFactory
   static std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Create(
       const OtlpGrpcExporterOptions &options);
 
-#ifdef ENABLE_ASYNC_EXPORT
   /**
    * Create an OtlpGrpcExporter using the given options and gRPC client.
    */
   static std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Create(
       const OtlpGrpcExporterOptions &options,
       nostd::shared_ptr<OtlpGrpcClient> client);
-#endif
 };
 
 }  // namespace otlp
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_factory.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_factory.h
@@ -32,14 +32,12 @@ class OPENTELEMETRY_EXPORT OtlpGrpcLogRecordExporterFactory
   static std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> Create(
       const OtlpGrpcLogRecordExporterOptions &options);
 
-#ifdef ENABLE_ASYNC_EXPORT
   /**
    * Create a OtlpGrpcLogRecordExporter using the given options and gRPC client.
    */
   static std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> Create(
       const OtlpGrpcLogRecordExporterOptions &options,
       nostd::shared_ptr<OtlpGrpcClient> client);
-#endif
 };
 
 }  // namespace otlp
diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h
@@ -34,14 +34,12 @@ class OPENTELEMETRY_EXPORT OtlpGrpcMetricExporterFactory
   static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create(
       const OtlpGrpcMetricExporterOptions &options);
 
-#ifdef ENABLE_ASYNC_EXPORT
   /**
    * Create a OtlpGrpcMetricExporter using the given options and gRPC client.
    */
   static std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> Create(
       const OtlpGrpcMetricExporterOptions &options,
       nostd::shared_ptr<OtlpGrpcClient> client);
-#endif
 };
 
 }  // namespace otlp
diff --git a/exporters/otlp/src/otlp_grpc_exporter_factory.cc b/exporters/otlp/src/otlp_grpc_exporter_factory.cc
@@ -27,7 +27,6 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpGrpcExporterFactory
   return exporter;
 }
 
-#ifdef ENABLE_ASYNC_EXPORT
 std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpGrpcExporterFactory::Create(
     const OtlpGrpcExporterOptions &options,
     nostd::shared_ptr<OtlpGrpcClient> client)
@@ -36,7 +35,6 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpGrpcExporterFactory
       new OtlpGrpcExporter(options, std::move(client)));
   return exporter;
 }
-#endif
 
 }  // namespace otlp
 }  // namespace exporter
diff --git a/exporters/otlp/src/otlp_grpc_log_record_exporter_factory.cc b/exporters/otlp/src/otlp_grpc_log_record_exporter_factory.cc
@@ -28,7 +28,6 @@ OtlpGrpcLogRecordExporterFactory::Create(const OtlpGrpcLogRecordExporterOptions
   return exporter;
 }
 
-#ifdef ENABLE_ASYNC_EXPORT
 std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter>
 OtlpGrpcLogRecordExporterFactory::Create(const OtlpGrpcLogRecordExporterOptions &options,
                                          nostd::shared_ptr<OtlpGrpcClient> client)
@@ -37,7 +36,6 @@ OtlpGrpcLogRecordExporterFactory::Create(const OtlpGrpcLogRecordExporterOptions
       new OtlpGrpcLogRecordExporter(options, std::move(client)));
   return exporter;
 }
-#endif
 
 }  // namespace otlp
 }  // namespace exporter
diff --git a/exporters/otlp/src/otlp_grpc_metric_exporter_factory.cc b/exporters/otlp/src/otlp_grpc_metric_exporter_factory.cc
@@ -28,7 +28,6 @@ OtlpGrpcMetricExporterFactory::Create(const OtlpGrpcMetricExporterOptions &optio
   return exporter;
 }
 
-#ifdef ENABLE_ASYNC_EXPORT
 std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
 OtlpGrpcMetricExporterFactory::Create(const OtlpGrpcMetricExporterOptions &options,
                                       nostd::shared_ptr<OtlpGrpcClient> client)
@@ -37,7 +36,6 @@ OtlpGrpcMetricExporterFactory::Create(const OtlpGrpcMetricExporterOptions &optio
       new OtlpGrpcMetricExporter(options, std::move(client)));
   return exporter;
 }
-#endif
 
 }  // namespace otlp
 }  // namespace exporter
diff --git a/exporters/otlp/test/otlp_grpc_exporter_factory_test.cc b/exporters/otlp/test/otlp_grpc_exporter_factory_test.cc
@@ -34,7 +34,6 @@ TEST(OtlpGrpcExporterFactoryTest, BuildTest)
   EXPECT_TRUE(exporter != nullptr);
 }
 
-#ifdef ENABLE_ASYNC_EXPORT
 TEST(OtlpGrpcExporterFactoryTest, ShareClient)
 {
   OtlpGrpcExporterOptions opts;
@@ -53,7 +52,6 @@ TEST(OtlpGrpcExporterFactoryTest, ShareClient)
   EXPECT_TRUE(static_cast<OtlpGrpcExporter *>(exporter1.get())->GetClient().get() == client.get());
   EXPECT_TRUE(static_cast<OtlpGrpcExporter *>(exporter2.get())->GetClient().get() == client.get());
 }
-#endif
 
 }  // namespace otlp
 }  // namespace exporter
diff --git a/exporters/otlp/test/otlp_grpc_log_record_exporter_factory_test.cc b/exporters/otlp/test/otlp_grpc_log_record_exporter_factory_test.cc
@@ -34,7 +34,6 @@ TEST(OtlpGrpcLogRecordExporterFactoryTest, BuildTest)
   EXPECT_TRUE(exporter != nullptr);
 }
 
-#ifdef ENABLE_ASYNC_EXPORT
 TEST(OtlpGrpcLogRecordExporterFactoryTest, ShareClient)
 {
   OtlpGrpcLogRecordExporterOptions opts;
@@ -55,7 +54,6 @@ TEST(OtlpGrpcLogRecordExporterFactoryTest, ShareClient)
   EXPECT_TRUE(static_cast<OtlpGrpcLogRecordExporter *>(exporter2.get())->GetClient().get() ==
               client.get());
 }
-#endif
 
 }  // namespace otlp
 }  // namespace exporter
diff --git a/exporters/otlp/test/otlp_grpc_log_record_exporter_test.cc b/exporters/otlp/test/otlp_grpc_log_record_exporter_test.cc
@@ -194,7 +194,6 @@ class OtlpGrpcLogRecordExporterTestPeer : public ::testing::Test
         new OtlpGrpcExporter(std::move(stub_interface)));
   }
 
-#ifdef ENABLE_ASYNC_EXPORT
   std::unique_ptr<sdk::logs::LogRecordExporter> GetExporter(
       std::unique_ptr<proto::collector::logs::v1::LogsService::StubInterface> &stub_interface,
       nostd::shared_ptr<OtlpGrpcClient> client)
@@ -210,7 +209,6 @@ class OtlpGrpcLogRecordExporterTestPeer : public ::testing::Test
     return std::unique_ptr<sdk::trace::SpanExporter>(
         new OtlpGrpcExporter(std::move(stub_interface), std::move(client)));
   }
-#endif
 
   // Get the options associated with the given exporter.
   const OtlpGrpcLogRecordExporterOptions &GetOptions(
@@ -358,7 +356,6 @@ TEST_F(OtlpGrpcLogRecordExporterTestPeer, ExportIntegrationTest)
   trace_provider = opentelemetry::nostd::shared_ptr<opentelemetry::sdk::trace::TracerProvider>();
 }
 
-#ifdef ENABLE_ASYNC_EXPORT
 // Create spans, let processor call Export() and share client object between trace and logs
 TEST_F(OtlpGrpcLogRecordExporterTestPeer, ShareClientTest)
 {
@@ -468,7 +465,6 @@ TEST_F(OtlpGrpcLogRecordExporterTestPeer, ShareClientTest)
           new opentelemetry::trace::NoopTracerProvider()));
   trace_provider = opentelemetry::nostd::shared_ptr<opentelemetry::sdk::trace::TracerProvider>();
 }
-#endif
 
 }  // namespace otlp
 }  // namespace exporter
diff --git a/exporters/otlp/test/otlp_grpc_metric_exporter_factory_test.cc b/exporters/otlp/test/otlp_grpc_metric_exporter_factory_test.cc
@@ -34,7 +34,6 @@ TEST(OtlpGrpcMetricExporterFactory, BuildTest)
   EXPECT_TRUE(exporter != nullptr);
 }
 
-#ifdef ENABLE_ASYNC_EXPORT
 TEST(OtlpGrpcMetricExporterFactory, ShareClient)
 {
   OtlpGrpcMetricExporterOptions opts;
@@ -55,7 +54,6 @@ TEST(OtlpGrpcMetricExporterFactory, ShareClient)
   EXPECT_TRUE(static_cast<OtlpGrpcMetricExporter *>(exporter2.get())->GetClient().get() ==
               client.get());
 }
-#endif
 
 }  // namespace otlp
 }  // namespace exporter

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpGrpcExporterFactory`
`27`	`27`	`return exporter;`
`28`	`28`	`}`
`29`	`29`
`30`		`-#ifdef ENABLE_ASYNC_EXPORT`
`31`	`30`	`std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpGrpcExporterFactory::Create(`
`32`	`31`	`const OtlpGrpcExporterOptions &options,`
`33`	`32`	`nostd::shared_ptr<OtlpGrpcClient> client)`
`@@ -36,7 +35,6 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpGrpcExporterFactory`
`36`	`35`	`new OtlpGrpcExporter(options, std::move(client)));`
`37`	`36`	`return exporter;`
`38`	`37`	`}`
`39`		`-#endif`
`40`	`38`
`41`	`39`	`} // namespace otlp`
`42`	`40`	`} // namespace exporter`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ OtlpGrpcLogRecordExporterFactory::Create(const OtlpGrpcLogRecordExporterOptions`
`28`	`28`	`return exporter;`
`29`	`29`	`}`
`30`	`30`
`31`		`-#ifdef ENABLE_ASYNC_EXPORT`
`32`	`31`	`std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter>`
`33`	`32`	`OtlpGrpcLogRecordExporterFactory::Create(const OtlpGrpcLogRecordExporterOptions &options,`
`34`	`33`	`nostd::shared_ptr<OtlpGrpcClient> client)`
`@@ -37,7 +36,6 @@ OtlpGrpcLogRecordExporterFactory::Create(const OtlpGrpcLogRecordExporterOptions`
`37`	`36`	`new OtlpGrpcLogRecordExporter(options, std::move(client)));`
`38`	`37`	`return exporter;`
`39`	`38`	`}`
`40`		`-#endif`
`41`	`39`
`42`	`40`	`} // namespace otlp`
`43`	`41`	`} // namespace exporter`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ OtlpGrpcMetricExporterFactory::Create(const OtlpGrpcMetricExporterOptions &optio`
`28`	`28`	`return exporter;`
`29`	`29`	`}`
`30`	`30`
`31`		`-#ifdef ENABLE_ASYNC_EXPORT`
`32`	`31`	`std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>`
`33`	`32`	`OtlpGrpcMetricExporterFactory::Create(const OtlpGrpcMetricExporterOptions &options,`
`34`	`33`	`nostd::shared_ptr<OtlpGrpcClient> client)`
`@@ -37,7 +36,6 @@ OtlpGrpcMetricExporterFactory::Create(const OtlpGrpcMetricExporterOptions &optio`
`37`	`36`	`new OtlpGrpcMetricExporter(options, std::move(client)));`
`38`	`37`	`return exporter;`
`39`	`38`	`}`
`40`		`-#endif`
`41`	`39`
`42`	`40`	`} // namespace otlp`
`43`	`41`	`} // namespace exporter`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ TEST(OtlpGrpcExporterFactoryTest, BuildTest)`
`34`	`34`	`EXPECT_TRUE(exporter != nullptr);`
`35`	`35`	`}`
`36`	`36`
`37`		`-#ifdef ENABLE_ASYNC_EXPORT`
`38`	`37`	`TEST(OtlpGrpcExporterFactoryTest, ShareClient)`
`39`	`38`	`{`
`40`	`39`	`OtlpGrpcExporterOptions opts;`
`@@ -53,7 +52,6 @@ TEST(OtlpGrpcExporterFactoryTest, ShareClient)`
`53`	`52`	`EXPECT_TRUE(static_cast<OtlpGrpcExporter *>(exporter1.get())->GetClient().get() == client.get());`
`54`	`53`	`EXPECT_TRUE(static_cast<OtlpGrpcExporter *>(exporter2.get())->GetClient().get() == client.get());`
`55`	`54`	`}`
`56`		`-#endif`
`57`	`55`
`58`	`56`	`} // namespace otlp`
`59`	`57`	`} // namespace exporter`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ TEST(OtlpGrpcLogRecordExporterFactoryTest, BuildTest)`
`34`	`34`	`EXPECT_TRUE(exporter != nullptr);`
`35`	`35`	`}`
`36`	`36`
`37`		`-#ifdef ENABLE_ASYNC_EXPORT`
`38`	`37`	`TEST(OtlpGrpcLogRecordExporterFactoryTest, ShareClient)`
`39`	`38`	`{`
`40`	`39`	`OtlpGrpcLogRecordExporterOptions opts;`
`@@ -55,7 +54,6 @@ TEST(OtlpGrpcLogRecordExporterFactoryTest, ShareClient)`
`55`	`54`	`EXPECT_TRUE(static_cast<OtlpGrpcLogRecordExporter *>(exporter2.get())->GetClient().get() ==`
`56`	`55`	`client.get());`
`57`	`56`	`}`
`58`		`-#endif`
`59`	`57`
`60`	`58`	`} // namespace otlp`
`61`	`59`	`} // namespace exporter`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,6 @@ class OtlpGrpcLogRecordExporterTestPeer : public ::testing::Test`
`194`	`194`	`new OtlpGrpcExporter(std::move(stub_interface)));`
`195`	`195`	`}`
`196`	`196`
`197`		`-#ifdef ENABLE_ASYNC_EXPORT`
`198`	`197`	`std::unique_ptr<sdk::logs::LogRecordExporter> GetExporter(`
`199`	`198`	`std::unique_ptr<proto::collector::logs::v1::LogsService::StubInterface> &stub_interface,`
`200`	`199`	`nostd::shared_ptr<OtlpGrpcClient> client)`
`@@ -210,7 +209,6 @@ class OtlpGrpcLogRecordExporterTestPeer : public ::testing::Test`
`210`	`209`	`return std::unique_ptr<sdk::trace::SpanExporter>(`
`211`	`210`	`new OtlpGrpcExporter(std::move(stub_interface), std::move(client)));`
`212`	`211`	`}`
`213`		`-#endif`
`214`	`212`
`215`	`213`	`// Get the options associated with the given exporter.`
`216`	`214`	`const OtlpGrpcLogRecordExporterOptions &GetOptions(`
`@@ -358,7 +356,6 @@ TEST_F(OtlpGrpcLogRecordExporterTestPeer, ExportIntegrationTest)`
`358`	`356`	`trace_provider = opentelemetry::nostd::shared_ptr<opentelemetry::sdk::trace::TracerProvider>();`
`359`	`357`	`}`
`360`	`358`
`361`		`-#ifdef ENABLE_ASYNC_EXPORT`
`362`	`359`	`// Create spans, let processor call Export() and share client object between trace and logs`
`363`	`360`	`TEST_F(OtlpGrpcLogRecordExporterTestPeer, ShareClientTest)`
`364`	`361`	`{`
`@@ -468,7 +465,6 @@ TEST_F(OtlpGrpcLogRecordExporterTestPeer, ShareClientTest)`
`468`	`465`	`new opentelemetry::trace::NoopTracerProvider()));`
`469`	`466`	`trace_provider = opentelemetry::nostd::shared_ptr<opentelemetry::sdk::trace::TracerProvider>();`
`470`	`467`	`}`
`471`		`-#endif`
`472`	`468`
`473`	`469`	`} // namespace otlp`
`474`	`470`	`} // namespace exporter`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ TEST(OtlpGrpcMetricExporterFactory, BuildTest)`
`34`	`34`	`EXPECT_TRUE(exporter != nullptr);`
`35`	`35`	`}`
`36`	`36`
`37`		`-#ifdef ENABLE_ASYNC_EXPORT`
`38`	`37`	`TEST(OtlpGrpcMetricExporterFactory, ShareClient)`
`39`	`38`	`{`
`40`	`39`	`OtlpGrpcMetricExporterOptions opts;`
`@@ -55,7 +54,6 @@ TEST(OtlpGrpcMetricExporterFactory, ShareClient)`
`55`	`54`	`EXPECT_TRUE(static_cast<OtlpGrpcMetricExporter *>(exporter2.get())->GetClient().get() ==`
`56`	`55`	`client.get());`
`57`	`56`	`}`
`58`		`-#endif`
`59`	`57`
`60`	`58`	`} // namespace otlp`
`61`	`59`	`} // namespace exporter`