Skip to content

Commit

Permalink
Merge branch 'open-telemetry:main' into fix_nlohmann_json_1438
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcalff
marcalff authored Jun 10, 2022
2 parents 64cafa3 + 423a1a2 commit 2af4c43
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 48 deletions.
13 changes: 6 additions & 7 deletions exporters/prometheus/include/opentelemetry/exporters/prometheus/exporter_utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class PrometheusExporterUtils
*/
template <typename T>
static void SetData(std::vector<T> values,
const std::string &labels,
const opentelemetry::sdk::metrics::PointAttributes &labels,
::prometheus::MetricType type,
std::chrono::nanoseconds time,
::prometheus::MetricFamily *metric_family);
Expand All @@ -70,7 +70,7 @@ class PrometheusExporterUtils
static void SetData(std::vector<T> values,
const opentelemetry::sdk::metrics::ListType &boundaries,
const std::vector<uint64_t> &counts,
const std::string &labels,
const opentelemetry::sdk::metrics::PointAttributes &labels,
std::chrono::nanoseconds time,
::prometheus::MetricFamily *metric_family);

Expand All @@ -79,14 +79,13 @@ class PrometheusExporterUtils
*/
static void SetMetricBasic(::prometheus::ClientMetric &metric,
std::chrono::nanoseconds time,
const std::string &labels);
const opentelemetry::sdk::metrics::PointAttributes &labels);

/**
* Parse a string of labels (key:value) into a vector of pairs
* {,}
* {l1:v1,l2:v2,...,}
* Convert attribute value to string
*/
static std::vector<std::pair<std::string, std::string>> ParseLabel(std::string labels);
static std::string AttributeValueToString(
const opentelemetry::sdk::common::OwnedAttributeValue &value);

/**
* Handle Counter and Gauge.
Expand Down
88 changes: 47 additions & 41 deletions exporters/prometheus/src/exporter_utils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
# include "opentelemetry/exporters/prometheus/exporter_utils.h"
# include "opentelemetry/sdk/metrics/export/metric_producer.h"

# include "opentelemetry/sdk/common/global_log_handler.h"

namespace prometheus_client = ::prometheus;
namespace metric_sdk = opentelemetry::sdk::metrics;

Expand Down Expand Up @@ -62,14 +64,14 @@ std::vector<prometheus_client::MetricFamily> PrometheusExporterUtils::TranslateT
auto counts = histogram_point_data.counts_;
SetData(std::vector<double>{nostd::get<double>(histogram_point_data.sum_),
(double)histogram_point_data.count_},
boundaries, counts, "", time, &metric_family);
boundaries, counts, point_data_attr.attributes, time, &metric_family);
}
else // Counter, Untyped
{
auto sum_point_data =
nostd::get<sdk::metrics::SumPointData>(point_data_attr.point_data);
std::vector<metric_sdk::ValueType> values{sum_point_data.value_};
SetData(values, "", type, time, &metric_family);
SetData(values, point_data_attr.attributes, type, time, &metric_family);
}
}
output.emplace_back(metric_family);
Expand Down Expand Up @@ -98,6 +100,7 @@ std::string PrometheusExporterUtils::SanitizeNames(std::string name)
metric_sdk::AggregationType PrometheusExporterUtils::getAggregationType(
const metric_sdk::PointType &point_type)
{

if (nostd::holds_alternative<sdk::metrics::SumPointData>(point_type))
{
return metric_sdk::AggregationType::kSum;
Expand Down Expand Up @@ -140,7 +143,7 @@ prometheus_client::MetricType PrometheusExporterUtils::TranslateType(
*/
template <typename T>
void PrometheusExporterUtils::SetData(std::vector<T> values,
const std::string &labels,
const metric_sdk::PointAttributes &labels,
prometheus_client::MetricType type,
std::chrono::nanoseconds time,
prometheus_client::MetricFamily *metric_family)
Expand All @@ -159,7 +162,7 @@ template <typename T>
void PrometheusExporterUtils::SetData(std::vector<T> values,
const opentelemetry::sdk::metrics::ListType &boundaries,
const std::vector<uint64_t> &counts,
const std::string &labels,
const metric_sdk::PointAttributes &labels,
std::chrono::nanoseconds time,
prometheus_client::MetricFamily *metric_family)
{
Expand All @@ -181,59 +184,62 @@ void PrometheusExporterUtils::SetData(std::vector<T> values,
*/
void PrometheusExporterUtils::SetMetricBasic(prometheus_client::ClientMetric &metric,
std::chrono::nanoseconds time,
const std::string &labels)
const metric_sdk::PointAttributes &labels)
{
metric.timestamp_ms = time.count() / 1000000;

auto label_pairs = ParseLabel(labels);
if (!label_pairs.empty())
// auto label_pairs = ParseLabel(labels);
if (!labels.empty())
{
metric.label.resize(label_pairs.size());
for (size_t i = 0; i < label_pairs.size(); ++i)
metric.label.resize(labels.size());
size_t i = 0;
for (auto const &label : labels)
{
auto origin_name = label_pairs[i].first;
auto sanitized = SanitizeNames(origin_name);
metric.label[i].name = sanitized;
metric.label[i].value = label_pairs[i].second;
auto sanitized = SanitizeNames(label.first);
metric.label[i].name = sanitized;
metric.label[i++].value = AttributeValueToString(label.second);
}
}
};

/**
* Parse a string of labels (key:value) into a vector of pairs
* {,}
* {l1:v1,l2:v2,...,}
*/
std::vector<std::pair<std::string, std::string>> PrometheusExporterUtils::ParseLabel(
std::string labels)
std::string PrometheusExporterUtils::AttributeValueToString(
const opentelemetry::sdk::common::OwnedAttributeValue &value)
{
if (labels.size() < 3)
std::string result;
if (nostd::holds_alternative<bool>(value))
{
return {};
result = nostd::get<bool>(value) ? "true" : "false";
}
labels = labels.substr(1, labels.size() - 2);

std::vector<std::string> paired_labels;
std::stringstream s_stream(labels);
while (s_stream.good())
else if (nostd::holds_alternative<int>(value))
{
std::string substr;
getline(s_stream, substr, ','); // get first string delimited by comma
if (!substr.empty())
{
paired_labels.push_back(substr);
}
result = std::to_string(nostd::get<int>(value));
}

std::vector<std::pair<std::string, std::string>> result;
for (auto &paired : paired_labels)
else if (nostd::holds_alternative<int64_t>(value))
{
std::size_t split_index = paired.find(':');
std::string label = paired.substr(0, split_index);
std::string value = paired.substr(split_index + 1);
result.emplace_back(std::pair<std::string, std::string>(label, value));
result = std::to_string(nostd::get<int64_t>(value));
}
else if (nostd::holds_alternative<unsigned int>(value))
{
result = std::to_string(nostd::get<unsigned int>(value));
}
else if (nostd::holds_alternative<uint64_t>(value))
{
result = std::to_string(nostd::get<uint64_t>(value));
}
else if (nostd::holds_alternative<double>(value))
{
result = std::to_string(nostd::get<double>(value));
}
else if (nostd::holds_alternative<std::string>(value))
{
result = nostd::get<std::string>(value);
}
else
{
OTEL_INTERNAL_LOG_WARN(
"[Prometheus Exporter] AttributeValueToString - "
" Nested attributes not supported - ignored");
}

return result;
}

Expand Down

0 comments on commit 2af4c43

Please sign in to comment.