moving ResourceFilterDataFnOption to internal namespace

Author: shubham-up-47

google/cloud/opentelemetry/internal/monitoring_exporter.cc

@@ -32,12 +32,13 @@ std::string FormatProjectFullName(std::string const& project) {
 }
 
 otel_internal::ResourceFilterDataFn MakeFilter(Options const& options) {
-  if (!options.has<otel::ResourceFilterDataFnOption>()) {
+  if (!options.has<otel_internal::ResourceFilterDataFnOption>()) {
     return nullptr;
   }
 
   // Get the metric labels set to be excluded.
-  auto const& excluded = options.get<otel::ResourceFilterDataFnOption>();
+  auto const& excluded =
+      options.get<otel_internal::ResourceFilterDataFnOption>();
   if (excluded.empty()) return nullptr;
 
   // Capture by value to avoid dangling reference in the lambda.

google/cloud/opentelemetry/internal/monitoring_exporter.h

@@ -45,6 +45,12 @@ using MonitoredResourceFromDataFn =
 // of the google::api::Metric proto.
 using ResourceFilterDataFn = std::function<bool(std::string const&)>;
 
+// Filter resource labels. A set of OpenTelemetry resource attribute keys to
+// exclude from metric labels when exporting metrics.
+struct ResourceFilterDataFnOption {
+  using Type = std::set<std::string>;
+};
+
 class MonitoringExporter final
     : public opentelemetry::sdk::metrics::PushMetricExporter {
  public:

google/cloud/opentelemetry/internal/monitoring_exporter_test.cc

@@ -173,7 +173,8 @@ TEST(MonitoringExporterTest, MakeFilterEmptySet) {
   auto mock =
       std::make_shared<monitoring_v3_mocks::MockMetricServiceConnection>();
   Options options;
-  options.set<otel::ResourceFilterDataFnOption>(std::set<std::string>{});
+  options.set<otel_internal::ResourceFilterDataFnOption>(
+      std::set<std::string>{});
 
   auto exporter = std::make_unique<MonitoringExporter>(Project("test-project"),
                                                        mock, options);
@@ -185,7 +186,7 @@ TEST(MonitoringExporterTest, MakeFilterWithExcludedKeys) {
       std::make_shared<monitoring_v3_mocks::MockMetricServiceConnection>();
   Options options;
   std::set<std::string> excluded{"service_name", "service_version"};
-  options.set<otel::ResourceFilterDataFnOption>(excluded);
+  options.set<otel_internal::ResourceFilterDataFnOption>(excluded);
 
   auto exporter = std::make_unique<MonitoringExporter>(Project("test-project"),
                                                        mock, options);

google/cloud/opentelemetry/monitoring_exporter.h

@@ -75,16 +75,6 @@ struct MonitoredResourceOption {
   using Type = google::api::MonitoredResource;
 };
 
-/**
- * Filter resource labels.
- *
- * This option is primarily relevant to Google applications and libraries. It
- * can be ignored by external developers.
- */
-struct ResourceFilterDataFnOption {
-  using Type = std::set<std::string>;
-};
-
 std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter>
 MakeMonitoringExporter(
     Project project,

google/cloud/opentelemetry/monitoring_exporter_test.cc

@@ -264,25 +264,6 @@ TEST(MonitoringExporter, CustomMonitoredResource) {
   EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
 }
 
-TEST(MonitoringExporter, CustomResourceFilterDataFunction) {
-  auto mock =
-      std::make_shared<monitoring_v3_mocks::MockMetricServiceConnection>();
-  EXPECT_CALL(*mock, CreateTimeSeries)
-      .WillOnce(
-          [](google::monitoring::v3::CreateTimeSeriesRequest const& request) {
-            EXPECT_THAT(request.name(), "projects/test-project");
-            EXPECT_THAT(request.time_series(), SizeIs(2));
-            return Status();
-          });
-
-  auto options = Options{}.set<ResourceFilterDataFnOption>({"test_label"});
-  auto exporter =
-      MakeMonitoringExporter(Project("test-project"), std::move(mock), options);
-  auto data = MakeResourceMetrics(/*expected_time_series_count=*/2);
-  auto result = exporter->Export(data);
-  EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
-}
-
 TEST(MonitoringExporter, CreateServiceTimeSeries) {
   auto mock =
       std::make_shared<monitoring_v3_mocks::MockMetricServiceConnection>();

google/cloud/storage/internal/grpc/metrics_exporter_impl.cc

@@ -16,7 +16,7 @@
 
 #include "google/cloud/storage/internal/grpc/metrics_exporter_impl.h"
 #include "google/cloud/monitoring/v3/metric_connection.h"
-#include "google/cloud/opentelemetry/monitoring_exporter.h"
+#include "google/cloud/opentelemetry/internal/monitoring_exporter.h"
 #include "google/cloud/storage/grpc_plugin.h"
 #include "google/cloud/storage/internal/grpc/metrics_exporter_options.h"
 #include "google/cloud/storage/internal/grpc/metrics_meter_provider.h"
@@ -92,7 +92,7 @@ absl::optional<ExporterConfig> MakeMeterProviderConfig(
 
   auto exporter_options = MetricsExporterOptions(*project, resource);
   if (options.has<storage_experimental::GrpcMetricsExcludedLabelsOption>()) {
-    exporter_options.set<otel::ResourceFilterDataFnOption>(
+    exporter_options.set<otel_internal::ResourceFilterDataFnOption>(
         options.get<storage_experimental::GrpcMetricsExcludedLabelsOption>());
   }