From 2214b22c8cd427e5d5c775986cb56830a63efb87 Mon Sep 17 00:00:00 2001
From: dmathieu <42@dmathieu.com>
Date: Thu, 28 Nov 2024 14:04:39 +0100
Subject: [PATCH 1/2] don't run clean-gen twice

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 397934c..498d633 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,8 @@ clean-gen:
 	rm -rf $(GEN_TEMP_DIR)
 
 .PHONY: clean
-clean: clean-gen
+clean:
+	rm -rf $(GEN_TEMP_DIR)
 	rm -rf $(OTLP_OUTPUT_DIR)/*/ $(OTLPSLIM_OUTPUT_DIR)/*/
 
 .PHONY: go-mod-tidy

From 8aee1edb47ade3467ee5835775dc43a2ff48d78d Mon Sep 17 00:00:00 2001
From: dmathieu <42@dmathieu.com>
Date: Thu, 28 Nov 2024 14:17:57 +0100
Subject: [PATCH 2/2] ignore root package from make test, as it does not
 include any go file

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 498d633..7632106 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,8 @@ endif
 GO                := go
 GO_MOD_ROOT       := go.opentelemetry.io/proto
 ALL_GO_MOD_DIRS := $(shell find . -type f -name 'go.mod' -exec dirname {} \; | sort)
-OTEL_GO_MOD_DIRS := $(filter-out $(TOOLS_MOD_DIR), $(ALL_GO_MOD_DIRS))
+ALL_GO_SUB_MOD_DIRS := $(shell find . -type f -name 'go.mod' -mindepth 2 -exec dirname {} \; | sort)
+OTEL_GO_MOD_DIRS := $(filter-out $(TOOLS_MOD_DIR), $(ALL_GO_SUB_MOD_DIRS))
 TIMEOUT = 60
 
 PROTOBUF_GEN_DIR  := opentelemetry-proto-gen