Merge branch 'main' into renovate/github.jparrowsec.cn-clickhouse-clickhouse-go…

…-v2-2.x

.chloggen/docker-resource-failure.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: processor/resourcedetection
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Introduce retry logic for failed resource detection."
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [34761]
+
+# (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 @@
 
 # Start components list
 
-cmd/githubgen/                                                   @open-telemetry/collector-contrib-approvers @atoulme
 cmd/opampsupervisor/                                             @open-telemetry/collector-contrib-approvers @evan-bradley @atoulme @tigrannajaryan
 cmd/otelcontribcol/                                              @open-telemetry/collector-contrib-approvers
 cmd/oteltestbedcol/                                              @open-telemetry/collector-contrib-approvers

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -18,7 +18,6 @@ body:
       # NOTE: The list below is autogenerated using `make generate-gh-issue-templates`
       # Do not manually edit it.
       # Start components list
-      - cmd/githubgen
       - cmd/opampsupervisor
       - cmd/otelcontribcol
       - cmd/oteltestbedcol

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -12,7 +12,6 @@ body:
       # NOTE: The list below is autogenerated using `make generate-gh-issue-templates`
       # Do not manually edit it.
       # Start components list
-      - cmd/githubgen
       - cmd/opampsupervisor
       - cmd/otelcontribcol
       - cmd/oteltestbedcol

.github/ISSUE_TEMPLATE/other.yaml

@@ -12,7 +12,6 @@ body:
       # NOTE: The list below is autogenerated using `make generate-gh-issue-templates`
       # Do not manually edit it.
       # Start components list
-      - cmd/githubgen
       - cmd/opampsupervisor
       - cmd/otelcontribcol
       - cmd/oteltestbedcol

.github/ISSUE_TEMPLATE/unmaintained.yaml

@@ -17,7 +17,6 @@ body:
       # NOTE: The list below is autogenerated using `make generate-gh-issue-templates`
       # Do not manually edit it.
       # Start components list
-      - cmd/githubgen
       - cmd/opampsupervisor
       - cmd/otelcontribcol
       - cmd/oteltestbedcol

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

@@ -42,7 +42,6 @@ jobs:
           - internal
           - pkg
           - cmd-0
-          - cmd-1
           - other
     timeout-minutes: 30
     runs-on: ubuntu-22.04-arm

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

@@ -43,7 +43,6 @@ jobs:
           - internal
           - pkg
           - cmd-0
-          - cmd-1
           - other
         os: [windows-2022, windows-2025]
     runs-on: ${{ matrix.os }}

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

@@ -75,7 +75,6 @@ jobs:
           - internal
           - pkg
           - cmd-0
-          - cmd-1
           - other
     runs-on: ubuntu-24.04
     needs: [setup-environment]
@@ -144,7 +143,6 @@ jobs:
           - internal
           - pkg
           - cmd-0
-          - cmd-1
     runs-on: ubuntu-24.04
     timeout-minutes: 30
     steps:
@@ -257,7 +255,6 @@ jobs:
           - internal
           - pkg
           - cmd-0
-          - cmd-1
           - other
     runs-on: ${{ matrix.runner }}
     needs: [setup-environment]
@@ -355,7 +352,6 @@ jobs:
           - internal
           - pkg
           - cmd-0
-          - cmd-1
     runs-on: ubuntu-24.04
     needs: [setup-environment]
     steps:

Makefile

@@ -42,8 +42,7 @@ EXTENSION_MODS := $(shell find ./extension/* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR
 CONNECTOR_MODS := $(shell find ./connector/* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
 INTERNAL_MODS := $(shell find ./internal/* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
 PKG_MODS := $(shell find ./pkg/* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
-CMD_MODS_0 := $(shell find ./cmd/[a-m]* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
-CMD_MODS_1 := $(shell find ./cmd/[n-z]* $(FIND_MOD_ARGS) -not -path "./cmd/otel*col/*" -exec $(TO_MOD_DIR) )
+CMD_MODS_0 := $(shell find ./cmd/[a-z]* $(FIND_MOD_ARGS) -not -path "./cmd/otel*col/*" -exec $(TO_MOD_DIR) )
 CMD_MODS := $(CMD_MODS_0) $(CMD_MODS_1)
 OTHER_MODS := $(shell find . $(EX_COMPONENTS) $(EX_INTERNAL) $(EX_PKG) $(EX_CMD) $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) ) $(ROOT_DIR)
 ALL_MODS := $(RECEIVER_MODS) $(PROCESSOR_MODS) $(EXPORTER_MODS) $(EXTENSION_MODS) $(CONNECTOR_MODS) $(INTERNAL_MODS) $(PKG_MODS) $(CMD_MODS) $(OTHER_MODS)
@@ -84,7 +83,6 @@ all-groups:
 	@echo -e "\ninternal: $(INTERNAL_MODS)"
 	@echo -e "\npkg: $(PKG_MODS)"
 	@echo -e "\ncmd-0: $(CMD_MODS_0)"
-	@echo -e "\ncmd-1: $(CMD_MODS_1)"
 	@echo -e "\ncmd: $(CMD_MODS)"
 	@echo -e "\nother: $(OTHER_MODS)"
 	@echo -e "\nintegration: $(INTEGRATION_MODS)"
@@ -154,7 +152,7 @@ gotest:
 gotest-with-cover:
 	@$(MAKE) $(FOR_GROUP_TARGET) TARGET="test-with-cover"
 	$(GOCMD) tool covdata textfmt -i=./coverage/unit -o ./$(GROUP)-coverage.txt
-	
+
 .PHONY: gotest-with-junit
 gotest-with-junit:
 	@$(MAKE) for-all-target TARGET="test-with-junit"
@@ -293,9 +291,6 @@ for-cmd-target: $(CMD_MODS)
 .PHONY: for-cmd-0-target
 for-cmd-0-target: $(CMD_MODS_0)
 
-.PHONY: for-cmd-1-target
-for-cmd-1-target: $(CMD_MODS_1)
-
 .PHONY: for-other-target
 for-other-target: $(OTHER_MODS)
 

cmd/githubgen/README.md

@@ -1,35 +1,3 @@
 ⚠️ This executable has moved to [opentelemetry-go-build-tools](https://github.com/open-telemetry/opentelemetry-go-build-tools/tree/main/githubgen).
 
-This code is deprecated and will be removed soon. See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/37294.
-
-# githubgen
-
-This executable is used to generate the `.github/CODEOWNERS` and `.github/ALLOWLIST` files.
-
-It reads status metadata from `metadata.yaml` files located throughout the repository.
-
-It checks that codeowners are known members of the OpenTelemetry organization.
-
-## Usage
-
-```
-$> make gengithub
-```
-The equivalent of:
-```
-$> cd cmd/githubgen && $(GOCMD) install .
-$> GITHUB_TOKEN=<mypattoken> githubgen --folder . [--allowlist cmd/githubgen/allowlist.txt] 
-```
-
-## Checking codeowners against OpenTelemetry membership via Github API
-
-To authenticate, set the environment variable `GITHUB_TOKEN` to a PAT token.  If a PAT is not available you can use the `--skipgithub` flag to avoid checking for membership in the GitHub organization.
-
-For each codeowner, the script will check if the user is registered as a member of the OpenTelemetry organization.
-
-If any codeowner is missing, it will stop and print names of missing codeowners.
-
-These can be added to allowlist.txt as a workaround.
-
-If a codeowner is present in allowlist.txt and also a member of the OpenTelemetry organization, the script will error out.
-
+See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/37294.