Merge pull request #33 from lightstep/jmacd/build_with_protoc

Generate protobuf code at build time

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.19],
+AC_INIT([lightstep-tracer-cpp], [0.20],
         [https://github.com/lightstep/lightstep-tracer-cpp/issues])
 LT_INIT([disable-shared])
 AM_INIT_AUTOMAKE([1.14 foreign subdir-objects])
@@ -29,6 +29,9 @@ CPPFLAGS="${SAVE_CPPFLAGS}"
 AC_SUBST(protobuf_LIBS)
 AC_SUBST(protobuf_CFLAGS)
 
+AC_CACHE_VAL(protobuf_cv_PREFIX, [protobuf_cv_PREFIX=`$PKG_CONFIG --variable=prefix protobuf`])
+AC_SUBST(PROTOC, $protobuf_cv_PREFIX/bin/protoc)
+
 AC_ARG_ENABLE([grpc],
   [AS_HELP_STRING([--disable-grpc],
   [Enable gRPC networking @<:@yes@:>@])],

lightstep-tracer-common

@@ -1,26 +1,39 @@
 # TODO(jmacd): Replace the proto-generation rule with one using the protoc docker image.
-PROTOC = protoc
-PROTO_SRC = $(top_srcdir)/lightstep-tracer-common
+PROTOC = @PROTOC@
+COLLECTOR_SRC = $(top_srcdir)/lightstep-tracer-common
 ENVOY_SRC = ./envoy
-PROTO_OUT = proto
+PROTO_DIR = proto
+
+PROTO_SRC = \
+	$(COLLECTOR_SRC)/collector.proto \
+	$(ENVOY_SRC)/envoy_carrier.proto
+
+PROTO_GEN = \
+	lightstep/collector.grpc.pb.h \
+	lightstep/collector.pb.h \
+	lightstep/envoy_carrier.pb.h \
+	proto/collector.grpc.pb.cc \
+	proto/collector.pb.cc \
+	proto/envoy_carrier.pb.cc
+
+CLEANFILES = $(PROTO_GEN)
 
 .PHONY: proto
 
 AM_CXXFLAGS = -Wno-deprecated-declarations
 
-proto:
-	mkdir -p $(PROTO_OUT)
-	$(PROTOC) --proto_path=$(PROTO_SRC) --grpc_out=$(PROTO_OUT) --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` $(PROTO_SRC)/collector.proto
-	$(PROTOC) --proto_path=$(PROTO_SRC) --cpp_out=$(PROTO_OUT) $(PROTO_SRC)/collector.proto
-	$(PROTOC) --proto_path=$(ENVOY_SRC) --cpp_out=$(PROTO_OUT) $(ENVOY_SRC)/envoy_carrier.proto
+$(PROTO_GEN): $(PROTO_SRC) $(PROTOC)
+	mkdir -p $(PROTO_DIR)
+	$(PROTOC) --proto_path=$(COLLECTOR_SRC) --grpc_out=$(PROTO_DIR) --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` $(COLLECTOR_SRC)/collector.proto
+	$(PROTOC) --proto_path=$(COLLECTOR_SRC) --cpp_out=$(PROTO_DIR) $(COLLECTOR_SRC)/collector.proto
+	$(PROTOC) --proto_path=$(ENVOY_SRC) --cpp_out=$(PROTO_DIR) $(ENVOY_SRC)/envoy_carrier.proto
 	mv proto/*.h lightstep
 
+BUILT_SOURCES = $(PROTO_GEN)
+
 lib_LTLIBRARIES = liblightstep_core_cxx11.la
 
 nobase_include_HEADERS = \
-	lightstep/collector.grpc.pb.h \
-	lightstep/collector.pb.h \
-	lightstep/envoy_carrier.pb.h \
 	lightstep/envoy.h \
 	lightstep/impl.h \
 	lightstep/options.h \
@@ -33,6 +46,11 @@ nobase_include_HEADERS = \
 	mapbox_variant/recursive_wrapper.hpp \
 	mapbox_variant/variant.hpp
 
+nobase_nodist_include_HEADERS = \
+	lightstep/collector.grpc.pb.h \
+	lightstep/collector.pb.h \
+	lightstep/envoy_carrier.pb.h
+
 EXTRA_DIST = \
 	mapbox_variant/LICENSE \
 	envoy/envoy_carrier.proto
@@ -41,7 +59,9 @@ liblightstep_core_cxx11_la_SOURCES = \
 	impl.cc \
 	span.cc \
 	tracer.cc \
-	util.cc \
+	util.cc
+
+nodist_liblightstep_core_cxx11_la_SOURCES = \
 	proto/collector.pb.cc \
 	proto/envoy_carrier.pb.cc
 
@@ -53,7 +73,9 @@ if ENABLE_GRPC
 lib_LTLIBRARIES += liblightstep_grpc_cxx11.la
 
 liblightstep_grpc_cxx11_la_SOURCES = \
-	recorder.cc \
+	recorder.cc
+
+nodist_liblightstep_grpc_cxx11_la_SOURCES = \
 	proto/collector.grpc.pb.cc
 
 # Note $(grpc_LIBS)++ shenanigans. The grpc C++ pkg-config input (grpc++.pc) uses

src/c++11/Makefile.am

@@ -18,7 +18,7 @@
 
 namespace lightstep {
 
-const char TracerIDKey[] = "lightstep.guid";
+const char ReporterIDKey[] = "lightstep.guid";
 
 namespace {
 
@@ -55,13 +55,13 @@ TracerImpl::TracerImpl(const TracerOptions& options_in)
     rand_source_(std::random_device()()),
     tracer_start_time_(Clock::now()) {
 
-  tracer_id_ = GetOneId();
+  reporter_id_ = GetOneId();
 
   if (options_.tracer_attributes.find(ComponentNameKey) == options_.tracer_attributes.end()) {
     options_.tracer_attributes.emplace(std::make_pair(ComponentNameKey, util::program_name()));
   }
-  // Note: drop the TracerIDKey, this is copied from tracer_id_.
-  auto guid_lookup = options_.tracer_attributes.find(TracerIDKey);
+  // Note: drop the ReporterIDKey, this is copied from reporter_id_.
+  auto guid_lookup = options_.tracer_attributes.find(ReporterIDKey);
   if (guid_lookup != options_.tracer_attributes.end()) {
     options_.tracer_attributes.erase(guid_lookup);
   }