Merge pull request #45 from lightstep/jmacd/remove_text_proto_carrier

Remove text proto carrier

Author: jmacd

configure.ac

@@ -4,7 +4,7 @@
 # by homebrew, see the commands to set PKG_CONFIG_PATH in build.sh.
 
 AC_PREREQ([2.69])
-AC_INIT([lightstep-tracer-cpp], [0.36],
+AC_INIT([lightstep-tracer-cpp], [0.37],
         [https://github.com/lightstep/lightstep-tracer-cpp/issues])
 LT_INIT([disable-shared])
 AM_INIT_AUTOMAKE([1.14 foreign subdir-objects])

lightstep-tracer-common

@@ -177,10 +177,6 @@ bool TracerImpl::inject_lightstep_carrier(SpanContext sc, const CarrierWriter& o
 			  (*baggage)[key] = value;
 			  return true;
 			});
-
-  // TODO Remove the text encoding after [...] has upgraded globally.
-  TextProtoWriter legacy_writer(output);
-  inject_text_carrier(sc, legacy_writer);
   return true;
 }
 
@@ -234,9 +230,6 @@ SpanContext TracerImpl::extract_lightstep_carrier(const CarrierReader& opaque) {
 
   const BinaryCarrier& proto = carrier->data_;
   const BasicTracerCarrier& basic = proto.basic_ctx();
-  if (basic.trace_id() == 0 && basic.span_id() == 0) {
-    return extract_text_carrier(TextProtoReader(proto));
-  }
 
   std::shared_ptr<ContextImpl> ctx(new ContextImpl);
   ctx->trace_id = basic.trace_id();

src/c++11/impl.cc

@@ -33,37 +33,6 @@ class ProtoWriter : public CarrierWriter {
   BinaryCarrier *const output_;
 };
 
-// TextProtoReader/Writer handle reading and writing the opentracing
-// text carrier representation.
-class TextProtoReader : public BasicCarrierReader {
-public:
-  explicit TextProtoReader(const BinaryCarrier& data) : data_(data) { }
-
-  void ForeachKey(std::function<void(const std::string& key,
-  				     const std::string& value)> f) const override {
-    for (const auto& c : data_.text_ctx()) {
-      f(c.key(), c.value());
-    }
-  }
-
-private:
-  const BinaryCarrier& data_;
-};
-
-class TextProtoWriter : public BasicCarrierWriter {
-public:
-  explicit TextProtoWriter(BinaryCarrier *output) : output_(output) { }
-
-  void Set(const std::string &key, const std::string &value) const override {
-    TextCarrierPair *kv = output_->add_text_ctx();
-    kv->set_key(key);
-    kv->set_value(value);
-  }
-
-private:
-  BinaryCarrier *const output_;
-};
-
 }  // namespace lightstep
 
 #endif  // __LIGHTSTEP_CARRIER_H__

src/c++11/lightstep/carrier.h

@@ -69,58 +69,12 @@ int main() {
       tracer.Extract(lightstep::CarrierFormat::LightStepBinaryCarrier,
 		     lightstep::ProtoReader(binary_orig));
 
-    // Test migration using both formats.
-    lightstep::BinaryCarrier binary_dual1;
-    if (!tracer.Inject(test1,
-		       lightstep::CarrierFormat::LightStepBinaryCarrier,
-		       lightstep::ProtoWriter(&binary_dual1))) {
-      throw error("inject failed");
-    }
-    lightstep::BinaryCarrier binary_text = binary_dual1;
-    lightstep::BinaryCarrier binary_basic = binary_dual1;
-    binary_basic.clear_text_ctx();
-    binary_text.clear_basic_ctx();
-
-    std::string data_orig = binary_orig.SerializeAsString();
-    std::string data_basic = binary_basic.SerializeAsString();
-
-    // TODO Use gUNIT for testing proto equivalence, as proto-encoding
-    // is not required to be pass an equals test (it's safe here,
-    // since we use a single baggage item and the protolib always
-    // encodes in tag order).
-    if (data_orig != data_basic) {
-      throw error("proto data mismatch [" + data_orig + "] != [" + data_basic + "]");
-    }
-
-    // Test extraction of the text carrier format.
-    lightstep::SpanContext test2 =
-      tracer.Extract(lightstep::CarrierFormat::LightStepBinaryCarrier,
-		     lightstep::ProtoReader(binary_text));
-
-    lightstep::BinaryCarrier binary_dual2;
-    if (!tracer.Inject(test2,
-		       lightstep::CarrierFormat::LightStepBinaryCarrier,
-		       lightstep::ProtoWriter(&binary_dual2))) {
-      throw error("inject failed");
-    }
-
-    std::string data_dual1 = binary_dual1.SerializeAsString();
-    std::string data_dual2 = binary_dual2.SerializeAsString();
-
-    if (data_dual1 != data_dual2) {
-      throw error("proto data mismatch [" + data_dual1 + "] != [" + data_dual2 + "]");
-    }
+    // Note: Code to test carrier-format migration removed 03/22/2017.
 
     // Test extraction of a well-known input, for validation with other libraries.
     const char same_data64[] = "EigJOjioEaYHBgcRNmifUO7/xlgYASISCgdjaGVja2VkEgdiYWdnYWdl";
     std::string same_data = base64_decode(same_data64);
 
-    // The "same" data was generated in this code, so this test only
-    // identifies a change of behavior.
-    if (same_data != data_basic) {
-      throw error("well-known data mismatch");
-    }
-
     lightstep::BinaryCarrier same_basic;
     same_basic.ParseFromString(same_data);