Tracer ID: uint64 (#25)

* Set tracer_id explicitly, ignore lightstep.guid

* Release 0.16

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.15],
+AC_INIT([lightstep-tracer-cpp], [0.16],
         [https://github.com/lightstep/lightstep-tracer-cpp/issues])
 LT_INIT([disable-shared])
 AM_INIT_AUTOMAKE([1.14 foreign subdir-objects])

src/c++11/impl.cc

@@ -53,11 +53,15 @@ TracerImpl::TracerImpl(const TracerOptions& options_in)
     rand_source_(std::random_device()()),
     tracer_start_time_(Clock::now()) {
 
+  tracer_id_ = GetOneId();
+
   if (options_.tracer_attributes.find(ComponentNameKey) == options_.tracer_attributes.end()) {
     options_.tracer_attributes.emplace(std::make_pair(ComponentNameKey, util::program_name()));
   }
-  if (options_.tracer_attributes.find(TracerIDKey) == options_.tracer_attributes.end()) {
-    options_.tracer_attributes.emplace(std::make_pair(TracerIDKey, uint64ToHex(GetOneId())));
+  // Note: drop the TracerIDKey, this is copied from tracer_id_.
+  auto guid_lookup = options_.tracer_attributes.find(TracerIDKey);
+  if (guid_lookup != options_.tracer_attributes.end()) {
+    options_.tracer_attributes.erase(guid_lookup);
   }
 
   options_.tracer_attributes.emplace(std::make_pair(PlatformNameKey, "c++11"));

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

@@ -72,6 +72,8 @@ class TracerImpl {
   const std::string& component_name() const { return component_name_; }
   const std::string& access_token() const { return options_.access_token; }
 
+  uint64_t tracer_id() const { return tracer_id_; }
+
   TimeStamp tracer_start_time() const { return tracer_start_time_; }
   const Attributes& tracer_attributes() const { return options_.tracer_attributes; }
 
@@ -106,6 +108,7 @@ class TracerImpl {
   uint64_t GetOneId();
 
   TracerOptions options_;
+  uint64_t tracer_id_;
   std::shared_ptr<Recorder> recorder_;
 
   // Protects rand_source_, recorder_.

src/c++11/tracer.cc

@@ -74,9 +74,7 @@ ReportBuilder::ReportBuilder(const TracerImpl &impl)
   for (const auto& tt : impl.options().tracer_attributes) {
     *tracer->mutable_tags()->Add() = util::make_kv(tt.first, tt.second);
 
-    if (tt.first == TracerIDKey) {
-      tracer->set_tracer_id(util::stringToUint64(tt.second));
-    }
+    tracer->set_tracer_id(impl.tracer_id());
   }
   preamble_.mutable_auth()->set_access_token(impl.access_token());
 }

test/c++11/flushproto_test.cc

@@ -57,6 +57,7 @@ int main() {
     topts.collector_host = "";
     topts.collector_port = 9998;
     topts.collector_encryption = "";
+    topts.tracer_attributes["lightstep.guid"] = "invalid";
     topts.guid_generator = my_guids;
 
     lightstep::Tracer::InitGlobal(NewUserDefinedTransportLightStepTracer(topts, [](const lightstep::TracerImpl& impl) {