[chore] separate core modules from places that use them (open-telemet…

…ry#17078) There are at least 2 places (updatedep and check-collector-modules) that need the list of all the core modules. This is tedious to update in multiple places. Moving that into its own file, that can be included in other places. Signed-off-by: Alex Boten <aboten@lightstep.com> Co-authored-by: Pablo Baeyens <pbaeyens31+github@gmail.com>
mcube8 · Dec 19, 2022 · 4ef56a6 · 4ef56a6
1 parent 47db6ba
commit 4ef56a6
Show file tree

Hide file tree

Showing 39 changed files with 116 additions and 83 deletions.
diff --git a/.github/workflows/scripts/check-collector-module-version.sh b/.github/workflows/scripts/check-collector-module-version.sh
@@ -18,6 +18,9 @@
 # verifies if the collector components are using the main core collector version
 # as a dependency.
 #
+
+source ./internal/buildscripts/modules
+
 set -eu -o pipefail
 
 # Return the collector main core version
@@ -69,19 +72,29 @@ check_collector_versions_correct() {
    fi
 }
 
+MAIN_MOD_FILE="./go.mod"
+
 # Note space at end of string. This is so it filters for the exact string
 # only and does not return string which contains this string as a substring.
-COLLECTOR_MODULE="go.opentelemetry.io/collector "
-PDATA_MODULE="go.opentelemetry.io/collector/pdata "
+BETA_MODULE="go.opentelemetry.io/collector "
+BETA_MOD_VERSION=$(get_collector_version "$BETA_MODULE" "$MAIN_MOD_FILE")
+check_collector_versions_correct "$BETA_MODULE" "$BETA_MOD_VERSION"
+for mod in ${beta_modules[@]}; do
+   check_collector_versions_correct "$mod" "$BETA_MOD_VERSION"
+done
 
-MAIN_MOD_FILE="./go.mod"
-COLLECTOR_MOD_VERSION=$(get_collector_version "$COLLECTOR_MODULE" "$MAIN_MOD_FILE")
-PDATA_MOD_VERSION=$(get_collector_version "$PDATA_MODULE" "$MAIN_MOD_FILE")
-
-# Check the collector module version in each of the module files
-check_collector_versions_correct "$COLLECTOR_MODULE" "$COLLECTOR_MOD_VERSION"
-check_collector_versions_correct "go.opentelemetry.io/collector/component" "$COLLECTOR_MOD_VERSION"
-check_collector_versions_correct "go.opentelemetry.io/collector/consumer" "$COLLECTOR_MOD_VERSION"
-check_collector_versions_correct "go.opentelemetry.io/collector/featuregate" "$COLLECTOR_MOD_VERSION"
-check_collector_versions_correct "go.opentelemetry.io/collector/pdata" "$PDATA_MOD_VERSION"
-check_collector_versions_correct "go.opentelemetry.io/collector/semconv" "$COLLECTOR_MOD_VERSION"
+# Check RC modules
+RC_MODULE="go.opentelemetry.io/collector/pdata "
+RC_MOD_VERSION=$(get_collector_version "$RC_MODULE" "$MAIN_MOD_FILE")
+check_collector_versions_correct "$RC_MODULE" "$RC_MOD_VERSION"
+for mod in ${rc_modules[@]}; do
+   check_collector_versions_correct "$mod" "$RC_MOD_VERSION"
+done
+
+# Check stable modules, none currently exist, uncomment when pdata is 1.0.0
+# STABLE_MODULE="go.opentelemetry.io/collector/pdata "
+# STABLE_MOD_VERSION=$(get_collector_version "$STABLE_MODULE" "$MAIN_MOD_FILE")
+# check_collector_versions_correct "$STABLE_MODULE" "$STABLE_MOD_VERSION"
+# for mod in ${stable_modules[@]}; do
+#    check_collector_versions_correct "$mod" "$STABLE_MOD_VERSION"
+# done
diff --git a/Makefile.Common b/Makefile.Common
@@ -155,5 +155,5 @@ moddownload:
 
 .PHONY: updatedep
 updatedep:
-	$(PWD)/internal/buildscripts/update-dep
+	TOPDIR=$(PWD) $(PWD)/internal/buildscripts/update-dep
 	@$(MAKE) tidy
diff --git a/exporter/googlemanagedprometheusexporter/go.mod b/exporter/googlemanagedprometheusexporter/go.mod
@@ -61,7 +61,7 @@ require (
 	github.com/tklauser/numcpus v0.6.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect
+	go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/collector/pdata v1.0.0-rc1.0.20221216200611-892d07dffbb8 // indirect

diff --git a/exporter/googlemanagedprometheusexporter/go.sum b/exporter/googlemanagedprometheusexporter/go.sum
diff --git a/exporter/parquetexporter/go.mod b/exporter/parquetexporter/go.mod
@@ -22,7 +22,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pelletier/go-toml v1.9.4 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect
+	go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/otel v1.11.2 // indirect

diff --git a/exporter/parquetexporter/go.sum b/exporter/parquetexporter/go.sum
diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod
@@ -35,7 +35,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rs/cors v1.8.2 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect
+	go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.37.0 // indirect
 	go.opentelemetry.io/otel v1.11.2 // indirect

diff --git a/exporter/sumologicexporter/go.sum b/exporter/sumologicexporter/go.sum
diff --git a/exporter/tanzuobservabilityexporter/go.mod b/exporter/tanzuobservabilityexporter/go.mod
@@ -61,7 +61,7 @@ require (
 	github.com/tklauser/numcpus v0.6.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect
+	go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.37.0 // indirect

diff --git a/exporter/tanzuobservabilityexporter/go.sum b/exporter/tanzuobservabilityexporter/go.sum
diff --git a/extension/oidcauthextension/go.mod b/extension/oidcauthextension/go.mod
@@ -26,7 +26,7 @@ require (
 	github.com/pelletier/go-toml v1.9.4 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/pquerna/cachecontrol v0.1.0 // indirect
-	go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect
+	go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/collector/pdata v1.0.0-rc1.0.20221216200611-892d07dffbb8 // indirect

diff --git a/extension/oidcauthextension/go.sum b/extension/oidcauthextension/go.sum
diff --git a/internal/aws/cwlogs/go.mod b/internal/aws/cwlogs/go.mod
@@ -27,7 +27,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
 	go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 // indirect
-	go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect
+	go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/collector/pdata v1.0.0-rc1.0.20221216200611-892d07dffbb8 // indirect

diff --git a/internal/aws/cwlogs/go.sum b/internal/aws/cwlogs/go.sum
diff --git a/internal/aws/ecsutil/go.mod b/internal/aws/ecsutil/go.mod
@@ -32,7 +32,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rogpeppe/go-internal v1.8.0 // indirect
 	github.com/rs/cors v1.8.2 // indirect
-	go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect
+	go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/collector/pdata v1.0.0-rc1.0.20221216200611-892d07dffbb8 // indirect

diff --git a/internal/aws/ecsutil/go.sum b/internal/aws/ecsutil/go.sum
diff --git a/internal/buildscripts/modules b/internal/buildscripts/modules
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+beta_modules=(
+  "go.opentelemetry.io/collector/component"
+  "go.opentelemetry.io/collector/confmap"
+  "go.opentelemetry.io/collector/consumer"
+  "go.opentelemetry.io/collector/exporter/loggingexporter"
+  "go.opentelemetry.io/collector/exporter/otlpexporter"
+  "go.opentelemetry.io/collector/exporter/otlphttpexporter"
+  "go.opentelemetry.io/collector/extension/ballastextension"
+  "go.opentelemetry.io/collector/extension/zpagesextension"
+  "go.opentelemetry.io/collector/featuregate"
+  "go.opentelemetry.io/collector/processor/batchprocessor"
+  "go.opentelemetry.io/collector/processor/memorylimiterprocessor"
+  "go.opentelemetry.io/collector/receiver/otlpreceiver"
+  "go.opentelemetry.io/collector/semconv"
+)
+
+rc_modules=(
+  "go.opentelemetry.io/collector/pdata"
+)
+
+# No stable modules currently exist, add pdata here once 1.0.0
+stable_modules=()
diff --git a/internal/buildscripts/update-dep b/internal/buildscripts/update-dep
@@ -2,31 +2,27 @@
 
 # Updates MODULE inside go.mod if it is already present to version VERSION.
 
+source $TOPDIR/internal/buildscripts/modules
+
 set -e
 
 if grep -q "$MODULE " go.mod; then
   go get "$MODULE"@"$VERSION"
 fi
 
-modules=(
-  "go.opentelemetry.io/collector/component"
-  "go.opentelemetry.io/collector/consumer"
-  "go.opentelemetry.io/collector/exporter/loggingexporter"
-  "go.opentelemetry.io/collector/exporter/otlpexporter"
-  "go.opentelemetry.io/collector/exporter/otlphttpexporter"
-  "go.opentelemetry.io/collector/extension/ballastextension"
-  "go.opentelemetry.io/collector/extension/zpagesextension"
-  "go.opentelemetry.io/collector/featuregate"
-  "go.opentelemetry.io/collector/processor/batchprocessor"
-  "go.opentelemetry.io/collector/processor/memorylimiterprocessor"
-  "go.opentelemetry.io/collector/receiver/otlpreceiver"
-  "go.opentelemetry.io/collector/semconv"
-  "go.opentelemetry.io/collector/pdata"
-)
-
 # If MODULE is "go.opentelemetry.io/collector" need to update additional $modules as well
 if [ "$MODULE" == "go.opentelemetry.io/collector" ]; then
-  for mod in ${modules[@]}; do
+  for mod in ${beta_modules[@]}; do
+    if grep -q "$mod " go.mod; then
+      go get -d "$mod"@"$VERSION"
+    fi
+  done
+  for mod in ${rc_modules[@]}; do
+    if grep -q "$mod " go.mod; then
+      go get -d "$mod"@"$VERSION"
+    fi
+  done
+  for mod in ${stable_modules[@]}; do
     if grep -q "$mod " go.mod; then
       go get -d "$mod"@"$VERSION"
     fi

diff --git a/internal/sharedcomponent/go.mod b/internal/sharedcomponent/go.mod
@@ -23,7 +23,7 @@ require (
 	github.com/pelletier/go-toml v1.9.4 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 // indirect
-	go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect
+	go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect
 	go.opentelemetry.io/collector/pdata v1.0.0-rc1.0.20221216200611-892d07dffbb8 // indirect