Change otelcontribcol and oteltestbedcol to use the builder (open-tel…

…emetry#16828) Signed-off-by: Bogdan Drutu <[email protected]> Signed-off-by: Bogdan Drutu <[email protected]>
ycombinator · Jan 26, 2023 · 939107a · 939107a
1 parent e33aa6d
commit 939107a
Show file tree

Hide file tree

Showing 29 changed files with 2,103 additions and 1,044 deletions.
diff --git a/.chloggen/oteltestbedcol.yaml b/.chloggen/oteltestbedcol.yaml
@@ -0,0 +1,11 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: cmd/otelcontribcol
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Change otelcontribcol and oteltestbedcol to use the builder
+
+# One or more tracking issues related to the change
+issues: [11867]
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -172,6 +172,14 @@ jobs:
  run: |
  make gotidy
  git diff --exit-code || (echo 'go.mod/go.sum deps changes detected, please run "make gotidy" and commit the changes in this PR.' && exit 1)
+ - name: Gen genotelcontribcol
+ run: |
+ make genotelcontribcol
+ git diff -s --exit-code || (echo 'Generated code is out of date, please run "make genotelcontribcol" and commit the changes in this PR.' && exit 1)
+ - name: Gen genoteltestbedcol
+ run: |
+ make genoteltestbedcol
+ git diff -s --exit-code || (echo 'Generated code is out of date, please run "make genoteltestbedcol" and commit the changes in this PR.' && exit 1)
  - name: CodeGen
  run: |
  make -j2 generate

diff --git a/Makefile b/Makefile
@@ -248,12 +248,22 @@ chlog-preview: $(CHLOGGEN)
 chlog-update: $(CHLOGGEN)
  $(CHLOGGEN) update --version $(VERSION)
 
+.PHONY: genotelcontribcol
+genotelcontribcol: $(BUILDER)
+ $(BUILDER) --skip-compilation --config cmd/otelcontribcol/builder-config.yaml --output-path cmd/otelcontribcol
+ $(MAKE) -C cmd/otelcontribcol fmt
+
 # Build the Collector executable.
 .PHONY: otelcontribcol
 otelcontribcol:
  cd ./cmd/otelcontribcol && GO111MODULE=on CGO_ENABLED=0 $(GOCMD) build -trimpath -o ../../bin/otelcontribcol_$(GOOS)_$(GOARCH)$(EXTENSION) \
  $(BUILD_INFO) -tags $(GO_BUILD_TAGS) .
 
+.PHONY: genoteltestbedcol
+genoteltestbedcol: $(BUILDER)
+ $(BUILDER) --skip-compilation --config cmd/oteltestbedcol/builder-config.yaml --output-path cmd/oteltestbedcol
+ $(MAKE) -C cmd/oteltestbedcol fmt
+
 # Build the Collector executable, with only components used in testbed.
 .PHONY: oteltestbedcol
 oteltestbedcol:

diff --git a/Makefile.Common b/Makefile.Common
@@ -55,6 +55,7 @@ PORTO := $(TOOLS_BIN_DIR)/porto
 CHECKDOC := $(TOOLS_BIN_DIR)/checkdoc
 CROSSLINK := $(TOOLS_BIN_DIR)/crosslink
 GOJUNIT := $(TOOLS_BIN_DIR)/go-junit-report 
+BUILDER := $(TOOLS_BIN_DIR)/builder
 
 # BUILD_TYPE should be one of (dev, release).
 BUILD_TYPE?=release

diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml
diff --git a/cmd/otelcontribcol/components.go b/cmd/otelcontribcol/components.go
diff --git a/cmd/otelcontribcol/components_test.go b/cmd/otelcontribcol/components_test.go
diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod
diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum
diff --git a/cmd/otelcontribcol/main.go b/cmd/otelcontribcol/main.go
diff --git a/cmd/otelcontribcol/main_others.go b/cmd/otelcontribcol/main_others.go
diff --git a/internal/otelcontribcore/main_windows.go → cmd/otelcontribcol/main_windows.go b/internal/otelcontribcore/main_windows.go → cmd/otelcontribcol/main_windows.go