Skip to content

Commit d2ff95a

Browse files
authored
[CI] Add GRPC in maintainer CI (open-telemetry#3248)
1 parent 25f7a13 commit d2ff95a

File tree

9 files changed

+33
-13
lines changed

9 files changed

+33
-13
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ jobs:
7878
sudo -E ./ci/setup_googletest.sh
7979
sudo -E ./ci/setup_ci_environment.sh
8080
sudo -E ./ci/install_protobuf.sh
81+
- name: setup grpc
82+
run: |
83+
sudo ./ci/setup_grpc.sh
8184
- name: run cmake gcc (maintainer mode, sync)
8285
env:
8386
CC: /usr/bin/gcc-14
@@ -111,6 +114,9 @@ jobs:
111114
sudo -E ./ci/setup_googletest.sh
112115
sudo -E ./ci/setup_ci_environment.sh
113116
sudo -E ./ci/install_protobuf.sh
117+
- name: setup grpc
118+
run: |
119+
sudo ./ci/setup_grpc.sh
114120
- name: run cmake gcc (maintainer mode, async)
115121
env:
116122
CC: /usr/bin/gcc-14
@@ -144,6 +150,9 @@ jobs:
144150
sudo -E ./ci/setup_googletest.sh
145151
sudo -E ./ci/setup_ci_environment.sh
146152
sudo -E ./ci/install_protobuf.sh
153+
- name: setup grpc
154+
run: |
155+
sudo ./ci/setup_grpc.sh
147156
- name: run cmake clang (maintainer mode, sync)
148157
env:
149158
CC: /usr/bin/clang-18
@@ -177,6 +186,9 @@ jobs:
177186
sudo -E ./ci/setup_googletest.sh
178187
sudo -E ./ci/setup_ci_environment.sh
179188
sudo -E ./ci/install_protobuf.sh
189+
- name: setup grpc
190+
run: |
191+
sudo ./ci/setup_grpc.sh
180192
- name: run cmake clang (maintainer mode, async)
181193
env:
182194
CC: /usr/bin/clang-18
@@ -210,6 +222,9 @@ jobs:
210222
sudo -E ./ci/setup_googletest.sh
211223
sudo -E ./ci/setup_ci_environment.sh
212224
sudo -E ./ci/install_protobuf.sh
225+
- name: setup grpc
226+
run: |
227+
sudo ./ci/setup_grpc.sh
213228
- name: run cmake clang (maintainer mode, abiv2)
214229
env:
215230
CC: /usr/bin/clang-18

ci/do_ci.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ elif [[ "$1" == "cmake.maintainer.sync.test" ]]; then
108108
rm -rf *
109109
cmake "${CMAKE_OPTIONS[@]}" \
110110
-DWITH_OTLP_HTTP=ON \
111+
-DWITH_OTLP_GRPC=ON \
111112
-DWITH_OTLP_FILE=ON \
112113
-DWITH_PROMETHEUS=ON \
113114
-DWITH_EXAMPLES=ON \
@@ -131,6 +132,7 @@ elif [[ "$1" == "cmake.maintainer.async.test" ]]; then
131132
rm -rf *
132133
cmake "${CMAKE_OPTIONS[@]}" \
133134
-DWITH_OTLP_HTTP=ON \
135+
-DWITH_OTLP_GRPC=ON \
134136
-DWITH_OTLP_FILE=ON \
135137
-DWITH_PROMETHEUS=ON \
136138
-DWITH_EXAMPLES=ON \
@@ -178,6 +180,7 @@ elif [[ "$1" == "cmake.maintainer.abiv2.test" ]]; then
178180
rm -rf *
179181
cmake "${CMAKE_OPTIONS[@]}" \
180182
-DWITH_OTLP_HTTP=ON \
183+
-DWITH_OTLP_GRPC=ON \
181184
-DWITH_OTLP_FILE=ON \
182185
-DWITH_PROMETHEUS=ON \
183186
-DWITH_EXAMPLES=ON \

exporters/otlp/src/otlp_grpc_metric_exporter.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ OtlpGrpcMetricExporter::OtlpGrpcMetricExporter(
5050
OtlpGrpcMetricExporter::OtlpGrpcMetricExporter(const OtlpGrpcMetricExporterOptions &options,
5151
const std::shared_ptr<OtlpGrpcClient> &client)
5252
: options_(options),
53-
aggregation_temporality_selector_{
54-
OtlpMetricUtils::ChooseTemporalitySelector(options_.aggregation_temporality)},
5553
client_(client),
56-
client_reference_guard_(OtlpGrpcClientFactory::CreateReferenceGuard())
54+
client_reference_guard_(OtlpGrpcClientFactory::CreateReferenceGuard()),
55+
aggregation_temporality_selector_{
56+
OtlpMetricUtils::ChooseTemporalitySelector(options_.aggregation_temporality)}
5757
{
5858
client_->AddReference(*client_reference_guard_, options_);
5959

@@ -64,10 +64,10 @@ OtlpGrpcMetricExporter::OtlpGrpcMetricExporter(
6464
std::unique_ptr<proto::collector::metrics::v1::MetricsService::StubInterface> stub,
6565
const std::shared_ptr<OtlpGrpcClient> &client)
6666
: options_(OtlpGrpcMetricExporterOptions()),
67-
aggregation_temporality_selector_{
68-
OtlpMetricUtils::ChooseTemporalitySelector(options_.aggregation_temporality)},
6967
client_(client),
7068
client_reference_guard_(OtlpGrpcClientFactory::CreateReferenceGuard()),
69+
aggregation_temporality_selector_{
70+
OtlpMetricUtils::ChooseTemporalitySelector(options_.aggregation_temporality)},
7171
metrics_service_stub_(std::move(stub))
7272
{
7373
client_->AddReference(*client_reference_guard_, options_);

exporters/otlp/test/otlp_grpc_exporter_test.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class OtlpMockTraceServiceStub : public proto::collector::trace::v1::MockTraceSe
6868
public:
6969
async_interface(OtlpMockTraceServiceStub *owner) : stub_(owner) {}
7070

71-
virtual ~async_interface() {}
71+
virtual ~async_interface() override = default;
7272

7373
void Export(
7474
::grpc::ClientContext *context,
@@ -103,7 +103,7 @@ class OtlpMockTraceServiceStub : public proto::collector::trace::v1::MockTraceSe
103103
OtlpMockTraceServiceStub *stub_;
104104
};
105105

106-
async_interface_base *async() { return &async_interface_; }
106+
async_interface_base *async() override { return &async_interface_; }
107107
async_interface_base *experimental_async() { return &async_interface_; }
108108

109109
::grpc::Status GetLastAsyncStatus() const noexcept { return last_async_status_; }

exporters/otlp/test/otlp_grpc_log_record_exporter_test.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class OtlpMockTraceServiceStub : public proto::collector::trace::v1::MockTraceSe
6969
public:
7070
async_interface(OtlpMockTraceServiceStub *owner) : stub_(owner) {}
7171

72-
virtual ~async_interface() {}
72+
virtual ~async_interface() override = default;
7373

7474
void Export(
7575
::grpc::ClientContext *context,
@@ -103,7 +103,7 @@ class OtlpMockTraceServiceStub : public proto::collector::trace::v1::MockTraceSe
103103
OtlpMockTraceServiceStub *stub_;
104104
};
105105

106-
async_interface_base *async() { return &async_interface_; }
106+
async_interface_base *async() override { return &async_interface_; }
107107
async_interface_base *experimental_async() { return &async_interface_; }
108108

109109
::grpc::Status GetLastAsyncStatus() const noexcept { return last_async_status_; }
@@ -132,7 +132,7 @@ class OtlpMockLogsServiceStub : public proto::collector::logs::v1::MockLogsServi
132132
public:
133133
async_interface(OtlpMockLogsServiceStub *owner) : stub_(owner) {}
134134

135-
virtual ~async_interface() {}
135+
virtual ~async_interface() override = default;
136136

137137
void Export(
138138
::grpc::ClientContext *context,
@@ -166,7 +166,7 @@ class OtlpMockLogsServiceStub : public proto::collector::logs::v1::MockLogsServi
166166
OtlpMockLogsServiceStub *stub_;
167167
};
168168

169-
async_interface_base *async() { return &async_interface_; }
169+
async_interface_base *async() override { return &async_interface_; }
170170
async_interface_base *experimental_async() { return &async_interface_; }
171171

172172
::grpc::Status GetLastAsyncStatus() const noexcept { return last_async_status_; }

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
#include <sstream> // IWYU pragma: keep
77
#include <string>
8-
#include <utility>
98

109
#include "opentelemetry/nostd/shared_ptr.h"
1110
#include "opentelemetry/sdk/common/attribute_utils.h"

sdk/include/opentelemetry/sdk/resource/resource_detector.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
#pragma once
55

6+
#include <string>
7+
68
#include "opentelemetry/sdk/resource/resource.h"
79
#include "opentelemetry/version.h"
810

sdk/test/common/global_log_handle_singleton_lifetime_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include <gtest/gtest.h>
55
#include <cstdlib>
6-
#include <cstring>
76
#include <iostream>
7+
#include <string>
88

99
#include "opentelemetry/nostd/shared_ptr.h"
1010
#include "opentelemetry/sdk/common/attribute_utils.h"

sdk/test/resource/resource_test.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <utility>
1111

1212
#include "opentelemetry/nostd/variant.h"
13+
#include "opentelemetry/sdk/common/attribute_utils.h"
1314
#include "opentelemetry/sdk/resource/resource.h"
1415
#include "opentelemetry/sdk/resource/resource_detector.h"
1516
#include "opentelemetry/sdk/version/version.h"

0 commit comments

Comments
 (0)