Skip to content

Commit caa8f9d

Browse files
committed
Build warnings cleanup
1 parent 4482b08 commit caa8f9d

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

sdk/src/configuration/ryml_document_node.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <ostream>
77
#include <ryml.hpp>
88
#include <string>
9+
#include <utility>
910

1011
#include "opentelemetry/sdk/common/global_log_handler.h"
1112
#include "opentelemetry/sdk/configuration/document_node.h"

sdk/src/init/sdk_builder.cc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -936,6 +936,7 @@ static opentelemetry::sdk::metrics::InstrumentType ConvertInstrumentType(
936936

937937
switch (config)
938938
{
939+
case opentelemetry::sdk::configuration::InstrumentType::none:
939940
case opentelemetry::sdk::configuration::InstrumentType::counter:
940941
sdk = opentelemetry::sdk::metrics::InstrumentType::kCounter;
941942
break;
@@ -1193,6 +1194,13 @@ void SdkBuilder::AddView(
11931194
{
11941195
auto *selector = model->selector.get();
11951196

1197+
if (selector->instrument_type == opentelemetry::sdk::configuration::InstrumentType::none)
1198+
{
1199+
std::string die("Runtime does not support InstrumentSelector for any instrument");
1200+
OTEL_INTERNAL_LOG_ERROR(die);
1201+
throw UnsupportedException(die);
1202+
}
1203+
11961204
auto sdk_instrument_type = ConvertInstrumentType(selector->instrument_type);
11971205

11981206
std::unique_ptr<opentelemetry::sdk::metrics::InstrumentSelector> sdk_instrument_selector(

sdk/test/configuration/yaml_metrics_test.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@
77
#include <string>
88
#include <vector>
99

10-
#include "opentelemetry/sdk/configuration/aggregation_configuration.h"
1110
#include "opentelemetry/sdk/configuration/base2_exponential_bucket_histogram_aggregation_configuration.h"
1211
#include "opentelemetry/sdk/configuration/configuration.h"
1312
#include "opentelemetry/sdk/configuration/default_histogram_aggregation.h"
1413
#include "opentelemetry/sdk/configuration/explicit_bucket_histogram_aggregation_configuration.h"
1514
#include "opentelemetry/sdk/configuration/headers_configuration.h"
15+
#include "opentelemetry/sdk/configuration/include_exclude_configuration.h"
16+
#include "opentelemetry/sdk/configuration/instrument_type.h"
1617
#include "opentelemetry/sdk/configuration/meter_provider_configuration.h"
1718
#include "opentelemetry/sdk/configuration/metric_reader_configuration.h"
1819
#include "opentelemetry/sdk/configuration/otlp_file_push_metric_exporter_configuration.h"
@@ -22,6 +23,7 @@
2223
#include "opentelemetry/sdk/configuration/periodic_metric_reader_configuration.h"
2324
#include "opentelemetry/sdk/configuration/prometheus_pull_metric_exporter_configuration.h"
2425
#include "opentelemetry/sdk/configuration/pull_metric_reader_configuration.h"
26+
#include "opentelemetry/sdk/configuration/string_array_configuration.h"
2527
#include "opentelemetry/sdk/configuration/temporality_preference.h"
2628
#include "opentelemetry/sdk/configuration/view_configuration.h"
2729
#include "opentelemetry/sdk/configuration/view_selector_configuration.h"

0 commit comments

Comments
 (0)