Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions .github/workflows/geneva_metrics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: actions/checkout@v3
with:
repository: "open-telemetry/opentelemetry-cpp"
ref: "v1.22.0"
ref: "v1.23.0"
path: "otel_cpp"
submodules: "recursive"
- name: setup
Expand All @@ -36,7 +36,9 @@ jobs:
ca-certificates wget git valgrind lcov
- name: run tests
run: |
sudo $GITHUB_WORKSPACE/otel_cpp/ci/setup_googletest.sh
pushd "$GITHUB_WORKSPACE/otel_cpp"
sudo ./ci/install_thirdparty.sh --install-dir /usr/local --tags-file third_party_release --packages "googletest;benchmark"
popd
mkdir -p "$GITHUB_WORKSPACE/otel_cpp/build"
cd "$GITHUB_WORKSPACE/otel_cpp/build"
cmake .. -DOPENTELEMETRY_INSTALL=ON
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/user_events.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
uses: actions/checkout@v3
with:
repository: "open-telemetry/opentelemetry-cpp"
ref: "v1.21.0"
ref: "v1.23.0"
path: "opentelemetry-cpp"
submodules: "recursive"
- name: setup dependencies
Expand All @@ -50,7 +50,9 @@ jobs:

- name: run tests
run: |
sudo $GITHUB_WORKSPACE/opentelemetry-cpp/ci/setup_googletest.sh
pushd "$GITHUB_WORKSPACE/opentelemetry-cpp"
sudo ./ci/install_thirdparty.sh --install-dir /usr/local --tags-file third_party_release --packages "googletest;benchmark"
popd
mkdir -p "$GITHUB_WORKSPACE/opentelemetry-cpp/build"
cd "$GITHUB_WORKSPACE/opentelemetry-cpp/build"
cmake .. -G Ninja -D OPENTELEMETRY_EXTERNAL_COMPONENT_PATH=$GITHUB_WORKSPACE/opentelemetry-cpp-contrib/exporters/user_events -D WITH_OTLP_HTTP=ON
Expand Down
6 changes: 3 additions & 3 deletions exporters/geneva/example/example_metrics.cc
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ void initMetrics(const std::string &name, const std::string &account_name) {
std::unique_ptr<metric_sdk::MeterSelector> meter_selector{
new metric_sdk::MeterSelector(name, version, schema)};
std::unique_ptr<metric_sdk::View> sum_view{new metric_sdk::View{
name, "description", "", metric_sdk::AggregationType::kSum}};
name, "description", metric_sdk::AggregationType::kSum}};
p->AddView(std::move(instrument_selector), std::move(meter_selector),
std::move(sum_view));

Expand All @@ -70,7 +70,7 @@ void initMetrics(const std::string &name, const std::string &account_name) {
std::unique_ptr<metric_sdk::MeterSelector> observable_meter_selector{
new metric_sdk::MeterSelector(name, version, schema)};
std::unique_ptr<metric_sdk::View> observable_sum_view{new metric_sdk::View{
name, "description", "", metric_sdk::AggregationType::kSum}};
name, "description", metric_sdk::AggregationType::kSum}};
p->AddView(std::move(observable_instrument_selector),
std::move(observable_meter_selector),
std::move(observable_sum_view));
Expand All @@ -90,7 +90,7 @@ void initMetrics(const std::string &name, const std::string &account_name) {
->boundaries_ = std::vector<double>{0.0, 50.0, 100.0, 250.0, 500.0,
750.0, 1000.0, 2500.0, 5000.0, 10000.0};
std::unique_ptr<metric_sdk::View> histogram_view{new metric_sdk::View{
name, "description", "", metric_sdk::AggregationType::kHistogram,
name, "description", metric_sdk::AggregationType::kHistogram,
aggregation_config}};
p->AddView(std::move(histogram_instrument_selector),
std::move(histogram_meter_selector), std::move(histogram_view));
Expand Down
6 changes: 3 additions & 3 deletions exporters/user_events/example/metrics/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void initMetrics(const std::string &name, const std::string &account_name) {
std::unique_ptr<metric_sdk::MeterSelector> meter_selector{
new metric_sdk::MeterSelector(name, version, schema)};
std::unique_ptr<metric_sdk::View> sum_view{new metric_sdk::View{
name, "description", instrument_unit, metric_sdk::AggregationType::kSum}};
name, "description", metric_sdk::AggregationType::kSum}};
p->AddView(std::move(instrument_selector), std::move(meter_selector),
std::move(sum_view));

Expand All @@ -64,7 +64,7 @@ void initMetrics(const std::string &name, const std::string &account_name) {
std::unique_ptr<metric_sdk::MeterSelector> observable_meter_selector{
new metric_sdk::MeterSelector(name, version, schema)};
std::unique_ptr<metric_sdk::View> observable_sum_view{new metric_sdk::View{
name, "description", instrument_unit, metric_sdk::AggregationType::kSum}};
name, "description", metric_sdk::AggregationType::kSum}};
p->AddView(std::move(observable_instrument_selector),
std::move(observable_meter_selector),
std::move(observable_sum_view));
Expand All @@ -84,7 +84,7 @@ void initMetrics(const std::string &name, const std::string &account_name) {
->boundaries_ = std::vector<double>{0.0, 50.0, 100.0, 250.0, 500.0,
750.0, 1000.0, 2500.0, 5000.0, 10000.0};
std::unique_ptr<metric_sdk::View> histogram_view{new metric_sdk::View{
name, "description", instrument_unit, metric_sdk::AggregationType::kHistogram,
name, "description", metric_sdk::AggregationType::kHistogram,
aggregation_config}};
p->AddView(std::move(histogram_instrument_selector),
std::move(histogram_meter_selector), std::move(histogram_view));
Expand Down