Merge cleanup

Author: marcalff

sdk/include/opentelemetry/sdk/configuration/instrument_type.h

@@ -0,0 +1,30 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include <cstdint>
+
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace sdk
+{
+namespace configuration
+{
+
+// YAML-SCHEMA: schema/meter_provider.json
+// YAML-NODE: InstrumentType
+enum class InstrumentType : std::uint8_t
+{
+  counter,
+  histogram,
+  observable_counter,
+  observable_gauge,
+  observable_up_down_counter,
+  up_down_counter
+};
+
+}  // namespace configuration
+}  // namespace sdk
+OPENTELEMETRY_END_NAMESPACE

sdk/include/opentelemetry/sdk/configuration/view_selector_configuration.h

@@ -7,6 +7,7 @@
 #include <memory>
 #include <string>
 
+#include "opentelemetry/sdk/configuration/instrument_type.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
@@ -15,16 +16,6 @@ namespace sdk
 namespace configuration
 {
 
-enum enum_instrument_type : std::uint8_t
-{
-  counter,
-  histogram,
-  observable_counter,
-  observable_gauge,
-  observable_up_down_counter,
-  up_down_counter
-};
-
 // YAML-SCHEMA: schema/meter_provider.json
 // YAML-NODE: ViewSelector
 class ViewSelectorConfiguration
@@ -38,7 +29,7 @@ class ViewSelectorConfiguration
   ~ViewSelectorConfiguration()                                                 = default;
 
   std::string instrument_name;
-  enum_instrument_type instrument_type{counter};
+  InstrumentType instrument_type{InstrumentType::counter};
   std::string unit;
   std::string meter_name;
   std::string meter_version;