diff --git a/sysutils/alloy/Makefile b/sysutils/alloy/Makefile index 365ce5cb4ba7..c8e8fcbd8415 100644 --- a/sysutils/alloy/Makefile +++ b/sysutils/alloy/Makefile @@ -1,71 +1,71 @@ PORTNAME= alloy DISTVERSIONPREFIX= v -DISTVERSION= 1.13.1 +DISTVERSION= 1.16.1 CATEGORIES= sysutils MAINTAINER= zach.leslie@grafana.com COMMENT= OpenTelemetry Collector distribution with programmable pipelines WWW= https://github.com/grafana/alloy LICENSE= MIT # no_targets: we supply do-build/do-install for the collector submodule. USES= go:modules,no_targets USE_GITHUB= yes GH_ACCOUNT= grafana # Fetch go.mod from GitHub rather than GOPROXY so the framework does not # also download a GOPROXY zip, which would conflict with the GitHub tarball # WRKSRC. With GO_MOD_DIST=github, go.mk skips the GOPROXY zip and leaves # WRKSRC set correctly by USE_GITHUB. GO_MOD_DIST= github USE_RC_SUBR= ${PORTNAME} GO_MODULE= github.com/${GH_ACCOUNT}/${GH_PROJECT} GO_BUILDFLAGS= -ldflags='-X github.com/grafana/alloy/internal/build.Version=${GH_TAGNAME}' # The main go.mod has "replace ./syntax => ./syntax". go-post-fetch (800) # runs go mod download from DIST_SUBDIR and needs syntax/go.mod present. # post-fetch runs at priority 700, after do-fetch (500) downloads the tarball. post-fetch: @(cd ${DISTDIR}/${DIST_SUBDIR}; [ -e syntax/go.mod ] || (\ ${MKDIR} syntax; \ ${TAR} -xzf ${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}-${DISTVERSION}/syntax/go.mod; \ ${CP} ${PORTNAME}-${DISTVERSION}/syntax/go.mod syntax/go.mod)) # collector/ is a separate Go module with its own dependencies. Download # them at fetch time; extract has no network access in poudriere. _USES_fetch+= 900:alloy-fetch-collector-deps alloy-fetch-collector-deps: @${ECHO_MSG} "===> Fetching collector submodule dependencies"; \ td=$$(mktemp -d -t alloy_collector_deps); \ trap "rm -rf $$td" 0; \ ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} -C $$td; \ (cd $$td/${PORTNAME}-${DISTVERSION}/collector && \ ${SETENVI} ${WRK_ENV} GOPATH="${GO_GOPATH}" GO111MODULE=on GOFLAGS=-modcacherw GOSUMDB=sum.golang.org \ GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all); \ rm -rf $$td # After go-post-extract (800) vendors the main module, vendor collector/ # using the module cache populated above. _USES_extract+= 900:alloy-vendor-collector alloy-vendor-collector: @${ECHO_MSG} "===> Vendoring collector submodule"; \ (cd ${WRKSRC}/collector && \ ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} \ ${GO_CMD} mod vendor -e) # The alloy binary lives in collector/, a separate Go module. do-build: (cd ${WRKSRC}/collector; \ ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOMAXPROCS=${MAKE_JOBS_NUMBER} GOPROXY=off \ ${GO_CMD} build ${GO_BUILDFLAGS} -mod=vendor -o ${GO_WRKDIR_BIN}/alloy .) do-install: ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/alloy ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/example-config.alloy ${STAGEDIR}${PREFIX}/etc/alloy.flow.sample ${MKDIR} ${STAGEDIR}/var/${PORTNAME} .include diff --git a/sysutils/alloy/distinfo b/sysutils/alloy/distinfo index a107e3c4254d..5dfd0a798b07 100644 --- a/sysutils/alloy/distinfo +++ b/sysutils/alloy/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1771875883 -SHA256 (go/sysutils_alloy/grafana-alloy-v1.13.1_GH0/go.mod) = 2664a5fe70d0ccd10783f47038738ced9007fc5f04f2f3252c44a47030218681 -SIZE (go/sysutils_alloy/grafana-alloy-v1.13.1_GH0/go.mod) = 66864 -SHA256 (go/sysutils_alloy/grafana-alloy-v1.13.1_GH0/grafana-alloy-v1.13.1_GH0.tar.gz) = 46bad79b5ba502d93c57b4dfe59aadc362cda173290760d8da33080552f53d9a -SIZE (go/sysutils_alloy/grafana-alloy-v1.13.1_GH0/grafana-alloy-v1.13.1_GH0.tar.gz) = 18140497 +TIMESTAMP = 1779533038 +SHA256 (go/sysutils_alloy/grafana-alloy-v1.16.1_GH0/go.mod) = 7c5256ece8c4e40370d446517210963a20c5c7a6590638b2ea9be8f2fb34063d +SIZE (go/sysutils_alloy/grafana-alloy-v1.16.1_GH0/go.mod) = 74711 +SHA256 (go/sysutils_alloy/grafana-alloy-v1.16.1_GH0/grafana-alloy-v1.16.1_GH0.tar.gz) = a10d194733ea3eafde769dd0b9d17bf30603ce2f27d160611aaedba0186f364d +SIZE (go/sysutils_alloy/grafana-alloy-v1.16.1_GH0/grafana-alloy-v1.16.1_GH0.tar.gz) = 18305028