Skip to content

Commit cb5ec3d

Browse files
authored
reporter endpoint backward compat (#70)
1 parent 6b068ba commit cb5ec3d

File tree

7 files changed

+7
-16
lines changed

7 files changed

+7
-16
lines changed

cpp2sky/internal/async_client.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ struct StreamCallbackTag {
126126
case StreamState::ReadDone:
127127
callback_->onReadDone();
128128
break;
129+
default:
130+
break;
129131
}
130132
}
131133

example/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
load("@rules_cc//cc:defs.bzl", "cc_binary")
22

33
cc_binary(
4-
name = "tracer_example",
4+
name = "sample",
55
srcs = ["sample.cc"],
66
deps = [
77
"//cpp2sky:cpp2sky_interface",
@@ -11,7 +11,7 @@ cc_binary(
1111
)
1212

1313
cc_binary(
14-
name = "tracer_client_example",
14+
name = "sample_client",
1515
srcs = ["sample_client.cc"],
1616
deps = [
1717
"//cpp2sky:cpp2sky_interface",

source/grpc_async_client_impl.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,7 @@ GrpcAsyncSegmentReporterStream::GrpcAsyncSegmentReporterStream(
117117
ctx_.set_wait_for_ready(true);
118118

119119
request_writer_ = client_.stub().PrepareCall(
120-
&ctx_, "/skywalking.v3.TraceSegmentReportService/collect",
121-
&client_.completionQueue());
120+
&ctx_, "/TraceSegmentReportService/collect", &client_.completionQueue());
122121
request_writer_->StartCall(reinterpret_cast<void*>(&ready_));
123122
}
124123

source/propagation_impl.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ SpanContextImpl::SpanContextImpl(std::string_view header_value) {
3636
size_t current_field_idx = 0;
3737
std::string value;
3838

39-
for (auto i = 0; i < header_value.size(); ++i) {
39+
for (size_t i = 0; i < header_value.size(); ++i) {
4040
if (current_field_idx >= EXPECTED_FIELD_COUNT) {
4141
throw TracerException(
4242
"Invalid span context format. It must have 8 fields.");
@@ -78,7 +78,7 @@ SpanContextExtensionImpl::SpanContextExtensionImpl(
7878
size_t current_field_idx = 0;
7979
std::string value;
8080

81-
for (auto i = 0; i < header_value.size(); ++i) {
81+
for (size_t i = 0; i < header_value.size(); ++i) {
8282
if (current_field_idx >= EXPECTED_EXTENSION_FIELD_COUNT) {
8383
throw TracerException(
8484
"Invalid span context format. It must have 1 fields.");

source/tracing_context_impl.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ class TracingSpanImpl : public TracingSpan {
2727

2828
skywalking::v3::SpanObject createSpanObject() override;
2929

30-
#pragma region Getters
3130
int32_t spanId() const override { return span_id_; }
3231
int32_t parentSpanId() const override { return parent_span_id_; }
3332
int64_t startTime() const override { return start_time_; }
@@ -47,9 +46,7 @@ class TracingSpanImpl : public TracingSpan {
4746
}
4847
bool finished() const override { return finished_; }
4948
std::string operationName() const override { return operation_name_; }
50-
#pragma endregion
5149

52-
#pragma region Setters
5350
void setParentSpanId(int32_t span_id) override {
5451
assert(!finished_);
5552
parent_span_id_ = span_id;
@@ -86,7 +83,6 @@ class TracingSpanImpl : public TracingSpan {
8683
void addLog(std::string key, std::string value,
8784
TimePoint<SteadyTime> current_time) override;
8885
void setComponentId(int32_t component_id) override;
89-
#pragma endregion
9086

9187
private:
9288
// Based on
@@ -127,7 +123,6 @@ class TracingContextImpl : public TracingContext {
127123
SpanContextExtensionPtr parent_ext_span_context,
128124
RandomGenerator& random);
129125

130-
#pragma region Getters
131126
const std::string& traceId() const override { return trace_id_; }
132127
const std::string& traceSegmentId() const override {
133128
return trace_segment_id_;
@@ -143,7 +138,6 @@ class TracingContextImpl : public TracingContext {
143138
SpanContextExtensionPtr parentSpanContextExtension() const override {
144139
return parent_ext_span_context_;
145140
}
146-
#pragma endregion
147141

148142
TracingSpanPtr createExitSpan(TracingSpanPtr parent_span) override;
149143

source/utils/circular_buffer.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,8 @@ class CircularBuffer {
8686
size_t size() const { return item_count_; }
8787

8888
// Used for test
89-
#pragma region test
9089
size_t frontIdx() { return front_; }
9190
size_t backIdx() { return back_; }
92-
#pragma endregion
9391

9492
private:
9593
void popInternal() {

test/grpc_async_client_test.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
#include "source/grpc_async_client_impl.h"
2222
#include "test/mocks.h"
2323

24-
#define TEST
25-
2624
namespace cpp2sky {
2725

2826
using testing::_;

0 commit comments

Comments
 (0)