Skip to content
This repository was archived by the owner on Jul 31, 2023. It is now read-only.

Commit 04ed021

Browse files
authored
Don't leave af_type uninitialized. (#437)
Always branch on af_type == v4, instead of mixing v4 and v6.
1 parent 4974537 commit 04ed021

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

opencensus/exporters/trace/zipkin/internal/zipkin_exporter.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@ void SerializeJson(const ::opencensus::trace::exporter::SpanData& span,
102102
writer->Key("id");
103103
writer->String(span.context().span_id().ToHex());
104104

105-
// Write endpoint. OpenCensus does not support this by default.
105+
// Write localEndpoint. OpenCensus does not support this by default.
106106
writer->Key("localEndpoint");
107107
writer->StartObject();
108108
writer->Key("serviceName");
109109
writer->String(service.service_name);
110-
if (service.af_type == ZipkinExporterOptions::AddressFamily::kIpv6) {
111-
writer->Key("ipv6");
112-
} else {
110+
if (service.af_type == ZipkinExporterOptions::AddressFamily::kIpv4) {
113111
writer->Key("ipv4");
112+
} else {
113+
writer->Key("ipv6");
114114
}
115115
writer->String(service.ip_address);
116116
writer->EndObject();

opencensus/exporters/trace/zipkin/internal/zipkin_exporter_test.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class ZipkinExporterTestPeer : public ::testing::Test {
2929
ZipkinExporterTestPeer() {
3030
// Register zipkin exporter
3131
ZipkinExporterOptions options("http://127.0.0.1:9411/api/v2/spans");
32-
options.af_type = ZipkinExporterOptions::AddressFamily::kIpv4;
3332
options.service_name = "TestService";
3433
ZipkinExporter::Register(options);
3534
}

opencensus/exporters/trace/zipkin/zipkin_exporter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ struct ZipkinExporterOptions {
4646
std::string service_name;
4747
// Address family to be reported to zipkin collector.
4848
enum class AddressFamily : uint8_t { kIpv4, kIpv6 };
49-
AddressFamily af_type;
49+
AddressFamily af_type = AddressFamily::kIpv4;
5050

5151
struct Service {
5252
Service() : af_type(AddressFamily::kIpv4) {}

0 commit comments

Comments
 (0)