Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[chore] separate core modules from places that use them #17078

Merged
merged 4 commits into from
Dec 19, 2022
Merged

[chore] separate core modules from places that use them #17078

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
121209d
[chore] separate core modules from places that use them
Dec 16, 2022
a884d08
fix missed dep updates
Dec 19, 2022
938fb3c
Update internal/buildscripts/update-dep
Dec 19, 2022
3998834
separate modules in 3 groups: stable, rc, beta
Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[chore] separate core modules from places that use them 
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 <[email protected]>
  • Loading branch information
Alex Boten committed Dec 19, 2022
commit 121209d431a4cbfd1aa4bd1816b4c5437649dc3d
11 changes: 6 additions & 5 deletions .github/workflows/scripts/check-collector-module-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -80,8 +83,6 @@ 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"
for mod in ${modules[@]}; do
check_collector_versions_correct "$mod" "$COLLECTOR_MOD_VERSION"
done
2 changes: 1 addition & 1 deletion Makefile.Common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,5 +155,5 @@ moddownload:

.PHONY: updatedep
updatedep:
$(PWD)/internal/buildscripts/update-dep
TOPDIR=$(PWD) $(PWD)/internal/buildscripts/update-dep
codeboten marked this conversation as resolved.
Show resolved Hide resolved
@$(MAKE) tidy
18 changes: 18 additions & 0 deletions internal/buildscripts/modules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/bash

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"
"go.opentelemetry.io/collector/pdata"
)
20 changes: 4 additions & 16 deletions internal/buildscripts/update-dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,16 @@

# Updates MODULE inside go.mod if it is already present to version VERSION.

source $TOPDIR/internal/buildscripts/modules

echo $modules

codeboten marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down