fixup! Review fixes

Author: jmcomets

zipkin_opentracing/src/opentracing.cc

@@ -119,6 +119,16 @@ static const OtSpanContext *findSpanContext(
   return nullptr;
 }
 
+static void addAnnotations(const std::vector<ot::LogRecord>& log_records, Endpoint endpoint) {
+  for (const auto &lr : log_records) {
+    const auto timestamp = std::chrono::duration_cast<std::chrono::microseconds>(
+                                    lr.timestamp.time_since_epoch()).count();
+    Annotation annotation = toAnnotation({ lr.fields.begin(), lr.fields.end() });
+    annotation.setTimestamp(timestamp);
+    annotation.setEndpoint(endpoint);
+  }
+}
+
 class OtSpan : public ot::Span {
 public:
   OtSpan(std::shared_ptr<const ot::Tracer> &&tracer_owner, SpanPtr &&span_owner,
@@ -221,19 +231,8 @@ class OtSpan : public ot::Span {
 
     std::vector<ot::LogRecord> log_records;
     log_records.swap(log_records_);
-    log_records.reserve(options.log_records.size());
-    std::copy(options.log_records.begin(), options.log_records.end(),
-            std::back_inserter(log_records));
-
-    for (const auto &lr : log_records) {
-        const auto timestamp = std::chrono::duration_cast<std::chrono::microseconds>(
-                lr.timestamp.time_since_epoch()).count();
-        for (const auto& field : lr.fields) {
-            Annotation annotation = toAnnotation(field.first, field.second);
-            annotation.setTimestamp(timestamp);
-            span_->addAnnotation(annotation);
-        }
-    }
+    addAnnotations(log_records, endpoint_);
+    addAnnotations(options.log_records, endpoint_);
 
     span_->finish();
   } catch (const std::bad_alloc &) {

zipkin_opentracing/src/utility.cc

@@ -125,11 +125,17 @@ BinaryAnnotation toBinaryAnnotation(string_view key, const Value &value) {
   return annotation;
 }
 
-Annotation toAnnotation(string_view key, const Value &value) {
-  ToStringValueVisitor value_visitor{value};
-  const std::string str = apply_visitor(value_visitor, value);
+Annotation toAnnotation(const std::vector<std::pair<string_view, Value>>& fields) {
+  rapidjson::StringBuffer buffer;
+  JsonWriter writer(buffer);
+  writer.StartObject();
+  for (auto & field : fields) {
+    writer.Key(field.first.data());
+    toJson(writer, field.second);
+  }
+  writer.EndObject();
   Annotation annotation;
-  annotation.setValue(std::string(key) + "=" + str);
+  annotation.setValue(buffer.GetString());
   return annotation;
 }
 

zipkin_opentracing/src/utility.h

@@ -9,7 +9,6 @@ namespace zipkin {
 BinaryAnnotation toBinaryAnnotation(opentracing::string_view key,
                                     const opentracing::Value &value);
 
-Annotation toAnnotation(opentracing::string_view key,
-                        const opentracing::Value &value);
+Annotation toAnnotation(const std::vector<std::pair<opentracing::string_view, opentracing::Value>>& fields);
 
 } // namespace zipkin