On Thu Oct 02, 2025 at 01:25:56AM +0000, Lucas Raab wrote:
> Hello,
> 
> Here's an update for alloy up to 1.11.0 which seems to be running fine. This
> also allows dropping the prior patches since those have now been upstreamed.
> 
> Other thoughts or looks good?

OK rsadowski, thanks

> 
> Thanks,
> Lucas

> diff refs/heads/master refs/heads/alloy
> commit - e58099c313550089a8c4f5391be352c6c78729a2
> commit + 6375fc6ae32636776fb9b266e2e04826502375f7
> blob - f2a0426eadaca9ae24950b6f7d1cb01e4f87910e
> blob + 3919981ad9300ef0e161cf2b215719ab230de599
> --- sysutils/alloy/Makefile
> +++ sysutils/alloy/Makefile
> @@ -3,7 +3,7 @@ COMMENT =	OpenTelemetry Collector for metrics and logs
>  # github.com/grafana/alloy uses too much ram to build on 32-bit
>  ONLY_FOR_ARCHS = aarch64 amd64 riscv64
>  
> -V =		1.10.0
> +V =		1.11.0
>  DISTNAME =	alloy+vendor-${V}
>  WRKDIST =	${WRKDIR}/alloy-${V}
>  EXTRACT_SUFX =	.tar.zst
> blob - b6f40b0e2d88c1fd2ee9b5840bb4dd7091c2f321
> blob + 8c5a81bffc3eff03c4f4a7d41221387f3af5d867
> --- sysutils/alloy/distinfo
> +++ sysutils/alloy/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (alloy+vendor-1.10.0.tar.zst) = fOX4iVj3dCNKUG15HSvRCo4GldLb/H/rNK7XieqcN/E=
> -SIZE (alloy+vendor-1.10.0.tar.zst) = 86903998
> +SHA256 (alloy+vendor-1.11.0.tar.zst) = BfZsg3y2gMTaUZ/+bGYzFLbojShngErl6vdbyqlIcIg=
> +SIZE (alloy+vendor-1.11.0.tar.zst) = 93326795
> blob - 212ad9194b9fdbcf6aaf647ddc2a8d039109d30b (mode 644)
> blob + /dev/null
> --- sysutils/alloy/patches/patch-internal_component_otelcol_exporter_datadog_config_config_datadog_go
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -Index: internal/component/otelcol/exporter/datadog/config/config_datadog.go
> ---- internal/component/otelcol/exporter/datadog/config/config_datadog.go.orig
> -+++ internal/component/otelcol/exporter/datadog/config/config_datadog.go
> -@@ -1,4 +1,4 @@
> --//go:build !freebsd
> -+//go:build !freebsd && !openbsd
> - 
> - package datadog_config
> - 
> blob - 54a915abbbca4a652b12f98c9bcd86f1fb0f587a (mode 644)
> blob + /dev/null
> --- sysutils/alloy/patches/patch-internal_component_otelcol_exporter_datadog_config_config_datadog_stub_go
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -Index: internal/component/otelcol/exporter/datadog/config/config_datadog_stub.go
> ---- internal/component/otelcol/exporter/datadog/config/config_datadog_stub.go.orig
> -+++ internal/component/otelcol/exporter/datadog/config/config_datadog_stub.go
> -@@ -1,3 +1,3 @@
> --//go:build freebsd
> -+//go:build freebsd || openbsd
> - 
> - package datadog_config
> blob - 6f62942f3b757fd59640a54aec017c70894aa71c (mode 644)
> blob + /dev/null
> --- sysutils/alloy/patches/patch-internal_component_otelcol_exporter_datadog_config_config_datadog_test_go
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -Index: internal/component/otelcol/exporter/datadog/config/config_datadog_test.go
> ---- internal/component/otelcol/exporter/datadog/config/config_datadog_test.go.orig
> -+++ internal/component/otelcol/exporter/datadog/config/config_datadog_test.go
> -@@ -1,4 +1,4 @@
> --//go:build !freebsd
> -+//go:build !freebsd && !openbsd
> - 
> - package datadog_config_test
> - 
> blob - f324dcda407414ca7638eb5c1603593b470321e0 (mode 644)
> blob + /dev/null
> --- sysutils/alloy/patches/patch-internal_component_otelcol_exporter_datadog_datadog_go
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -Index: internal/component/otelcol/exporter/datadog/datadog.go
> ---- internal/component/otelcol/exporter/datadog/datadog.go.orig
> -+++ internal/component/otelcol/exporter/datadog/datadog.go
> -@@ -2,7 +2,7 @@
> - // Maintainers for the Grafana Alloy wrapper:
> - //	- @polyrain
> - 
> --//go:build !freebsd
> -+//go:build !freebsd && !openbsd
> - 
> - package datadog
> - 
> blob - ded69bd285be86649f5a12dab515a9f3c9f782e7 (mode 644)
> blob + /dev/null
> --- sysutils/alloy/patches/patch-internal_component_otelcol_exporter_datadog_datadog_stub_go
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -Index: internal/component/otelcol/exporter/datadog/datadog_stub.go
> ---- internal/component/otelcol/exporter/datadog/datadog_stub.go.orig
> -+++ internal/component/otelcol/exporter/datadog/datadog_stub.go
> -@@ -1,4 +1,4 @@
> --//go:build freebsd
> -+//go:build freebsd || openbsd
> - 
> - package datadog
> - 
> blob - 4d5a51fa995b4a116e248e6c35e132671cabef2f (mode 644)
> blob + /dev/null
> --- sysutils/alloy/patches/patch-internal_component_otelcol_exporter_datadog_datadog_test_go
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -Index: internal/component/otelcol/exporter/datadog/datadog_test.go
> ---- internal/component/otelcol/exporter/datadog/datadog_test.go.orig
> -+++ internal/component/otelcol/exporter/datadog/datadog_test.go
> -@@ -1,4 +1,4 @@
> --//go:build !freebsd
> -+//go:build !freebsd && !openbsd
> - 
> - package datadog_test
> - 
> blob - f01c83a8c026a4673523d066aa165b71b15eb739 (mode 644)
> blob + /dev/null
> --- sysutils/alloy/patches/patch-internal_converter_internal_otelcolconvert_converter_datadogexporter_go
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -Index: internal/converter/internal/otelcolconvert/converter_datadogexporter.go
> ---- internal/converter/internal/otelcolconvert/converter_datadogexporter.go.orig
> -+++ internal/converter/internal/otelcolconvert/converter_datadogexporter.go
> -@@ -1,4 +1,4 @@
> --//go:build !freebsd
> -+//go:build !freebsd && !openbsd
> - 
> - package otelcolconvert
> - 
> blob - 4e3b598721647ad75209534403d274ea00be0b8a (mode 644)
> blob + /dev/null
> --- sysutils/alloy/patches/patch-internal_converter_internal_otelcolconvert_otelcolconvert_test_go
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -Index: internal/converter/internal/otelcolconvert/otelcolconvert_test.go
> ---- internal/converter/internal/otelcolconvert/otelcolconvert_test.go.orig
> -+++ internal/converter/internal/otelcolconvert/otelcolconvert_test.go
> -@@ -1,4 +1,4 @@
> --//go:build !freebsd
> -+//go:build !freebsd && !openbsd
> - 
> - package otelcolconvert_test
> - 
> blob - 31c90fa8190633e44e482ef9b6c3f2715c4c6b2d
> blob + 3c7b0cebcbbb713852454861675cca2525d60eb5
> --- sysutils/alloy/pkg/PLIST
> +++ sysutils/alloy/pkg/PLIST
> @@ -10,6 +10,7 @@
>  @mode
>  @owner
>  @group
> +share/doc/pkg-readmes/${PKGSTEM}
>  share/examples/alloy/
>  @mode 0640
>  @group _loki