Merge branch 'main' into 15010

Author: iblancasa

.github/workflows/api-compatibility.yml

@@ -56,17 +56,15 @@ jobs:
       # Compare apidiff states of Main with PR
       - name: Compare-States
         env:
-          CI: true
-          COMPARE_OPTS: -d "../${{ github.base_ref }}/internal/data/apidiff"
+          APIDIFF_DATA_DIR: "../${{ github.base_ref }}/internal/data/apidiff"
         run: |
           cd $HEAD_REF
           make apidiff-compare
 
       # Fail GitHub Action if there are incompatible changes
       - name: Check-States
         env:
-          CI: true
-          COMPARE_OPTS: -d "../${{ github.base_ref }}/internal/data/apidiff" -c
+          APIDIFF_DATA_DIR: "../${{ github.base_ref }}/internal/data/apidiff"
         run: |
           cd $HEAD_REF
-          make apidiff-compare
+          make apidiff-check

.github/workflows/utils/cspell.json

@@ -288,6 +288,7 @@
       "incorrectclass",
       "incorrectcomponent",
       "incorrectstability",
+      "inotify",
       "instrgen",
       "internaldata",
       "ints",

Makefile

@@ -270,22 +270,26 @@ checkapi:
 checkdoc:
 	$(GO_TOOL) checkfile --project-path $(CURDIR) --component-rel-path $(COMP_REL_PATH) --module-name $(MOD_NAME) --file-name "README.md"
 
+# Extract the relative path of every module listed between "stable:" and "beta:" in versions.yaml
+STABLE_MODULES := $(shell sed -n -e '/stable:/,/beta:/ s/.*- go.opentelemetry.io\/collector/./p' versions.yaml)
+
+.PHONY: for-all-stable-target
+for-all-stable-target: $(STABLE_MODULES)
+
 # Construct new API state snapshots
 .PHONY: apidiff-build
 apidiff-build:
-	@$(foreach pkg,$(ALL_PKGS),$(call exec-command,./internal/buildscripts/gen-apidiff.sh -p $(pkg)))
-
-# If we are running in CI, change input directory
-ifeq ($(CI), true)
-APICOMPARE_OPTS=$(COMPARE_OPTS)
-else
-APICOMPARE_OPTS=-d "./internal/data/apidiff"
-endif
+	@$(MAKE) --silent for-all-stable-target TARGET="apidiff-build-mod"
 
-# Compare API state snapshots
+# Compare API state snapshots and log differences
 .PHONY: apidiff-compare
 apidiff-compare:
-	@$(foreach pkg,$(ALL_PKGS),$(call exec-command,./internal/buildscripts/compare-apidiff.sh -p $(pkg)))
+	@$(MAKE) --silent for-all-stable-target TARGET="apidiff-compare-mod"
+
+# Compare API state snapshots and fail if there are differences
+.PHONY: apidiff-check
+apidiff-check:
+	@$(MAKE) --silent for-all-stable-target TARGET="apidiff-check-mod"
 
 .PHONY: multimod-verify
 multimod-verify:

Makefile.Common

@@ -110,3 +110,24 @@ FLAGS ?= '-o=$(CURDIR)/'
 schemagen:
 	@echo "Running schemagen with filepath='$(SRC)' and flags='$(FLAGS)'"
 	cd $(SRC_ROOT)/cmd/schemagen && go run . $(FLAGS) $(SRC)
+
+EXTERNAL_PKGS := $(shell go list ./... | grep -v -E '/internal($|/)')
+APIDIFF_DATA_DIR ?= internal/data/apidiff
+
+.PHONY: apidiff-build-mod
+apidiff-build-mod:
+	@for pkg in $(EXTERNAL_PKGS); do \
+		$(SRC_ROOT)/internal/buildscripts/gen-apidiff.sh -p $$pkg -o $(SRC_ROOT)/$(APIDIFF_DATA_DIR) || exit 1; \
+	done
+
+.PHONY: apidiff-compare-mod
+apidiff-compare-mod:
+	@for pkg in $(EXTERNAL_PKGS); do \
+		$(SRC_ROOT)/internal/buildscripts/compare-apidiff.sh -p $$pkg -d $(SRC_ROOT)/$(APIDIFF_DATA_DIR) || exit 1; \
+	done
+
+.PHONY: apidiff-check-mod
+apidiff-check-mod:
+	@for pkg in $(EXTERNAL_PKGS); do \
+		$(SRC_ROOT)/internal/buildscripts/compare-apidiff.sh -p $$pkg -d $(SRC_ROOT)/$(APIDIFF_DATA_DIR) -c || exit 1; \
+	done

cmd/mdatagen/go.mod

@@ -12,7 +12,6 @@ require (
 	go.opentelemetry.io/collector/config/configoptional v1.63.0
 	go.opentelemetry.io/collector/confmap v1.63.0
 	go.opentelemetry.io/collector/confmap/provider/fileprovider v1.63.0
-	go.opentelemetry.io/collector/confmap/xconfmap v0.157.0
 	go.opentelemetry.io/collector/connector v0.157.0
 	go.opentelemetry.io/collector/connector/connectortest v0.157.0
 	go.opentelemetry.io/collector/connector/xconnector v0.157.0
@@ -84,7 +83,7 @@ require (
 	golang.org/x/sys v0.47.0 // indirect
 	golang.org/x/tools v0.48.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect
-	google.golang.org/grpc v1.82.0 // indirect
+	google.golang.org/grpc v1.82.1 // indirect
 	google.golang.org/protobuf v1.36.11 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )