don't fallback onto deps from vendor

Abort build if protobuf-c cannot be found in the system without falling
back to building and using protobuf-c from vendor subdir. axiom build
needs protoc-c (provided by protobuf-c-compiler package) and agent needs
to link to protobuf-c static library (provided by protobuf-c-devel).
Static library is required to avoid shared objects runtime dependencies
on customers' systems.

Don't attempt to build protobuf compiler from vendor subdir - assume it
is installed and let the build fail if it is not.  protobuf compiler
alone is not enough for the rule that used it anyway - protoc-gen-go is
needed too, and it has never been vendored but rather was assumed to be
installed on the build system. The rule that uses protobuf compiler and
protoc-gen-go is not part of the build anyway - its output is checked in
to the repository. The rule exists as documentation how to regenerate
infinite tracing code for the daemon.

Author: lavarou

Makefile

@@ -227,7 +227,7 @@ bin/:
 #
 
 .PHONY: axiom
-axiom: vendor
+axiom: protobuf-c
 	$(MAKE) -C axiom
 
 #
@@ -238,15 +238,15 @@ axiom: vendor
 # TESTARGS =
 
 .PHONY: axiom-tests
-axiom-tests: vendor
+axiom-tests: protobuf-c
 	$(MAKE) -C axiom tests
 
 .PHONY: axiom-check axiom-run-tests
-axiom-check axiom-run-tests: vendor axiom/tests/cross_agent_tests
+axiom-check axiom-run-tests: protobuf-c axiom/tests/cross_agent_tests
 	$(MAKE) -C axiom run_tests
 
 .PHONY: axiom-valgrind
-axiom-valgrind: vendor axiom/tests/cross_agent_tests
+axiom-valgrind: protobuf-c axiom/tests/cross_agent_tests
 	$(MAKE) -C axiom valgrind
 
 .PHONY: tests
@@ -279,9 +279,7 @@ axiom-clean:
 daemon-protobuf: daemon/internal/newrelic/infinite_tracing/com_newrelic_trace_v1/v1.pb.go
 
 daemon/internal/newrelic/infinite_tracing/com_newrelic_trace_v1/v1.pb.go: protocol/infinite_tracing/v1.proto
-	$(MAKE) vendor # Only build vendor stuff if v1.proto has changed. Otherwise
-	               # this rule will be triggered every time the daemon is built.
-	$(VENDOR_PREFIX)/bin/protoc \
+	protoc \
 	    -I=./protocol/infinite_tracing \
 	    --go_out="paths=source_relative,plugins=grpc:daemon/internal/newrelic/infinite_tracing/com_newrelic_trace_v1" \
 	    protocol/infinite_tracing/v1.proto
@@ -403,7 +401,7 @@ coverage:
 #
 
 .PHONY: clean
-clean: agent-clean axiom-clean daemon-clean package-clean coverage-clean vendor-clean
+clean: agent-clean axiom-clean daemon-clean package-clean coverage-clean
 	rm -rf releases
 	rm -f agent/newrelic.map agent/LicenseData/license_errors.txt
 
@@ -441,21 +439,14 @@ lasp-test-all:
 	$(MAKE) lasp-test SUITE_LASP=suite-random-3
 
 #
-# Vendored libraries
+# Check for protobuf-c (HAVE_PROTOBUF_C): 
+#  - axiom build needs protoc-c (protobuf-c-compiler)
+#  - agent build needs protobuf-c static library (protobuf-c-devel)
 #
-export GIT
-
-.PHONY: vendor vendor-clean
+.PHONY: protobuf-c
+protobuf-c:
 ifeq (0,$(HAVE_PROTOBUF_C))
-vendor:
-	$(MAKE) -C vendor all
-
-vendor-clean:
-	$(MAKE) -C vendor clean
-else
-vendor: ;
-
-vendor-clean: ;
+	$(error Build dependency 'protobuf-c' not found.)
 endif
 
 #

axiom/Makefile

@@ -195,7 +195,7 @@ nr_config.h: configure Makefile
 #
 # Build the 8T protobuf code.
 #
-v1.pb-c.c: v1.proto
+v1.pb-c.c: v1.proto protobuf-c
 	$(PROTOBUF_C_PREFIX)/bin/protoc-c --c_out=. $<
 
 #
@@ -205,6 +205,12 @@ v1.pb-c.c: v1.proto
 v1.pb-c.o: v1.pb-c.c
 	$(CC) $(AXIOM_CPPFLAGS) $(CPPFLAGS) $(AXIOM_CFLAGS) $(PCRE_CFLAGS) $(VENDOR_CFLAGS) $(CFLAGS) -MMD -MP -Wno-cast-qual -c $< -o $@
 
+.PHONY: protobuf-c
+protobuf-c:
+ifeq (0,$(HAVE_PROTOBUF_C))
+	$(error Build dependency 'protobuf-c' not found.)
+endif
+
 #
 # Track the flags passed to the compiler to force a rebuild when they change.
 # This ensures a rebuild occurs when the version number or commit are updated.

files/Dockerfile

@@ -44,6 +44,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libmcrypt-dev \
     libonig-dev \
     libpcre3 libpcre3-dev \
+# 8T protobuf code in axiom depends on libprotobuf-c library
+    libprotobuf-c-dev \
     libreadline-dev \
     libssl-dev \
     libsqlite3-dev \
@@ -52,6 +54,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     locales \
     locales-all \
     netcat-openbsd \
+# needed to generate 8T protobuf code in daemon
+    protobuf-compiler \
+# needed to generate 8T protobuf code in axiom
+    protobuf-c-compiler \
     python3-yaml \
     ${PHP_USER_SPECIFIED_PACKAGES} \
     zlib1g-dev

make/config.mk

@@ -59,10 +59,6 @@ ifneq ($(findstring environment,$(origin PROTOBUF_C_PREFIX)), )
   ifeq ($(HAVE_PROTOBUF_C), 0)
     $(error User provided 'protobuf-c' installation is not valid!)
   endif
-else
-  ifeq ($(HAVE_PROTOBUF_C), 0)
-    $(info 'protobuf-c' installation not found, falling back to building from vendor subdir.)
-  endif
 endif
 
 

make/vendor.mk

@@ -11,17 +11,8 @@
 # It is recommended to use the VENDOR_... variables.
 #
 
-# We need to find where the project's vendored dependencies live for these
-# variables.
-ifeq (0,$(HAVE_PROTOBUF_C))
-PROTOBUF_C_PREFIX := $(realpath $(dir $(abspath $(lastword $(MAKEFILE_LIST))))../vendor)/local
-endif
-
-#
-# protobuf-c
 #
-# Note that this does not require protobuf, which is a build time dependency
-# only.
+# protobuf-c: 8T protobuf code from axiom needs protobuf-c library
 #
 PROTOBUF_C_CFLAGS := -I$(PROTOBUF_C_PREFIX)/include
 PROTOBUF_C_LDFLAGS := -L$(PROTOBUF_C_PREFIX)/lib