Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

initial commit #258

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

initial commit #258

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
828a3f0
initial commit
lalitb Jul 12, 2023
8837d1d
add test
lalitb Jul 13, 2023
7f16b2d
new line in file end
lalitb Jul 13, 2023
c8c403c
fix bazel
lalitb Jul 13, 2023
f30e0dc
Merge branch 'main' into lowmemory-temporality
lalitb Jul 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add test
  • Loading branch information
@lalitb
lalitb committed Jul 13, 2023
commit 8837d1d61b1460749dccf48c33043429670178ed
2 changes: 1 addition & 1 deletion exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#pragma once

#include "opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h"
#include "opentelemetry/exporters/otlp/otlp_metric_utils.h"
#include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"
#include "opentelemetry/sdk/metrics/instruments.h"

#include <memory>
Expand Down
3 changes: 1 addition & 2 deletions exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@

#include "opentelemetry/exporters/otlp/otlp_environment.h"
#include "opentelemetry/exporters/otlp/otlp_http.h"
#include "opentelemetry/exporters/otlp/otlp_metric_utils.h"
#include "opentelemetry/sdk/metrics/instruments.h"
#include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"

#include <chrono>
#include <cstddef>
Expand Down
10 changes: 1 addition & 9 deletions exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "opentelemetry/proto/metrics/v1/metrics.pb.h"
#include "opentelemetry/proto/resource/v1/resource.pb.h"

#include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"
#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"

#include "opentelemetry/sdk/metrics/export/metric_producer.h"
Expand All @@ -18,15 +19,6 @@ namespace exporter
{
namespace otlp
{

enum class PreferredAggregationTemporality
{
kUnspecified,
kDelta,
kCumulative,
kLowMemory,
};

/**
* The OtlpMetricUtils contains utility functions for OTLP metrics
*/
Expand Down
23 changes: 23 additions & 0 deletions exporters/otlp/include/opentelemetry/exporters/otlp/otlp_preferred_temporality.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

#pragma once
#include "opentelemetry/version.h"

OPENTELEMETRY_BEGIN_NAMESPACE
namespace exporter
{
namespace otlp
{

enum class PreferredAggregationTemporality
{
kUnspecified,
kDelta,
kCumulative,
kLowMemory,
};

}
} // namespace exporter
OPENTELEMETRY_END_NAMESPACE
73 changes: 73 additions & 0 deletions exporters/otlp/test/otlp_http_metric_exporter_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#include "opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h"

#include "opentelemetry/exporters/otlp/otlp_metric_utils.h"
#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"

#include "opentelemetry/common/key_value_iterable_view.h"
Expand Down Expand Up @@ -976,6 +977,78 @@ TEST_F(OtlpHttpMetricExporterTestPeer, CheckDefaultTemporality)
}
#endif

// Test Preferred aggregtion temporality selection
TEST_F(OtlpHttpMetricExporterTestPeer, PreferredAggergationTemporality)
{
// Cummulative aggregation selector : use cummulative aggregation for all instruments.
std::unique_ptr<OtlpHttpMetricExporter> exporter(new OtlpHttpMetricExporter());
EXPECT_EQ(GetOptions(exporter).aggregation_temporality,
PreferredAggregationTemporality::kCumulative);
auto cumm_selector =
OtlpMetricUtils::ChooseTemporalitySelector(GetOptions(exporter).aggregation_temporality);
EXPECT_EQ(cumm_selector(opentelemetry::sdk::metrics::InstrumentType::kCounter),
opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
EXPECT_EQ(cumm_selector(opentelemetry::sdk::metrics::InstrumentType::kHistogram),
opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
EXPECT_EQ(cumm_selector(opentelemetry::sdk::metrics::InstrumentType::kUpDownCounter),
opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
EXPECT_EQ(cumm_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableCounter),
opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
EXPECT_EQ(cumm_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableGauge),
opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
EXPECT_EQ(cumm_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableUpDownCounter),
opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);

// LowMemory aggregation selector use:
// - cummulative aggregtion for Counter and Histogram
// - delta aggregation for up-down counter, observable counter, observable gauge, observable
// up-down counter
OtlpHttpMetricExporterOptions opts2;
opts2.aggregation_temporality = PreferredAggregationTemporality::kLowMemory;
std::unique_ptr<OtlpHttpMetricExporter> exporter2(new OtlpHttpMetricExporter(opts2));
EXPECT_EQ(GetOptions(exporter2).aggregation_temporality,
PreferredAggregationTemporality::kLowMemory);
auto lowmemory_selector =
OtlpMetricUtils::ChooseTemporalitySelector(GetOptions(exporter2).aggregation_temporality);
EXPECT_EQ(lowmemory_selector(opentelemetry::sdk::metrics::InstrumentType::kCounter),
opentelemetry::sdk::metrics::AggregationTemporality::kDelta);
EXPECT_EQ(lowmemory_selector(opentelemetry::sdk::metrics::InstrumentType::kHistogram),
opentelemetry::sdk::metrics::AggregationTemporality::kDelta);

EXPECT_EQ(lowmemory_selector(opentelemetry::sdk::metrics::InstrumentType::kUpDownCounter),
opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
EXPECT_EQ(lowmemory_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableCounter),
opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
EXPECT_EQ(lowmemory_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableGauge),
opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
EXPECT_EQ(
lowmemory_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableUpDownCounter),
opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);

// Delta aggregation selector use:
// - delta aggregtion for Counter, Histogram, Observable Counter, Observable Gauge
// - cummulative aggregation for up-down counter, observable up-down counter
OtlpHttpMetricExporterOptions opts3;
opts3.aggregation_temporality = PreferredAggregationTemporality::kDelta;
std::unique_ptr<OtlpHttpMetricExporter> exporter3(new OtlpHttpMetricExporter(opts3));
EXPECT_EQ(GetOptions(exporter3).aggregation_temporality, PreferredAggregationTemporality::kDelta);
auto delta_selector =
OtlpMetricUtils::ChooseTemporalitySelector(GetOptions(exporter3).aggregation_temporality);
EXPECT_EQ(delta_selector(opentelemetry::sdk::metrics::InstrumentType::kCounter),
opentelemetry::sdk::metrics::AggregationTemporality::kDelta);
EXPECT_EQ(delta_selector(opentelemetry::sdk::metrics::InstrumentType::kHistogram),
opentelemetry::sdk::metrics::AggregationTemporality::kDelta);
EXPECT_EQ(delta_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableCounter),
opentelemetry::sdk::metrics::AggregationTemporality::kDelta);
EXPECT_EQ(delta_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableGauge),
opentelemetry::sdk::metrics::AggregationTemporality::kDelta);

EXPECT_EQ(delta_selector(opentelemetry::sdk::metrics::InstrumentType::kUpDownCounter),
opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
EXPECT_EQ(delta_selector(opentelemetry::sdk::metrics::InstrumentType::kObservableUpDownCounter),
opentelemetry::sdk::metrics::AggregationTemporality::kCumulative);
}

} // namespace otlp
} // namespace exporter
OPENTELEMETRY_END_NAMESPACE