Split cmd/otelcontribcol into a separate module, extract testbed in a…

… separate module (open-telemetry#16715) Signed-off-by: Bogdan Drutu <[email protected]> Signed-off-by: Bogdan Drutu <[email protected]>
sakulali · Dec 7, 2022 · d71aab4 · d71aab4
1 parent 8372cac
commit d71aab4
Show file tree

Hide file tree

Showing 19 changed files with 8,120 additions and 19 deletions.
diff --git a/.chloggen/splitcmd.yaml b/.chloggen/splitcmd.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: Split cmd/otelcontribcol into a separate module, extract testbed in a separate module
+
+# One or more tracking issues related to the change
+issues: [16715]
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -22,7 +22,8 @@
 
 cmd/configschema/ @open-telemetry/collector-contrib-approvers @mx-psi @dmitryax @pmcollins
 cmd/mdatagen/ @open-telemetry/collector-contrib-approvers @dmitryax
-cmd/otelcontribcol/ @open-telemetry/collector-contrib-approvers @codeboten
+cmd/otelcontribcol/ @open-telemetry/collector-contrib-approvers
+cmd/oteltestbedcol/ @open-telemetry/collector-contrib-approvers
 cmd/telemetrygen/ @open-telemetry/collector-contrib-approvers @mx-psi @amenasria @codeboten
 cmd/tracegen/ @open-telemetry/collector-contrib-approvers @jpkrohling
 

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -21,6 +21,7 @@ body:
  - cmd/configschema
  - cmd/mdatagen
  - cmd/otelcontribcol
+ - cmd/oteltestbedcol
  - cmd/telemetrygen
  - cmd/tracegen
  - confmap/provider/s3provider

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -15,6 +15,7 @@ body:
  - cmd/configschema
  - cmd/mdatagen
  - cmd/otelcontribcol
+ - cmd/oteltestbedcol
  - cmd/telemetrygen
  - cmd/tracegen
  - confmap/provider/s3provider

diff --git a/.github/ISSUE_TEMPLATE/other.yaml b/.github/ISSUE_TEMPLATE/other.yaml
@@ -15,6 +15,7 @@ body:
  - cmd/configschema
  - cmd/mdatagen
  - cmd/otelcontribcol
+ - cmd/oteltestbedcol
  - cmd/telemetrygen
  - cmd/tracegen
  - confmap/provider/s3provider

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -22,6 +22,14 @@ updates:
  directory: "/cmd/mdatagen"
  schedule:
  interval: "weekly"
+ - package-ecosystem: "gomod"
+ directory: "/cmd/otelcontribcol"
+ schedule:
+ interval: "weekly"
+ - package-ecosystem: "gomod"
+ directory: "/cmd/oteltestbedcol"
+ schedule:
+ interval: "weekly"
  - package-ecosystem: "gomod"
  directory: "/cmd/telemetrygen"
  schedule:
@@ -142,6 +150,10 @@ updates:
  directory: "/exporter/loadbalancingexporter"
  schedule:
  interval: "weekly"
+ - package-ecosystem: "gomod"
+ directory: "/exporter/logicmonitorexporter"
+ schedule:
+ interval: "weekly"
  - package-ecosystem: "gomod"
  directory: "/exporter/logzioexporter"
  schedule:
@@ -718,6 +730,10 @@ updates:
  directory: "/receiver/prometheusreceiver"
  schedule:
  interval: "weekly"
+ - package-ecosystem: "gomod"
+ directory: "/receiver/promtailreceiver"
+ schedule:
+ interval: "weekly"
  - package-ecosystem: "gomod"
  directory: "/receiver/pulsarreceiver"
  schedule:

diff --git a/.github/workflows/load-tests.yml b/.github/workflows/load-tests.yml
@@ -49,7 +49,7 @@ jobs:
  - name: Install Tools
  if: steps.go-cache.outputs.cache-hit != 'true'
  run: make install-tools
- - run: make otelcontribcol-testbed
+ - run: make oteltestbedcol
  - name: Upload Collector Binaries
  uses: actions/upload-artifact@v3
  with:

diff --git a/Makefile b/Makefile
@@ -63,7 +63,7 @@ all-common:
  @$(MAKE) $(FOR_GROUP_TARGET) TARGET="common"
 
 .PHONY: e2e-test
-e2e-test: otelcontribcol otelcontribcol-testbed
+e2e-test: otelcontribcol oteltestbedcol
  $(MAKE) -C testbed run-tests
 
 .PHONY: unit-tests-with-cover
@@ -267,14 +267,14 @@ chlog-update: chlog-install
 # Build the Collector executable.
 .PHONY: otelcontribcol
 otelcontribcol:
- GO111MODULE=on CGO_ENABLED=0 $(GOCMD) build -trimpath -o ./bin/otelcontribcol_$(GOOS)_$(GOARCH)$(EXTENSION) \
- $(BUILD_INFO) -tags $(GO_BUILD_TAGS) ./cmd/otelcontribcol
+ cd ./cmd/otelcontribcol && GO111MODULE=on CGO_ENABLED=0 $(GOCMD) build -trimpath -o ../../bin/otelcontribcol_$(GOOS)_$(GOARCH)$(EXTENSION) \
+ $(BUILD_INFO) -tags $(GO_BUILD_TAGS) .
 
 # Build the Collector executable, with only components used in testbed.
-.PHONY: otelcontribcol-testbed
-otelcontribcol-testbed:
- GO111MODULE=on CGO_ENABLED=0 $(GOCMD) build -trimpath -o ./bin/otelcontribcol_testbed_$(GOOS)_$(GOARCH)$(EXTENSION) \
- $(BUILD_INFO) -tags $(GO_BUILD_TAGS),testbed ./cmd/otelcontribcol
+.PHONY: oteltestbedcol
+oteltestbedcol:
+ cd ./cmd/oteltestbedcol && GO111MODULE=on CGO_ENABLED=0 $(GOCMD) build -trimpath -o ../../bin/oteltestbedcol_$(GOOS)_$(GOARCH)$(EXTENSION) \
+ $(BUILD_INFO) -tags $(GO_BUILD_TAGS) .
 
 .PHONY: update-dep
 update-dep:

diff --git a/cmd/otelcontribcol/Makefile b/cmd/otelcontribcol/Makefile
@@ -0,0 +1 @@
+include ../../Makefile.Common