Skip to content

Commit

Permalink
Ignore k8sclusterreceiver for update-deps (open-telemetry#1525)
Browse files Browse the repository at this point in the history
* Ignore k8sclusterreceiver for update-deps

* Ensure all deps are updated

* go mod tidy
jeffreyc-splunk authored May 2, 2022
1 parent 8be6e1f commit fbe8bb5
Showing 3 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.50.1-0.20220429023127-719d5ccfbea9
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.50.1-0.20220429023127-719d5ccfbea9 // ignore-update-deps
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.50.0
3 changes: 0 additions & 3 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1677,8 +1677,6 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceive
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.50.0/go.mod h1:9xOsxeCXmt3gnUr9Ixk7Z3KQNY7/niFFQjotCXRi1Q8=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.50.0 h1:6wTpYrxjq5tU6Mk64OOM4dTuNwnFZaBMYmj5wAcwRgA=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.50.0/go.mod h1:B/OsoU5N0AV4Xj3lTaXao7lkw0HwoFvlE06h/nS3Gj0=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.50.0 h1:5rsVhs0Jocui6bTRq+sgXcrOMmTcSpiUSu76Q+mE9iU=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.50.0/go.mod h1:lPR5UDDN2/yGa+G84b4eqUshMZhmW4K4TVCYaugfKps=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.50.1-0.20220429023127-719d5ccfbea9 h1:qPD+HvUo2FZSXMc81ErhLo9WPOrno0o3ppS48AjGM3k=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.50.1-0.20220429023127-719d5ccfbea9/go.mod h1:VK6ivccBN2C/ew+JyUW+vVSUOHmOXN9ANpPNAeAM880=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.50.0 h1:j/yNbUMz8+UW8fahx91gs3Yh0I0vnvzXpeneLkQlnpY=
@@ -2693,7 +2691,6 @@ golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220222172238-00053529121e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 h1:eJv7u3ksNXoLbGSKuv2s/SIO4tJVxc/A+MTpzxDgz/Q=
golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10 changes: 8 additions & 2 deletions internal/buildscripts/update-deps
Original file line number Diff line number Diff line change
@@ -26,8 +26,6 @@ for gomod in $( find "$REPO_DIR" -name "go.mod" | grep -v "/examples/" | sort );
go mod tidy
done

IFS=$OFS

if grep -q 'go.opentelemetry.io/collector ' "$gomod"; then
go get go.opentelemetry.io/collector@${CORE_VERSION}
fi
@@ -36,6 +34,14 @@ for gomod in $( find "$REPO_DIR" -name "go.mod" | grep -v "/examples/" | sort );
go get go.opentelemetry.io/collector/model@${CORE_VERSION}
fi

lines="$( (grep 'github.com/open-telemetry/opentelemetry-collector-contrib/' "$gomod" | grep -v 'ignore-update-deps' | grep -v '^[[:space:]]*//' | grep -v '=>' | grep -v ' // indirect' | sort -u) || true )"
for line in $lines; do
pkg="$( echo "$line" | awk '{print $1}' )"
go get ${pkg}@${CONTRIB_VERSION}
done

IFS=$OFS

go mod tidy

popd >/dev/null

0 comments on commit fbe8bb5

Please sign in to comment.