Fix merge

Signed-off-by: owent <admin@owent.net>
open-telemetry · Apr 28, 2022 · dc16ad1 · dc16ad1
1 parent 83fe42b
commit dc16ad1
Showing 1 changed file with 29 additions and 30 deletions.
diff --git a/exporters/ostream/BUILD b/exporters/ostream/BUILD
@@ -43,37 +43,36 @@ cc_library(
     ],
 )
 
-# TODO - Uncomment once MetricData interface is finalised
-#cc_library(
-#    name = "ostream_metric_exporter",
-#    srcs = [
-#        "src/metric_exporter.cc",
-#    ],
-#    hdrs = [
-#        "include/opentelemetry/exporters/ostream/metric_exporter.h",
-#    ],
-#    strip_include_prefix = "include",
-#    tags = [
-#        "metrics",
-#        "ostream",
-#    ],
-#    deps = [
-#        "//sdk/src/metrics",
-#    ],
-#)
+cc_library(
+    name = "ostream_metric_exporter",
+    srcs = [
+        "src/metric_exporter.cc",
+    ],
+    hdrs = [
+        "include/opentelemetry/exporters/ostream/metric_exporter.h",
+    ],
+    strip_include_prefix = "include",
+    tags = [
+        "metrics",
+        "ostream",
+    ],
+    deps = [
+        "//sdk/src/metrics",
+    ],
+)
 
-#cc_test(
-#    name = "ostream_metric_test",
-#    srcs = ["test/ostream_metric_test.cc"],
-#    tags = [
-#        "ostream",
-#        "test",
-#    ],
-#    deps = [
-#        ":ostream_metric_exporter",
-#        "@com_google_googletest//:gtest_main",
-#    ],
-#)
+cc_test(
+    name = "ostream_metric_test",
+    srcs = ["test/ostream_metric_test.cc"],
+    tags = [
+        "ostream",
+        "test",
+    ],
+    deps = [
+        ":ostream_metric_exporter",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
 
 cc_test(
     name = "ostream_metrics_test_deprecated",