remove oteltestbed collector

.chloggen/codeboten_rm-testbedcol.yaml

@@ -0,0 +1,27 @@
+# Use this changelog template to create an entry for release notes.
+
+# 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: oteltestbedcol
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Removing oteltestbedcol, update the load tests to use otelcontribcol instead. This has the impact of increasing the memory used by the load tests as more components are loaded.
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [34849]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# If your change doesn't affect end users or the exported elements of any package,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: []

.github/CODEOWNERS

@@ -18,7 +18,6 @@
 cmd/githubgen/                                                      @open-telemetry/collector-contrib-approvers @atoulme
 cmd/opampsupervisor/                                                @open-telemetry/collector-contrib-approvers @evan-bradley @atoulme @tigrannajaryan @BinaryFissionGames
 cmd/otelcontribcol/                                                 @open-telemetry/collector-contrib-approvers
-cmd/oteltestbedcol/                                                 @open-telemetry/collector-contrib-approvers
 cmd/telemetrygen/                                                   @open-telemetry/collector-contrib-approvers @mx-psi @codeboten
 
 confmap/provider/s3provider/                                        @open-telemetry/collector-contrib-approvers @Aneurysm9

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -21,7 +21,6 @@ body:
       - cmd/githubgen
       - cmd/opampsupervisor
       - cmd/otelcontribcol
-      - cmd/oteltestbedcol
       - cmd/telemetrygen
       - confmap/provider/s3provider
       - confmap/provider/secretsmanagerprovider

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -15,7 +15,6 @@ body:
       - cmd/githubgen
       - cmd/opampsupervisor
       - cmd/otelcontribcol
-      - cmd/oteltestbedcol
       - cmd/telemetrygen
       - confmap/provider/s3provider
       - confmap/provider/secretsmanagerprovider

.github/ISSUE_TEMPLATE/other.yaml

@@ -15,7 +15,6 @@ body:
       - cmd/githubgen
       - cmd/opampsupervisor
       - cmd/otelcontribcol
-      - cmd/oteltestbedcol
       - cmd/telemetrygen
       - confmap/provider/s3provider
       - confmap/provider/secretsmanagerprovider

.github/ISSUE_TEMPLATE/unmaintained.yaml

@@ -20,7 +20,6 @@ body:
       - cmd/githubgen
       - cmd/opampsupervisor
       - cmd/otelcontribcol
-      - cmd/oteltestbedcol
       - cmd/telemetrygen
       - confmap/provider/s3provider
       - confmap/provider/secretsmanagerprovider

.github/workflows/build-and-test.yml

@@ -223,10 +223,6 @@ jobs:
         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: Gen distributions
         run: |
           make gendistributions

.github/workflows/load-tests.yml

@@ -46,7 +46,7 @@ jobs:
       - name: Install Tools
         if: steps.go-cache.outputs.cache-hit != 'true'
         run: make install-tools
-      - run: make oteltestbedcol
+      - run: make otelcontribcol
       - name: Upload Testbed Binaries
         uses: actions/upload-artifact@v4
         with:

.github/workflows/scripts/release-prepare-release.sh

@@ -33,14 +33,11 @@ find . -name "*.bak" -type f -delete
 git add versions.yaml
 git commit -m "update version.yaml ${CANDIDATE_BETA}"
 
-sed -i.bak "s/v${CURRENT_BETA_ESCAPED}/v${CANDIDATE_BETA}/g" ./cmd/oteltestbedcol/builder-config.yaml
 sed -i.bak "s/v${CURRENT_BETA_ESCAPED}/v${CANDIDATE_BETA}/g" ./cmd/otelcontribcol/builder-config.yaml
 sed -i.bak "s/${CURRENT_BETA_ESCAPED}-dev/${CANDIDATE_BETA}-dev/g" ./cmd/otelcontribcol/builder-config.yaml
-sed -i.bak "s/${CURRENT_BETA_ESCAPED}-dev/${CANDIDATE_BETA}-dev/g" ./cmd/oteltestbedcol/builder-config.yaml
 
 find . -name "*.bak" -type f -delete
 make genotelcontribcol
-make genoteltestbedcol
 git add .
 git commit -m "builder config changes ${CANDIDATE_BETA}" || (echo "no builder config changes to commit")
 

.github/workflows/tidy-dependencies.yml

@@ -38,13 +38,13 @@ jobs:
       - name: Install Tools
         if: steps.go-cache.outputs.cache-hit != 'true'
         run: make install-tools
-      - name: go mod tidy, make genotelcontribcol and make genoteltestbedcol
+      - name: go mod tidy, make genotelcontribcol
         run: |
-          make gotidy && make genotelcontribcol && make genoteltestbedcol
+          make gotidy && make genotelcontribcol
           git config user.name opentelemetrybot
           git config user.email [email protected]
-          echo "git diff --exit-code || (git add . && git commit -m \"go mod tidy, make genotelcontribcol and make genoteltestbedcol\" && git push)"
-          git diff --exit-code || (git add . && git commit -m "go mod tidy, make genotelcontribcol and make genoteltestbedcol" && git push)
+          echo "git diff --exit-code || (git add . && git commit -m \"go mod tidy, make genotelcontribcol\" && git push)"
+          git diff --exit-code || (git add . && git commit -m "go mod tidy, make genotelcontribcol" && git push)
         env:
           GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
       - uses: actions-ecosystem/action-remove-labels@v1

.golangci.yml

@@ -20,7 +20,6 @@ run:
     - third_party
     - local
     - cmd/otelcontribcol
-    - cmd/oteltestbedcol
 
   # default is true. Enables skipping of directories:
   #   vendor$, third_party$, testdata$, examples$, Godeps$, builtin$

CONTRIBUTING.md

@@ -222,7 +222,6 @@ When submitting a component to the community, consider breaking it down into sep
     * `make crosslink`
     * `make gotidy`
     * `make genotelcontribcol`
-    * `make genoteltestbedcol`
     * `make generate`
     * `make multimod-verify`
     * `make generate-gh-issue-templates`

Makefile

@@ -93,7 +93,7 @@ all-common:
 	@$(MAKE) $(FOR_GROUP_TARGET) TARGET="common"
 
 .PHONY: e2e-test
-e2e-test: otelcontribcol oteltestbedcol
+e2e-test: otelcontribcol
 	$(MAKE) --no-print-directory -C testbed run-tests
 
 .PHONY: integration-test
@@ -344,22 +344,6 @@ otelcontribcollite:
 	cd ./cmd/otelcontribcol && GO111MODULE=on CGO_ENABLED=0 $(GOCMD) build -trimpath -o ../../bin/otelcontribcol_$(GOOS)_$(GOARCH)$(EXTENSION) \
 		-tags $(GO_BUILD_TAGS) -ldflags $(GO_BUILD_LDFLAGS) .
 
-.PHONY: genoteltestbedcol
-genoteltestbedcol: $(BUILDER)
-	$(BUILDER) --skip-compilation --config cmd/oteltestbedcol/builder-config.yaml --output-path cmd/oteltestbedcol
-	$(MAKE) --no-print-directory -C cmd/oteltestbedcol fmt
-
-# Build the Collector executable, with only components used in testbed.
-.PHONY: oteltestbedcol
-oteltestbedcol:
-	cd ./cmd/oteltestbedcol && GO111MODULE=on CGO_ENABLED=0 $(GOCMD) build -trimpath -o ../../bin/oteltestbedcol_$(GOOS)_$(GOARCH)$(EXTENSION) \
-		-tags $(GO_BUILD_TAGS) .
-
-.PHONY: oteltestbedcollite
-oteltestbedcollite:
-	cd ./cmd/oteltestbedcol && GO111MODULE=on CGO_ENABLED=0 $(GOCMD) build -trimpath -o ../../bin/oteltestbedcol_$(GOOS)_$(GOARCH)$(EXTENSION) \
-		-tags $(GO_BUILD_TAGS) -ldflags $(GO_BUILD_LDFLAGS) .
-
 # Build the telemetrygen executable.
 .PHONY: telemetrygen
 telemetrygen:
@@ -404,11 +388,8 @@ update-otel:$(MULTIMOD)
 	$(MULTIMOD) sync -s=true -o ../opentelemetry-collector -m beta --commit-hash $(OTEL_VERSION)
 	git add . && git commit -s -m "[chore] multimod update beta modules" ; \
 	$(MAKE) gotidy
-	$(call updatehelper,$(CORE_VERSIONS),$(GOMOD),./cmd/otelcontribcol/builder-config.yaml) 
-	$(call updatehelper,$(CORE_VERSIONS),$(GOMOD),./cmd/oteltestbedcol/builder-config.yaml)
+	$(call updatehelper,$(CORE_VERSIONS),$(GOMOD),./cmd/otelcontribcol/builder-config.yaml)
 	$(MAKE) genotelcontribcol
-	$(MAKE) genoteltestbedcol
-	$(MAKE) oteltestbedcol
 
 .PHONY: otel-from-tree
 otel-from-tree:
@@ -551,7 +532,6 @@ checks:
 	$(MAKE) crosslink
 	$(MAKE) -j4 gotidy
 	$(MAKE) genotelcontribcol
-	$(MAKE) genoteltestbedcol
 	$(MAKE) gendistributions
 	$(MAKE) -j4 generate
 	$(MAKE) multimod-verify