diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c0991ab9bfb..b17fcdc0654 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing. cache: false - run: make generate-ui - - run: GO_TAGS="builtinassets promtail_journal_enabled" GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} GOARM= make alloy + - run: GO_TAGS="embedalloyui promtail_journal_enabled" GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} GOARM= make alloy build_linux_boringcrypto: name: Build on Linux (boringcrypto) @@ -64,7 +64,7 @@ jobs: # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing. cache: false - run: make generate-ui - - run: GO_TAGS="builtinassets promtail_journal_enabled" GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} GOARM= GOEXPERIMENT=boringcrypto make alloy + - run: GO_TAGS="embedalloyui promtail_journal_enabled" GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} GOARM= GOEXPERIMENT=boringcrypto make alloy build_mac_intel: name: Build on MacOS (Intel) @@ -81,7 +81,7 @@ jobs: # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing. cache: false - run: make generate-ui - - run: GO_TAGS="builtinassets" GOOS=darwin GOARCH=amd64 GOARM= make alloy + - run: GO_TAGS="embedalloyui" GOOS=darwin GOARCH=amd64 GOARM= make alloy build_mac_arm: name: Build on MacOS (ARM) @@ -98,7 +98,7 @@ jobs: # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing. cache: false - run: make generate-ui - - run: CGO_LDFLAGS="-ld_classic $CGO_LDFLAGS" GO_TAGS="builtinassets" GOOS=darwin GOARCH=arm64 GOARM= make alloy + - run: CGO_LDFLAGS="-ld_classic $CGO_LDFLAGS" GO_TAGS="embedalloyui" GOOS=darwin GOARCH=arm64 GOARM= make alloy build_windows: name: Build on Windows (AMD64) @@ -115,7 +115,7 @@ jobs: # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing. cache: false - run: make generate-ui - - run: echo "GO_TAGS=builtinassets" | Out-File -FilePath $env:GITHUB_ENV -Append + - run: echo "GO_TAGS=embedalloyui" | Out-File -FilePath $env:GITHUB_ENV -Append - run: echo "GOOS=windows" | Out-File -FilePath $env:GITHUB_ENV -Append - run: echo "GOARCH=amd64" | Out-File -FilePath $env:GITHUB_ENV -Append - run: make alloy @@ -141,4 +141,4 @@ jobs: # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing. cache: false - run: make generate-ui - - run: GO_TAGS="builtinassets" GOOS=freebsd GOARCH=amd64 GOARM= make alloy + - run: GO_TAGS="embedalloyui" GOOS=freebsd GOARCH=amd64 GOARM= make alloy diff --git a/Dockerfile b/Dockerfile index 387b46da70c..602a0037ef0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg/mod \ GOOS="$TARGETOS" GOARCH="$TARGETARCH" GOARM=${TARGETVARIANT#v} \ RELEASE_BUILD=${RELEASE_BUILD} VERSION=${VERSION} \ - GO_TAGS="netgo builtinassets promtail_journal_enabled" \ + GO_TAGS="netgo embedalloyui promtail_journal_enabled" \ GOEXPERIMENT=${GOEXPERIMENT} \ make alloy diff --git a/Dockerfile.windows b/Dockerfile.windows index 4993bc66a58..2e029b3ba4e 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -77,7 +77,7 @@ SHELL ["cmd", "/S", "/C"] # we can before moving on to the next step. RUN ""C:\Program Files\git\bin\bash.exe" -c "RELEASE_BUILD=${RELEASE_BUILD} VERSION=${VERSION} make generate-ui && rm -rf internal/web/ui/node_modules"" -RUN ""C:\Program Files\git\bin\bash.exe" -c "RELEASE_BUILD=${RELEASE_BUILD} VERSION=${VERSION} GO_TAGS=\"builtinassets ${GO_TAGS}\" make alloy"" +RUN ""C:\Program Files\git\bin\bash.exe" -c "RELEASE_BUILD=${RELEASE_BUILD} VERSION=${VERSION} GO_TAGS=\"embedalloyui ${GO_TAGS}\" make alloy"" # In this case, we're separating the clean command from make alloy to avoid an issue where access to some mod cache # files is denied immediately after make alloy, for example: # "go: remove C:\go\pkg\mod\golang.org\toolchain@v0.0.1-go1.22.3.windows-amd64\bin\go.exe: Access is denied." diff --git a/collector/builder-config.yaml b/collector/builder-config.yaml index 534689a40e5..ffaad67d8af 100644 --- a/collector/builder-config.yaml +++ b/collector/builder-config.yaml @@ -70,7 +70,10 @@ receivers: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.142.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.142.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.142.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.142.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver v0.142.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.142.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.142.0 diff --git a/collector/components.go b/collector/components.go index 09957459197..815f690298a 100644 --- a/collector/components.go +++ b/collector/components.go @@ -72,7 +72,10 @@ import ( hostmetricsreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver" influxdbreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver" jaegerreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver" + k8sobjectsreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver" kafkareceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver" + kubeletstatsreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver" + prometheusreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver" solacereceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver" splunkhecreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver" syslogreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver" @@ -131,7 +134,10 @@ func components() (otelcol.Factories, error) { hostmetricsreceiver.NewFactory(), influxdbreceiver.NewFactory(), jaegerreceiver.NewFactory(), + k8sobjectsreceiver.NewFactory(), kafkareceiver.NewFactory(), + kubeletstatsreceiver.NewFactory(), + prometheusreceiver.NewFactory(), solacereceiver.NewFactory(), splunkhecreceiver.NewFactory(), syslogreceiver.NewFactory(), @@ -157,7 +163,10 @@ func components() (otelcol.Factories, error) { factories.ReceiverModules[hostmetricsreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.142.0" factories.ReceiverModules[influxdbreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.142.0" factories.ReceiverModules[jaegerreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.142.0" + factories.ReceiverModules[k8sobjectsreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.142.0" factories.ReceiverModules[kafkareceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.142.0" + factories.ReceiverModules[kubeletstatsreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.142.0" + factories.ReceiverModules[prometheusreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.142.0" factories.ReceiverModules[solacereceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver v0.142.0" factories.ReceiverModules[splunkhecreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.142.0" factories.ReceiverModules[syslogreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.142.0" diff --git a/collector/go.mod b/collector/go.mod index 6ad8001da86..2c6fa5c7bb4 100644 --- a/collector/go.mod +++ b/collector/go.mod @@ -59,7 +59,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.142.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.142.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.142.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.142.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver v0.142.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.142.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.142.0 @@ -446,6 +449,7 @@ require ( github.com/go-zookeeper/zk v1.0.4 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/goccy/go-json v0.10.5 // indirect + github.com/goccy/go-yaml v1.19.0 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/godror/godror v0.48.1 // indirect @@ -592,6 +596,7 @@ require ( github.com/jpillora/backoff v1.0.0 // indirect github.com/jsimonetti/rtnetlink v1.4.2 // indirect github.com/json-iterator/go v1.1.12 // indirect + github.com/julienschmidt/httprouter v1.3.0 // indirect github.com/karrick/godirwalk v1.17.0 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect github.com/klauspost/asmfmt v1.3.2 // indirect @@ -670,6 +675,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.142.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.142.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.142.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/k8sleaderelector v0.142.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampcustommessages v0.142.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.142.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.142.0 // indirect @@ -681,6 +687,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/healthcheck v0.142.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.142.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.142.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.142.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.142.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.142.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.142.0 // indirect @@ -760,6 +767,7 @@ require ( github.com/prometheus/client_golang/exp v0.0.0-20250914183048-a974e0d45e0a // indirect github.com/prometheus/client_model v0.6.2 // indirect github.com/prometheus/common v0.67.4 // indirect + github.com/prometheus/common/assets v0.2.0 // indirect github.com/prometheus/consul_exporter v0.8.0 // indirect github.com/prometheus/exporter-toolkit v0.15.0 // indirect github.com/prometheus/memcached_exporter v0.13.0 // indirect @@ -796,6 +804,7 @@ require ( github.com/shirou/gopsutil/v4 v4.25.11 // indirect github.com/shoenig/go-m1cpu v0.1.7 // indirect github.com/shopspring/decimal v1.4.0 // indirect + github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c // indirect github.com/sijms/go-ora/v2 v2.9.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/skeema/knownhosts v1.3.1 // indirect @@ -966,6 +975,7 @@ require ( go.uber.org/goleak v1.3.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.1 // indirect + go.uber.org/zap/exp v0.3.0 // indirect go.yaml.in/yaml/v2 v2.4.3 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect go4.org/netipx v0.0.0-20230125063823-8449b0a6169f // indirect @@ -1006,9 +1016,10 @@ require ( k8s.io/apiextensions-apiserver v0.34.1 // indirect k8s.io/apimachinery v0.35.0-alpha.0 // indirect k8s.io/client-go v0.34.2 // indirect - k8s.io/component-base v0.34.1 // indirect + k8s.io/component-base v0.34.2 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect + k8s.io/kubelet v0.34.2 // indirect k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect sigs.k8s.io/controller-runtime v0.22.4 // indirect sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect diff --git a/collector/go.sum b/collector/go.sum index 6f87eba356a..7cc233b94f3 100644 --- a/collector/go.sum +++ b/collector/go.sum @@ -1784,6 +1784,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthchecke github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.142.0/go.mod h1:RpGhZza8O9QMBMd1cwLVM2XBOTVCfMQH98K2S6ZNLfo= github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.142.0 h1:r46Xcs0eiwG6RqDWHDm3W3Q3EGluRHpqavKYoOmczhM= github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.142.0/go.mod h1:ogL//gwfWL4RyJPN+3bCWHCWCNuejnEy0DyUJPJnI4w= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/k8sleaderelector v0.142.0 h1:MVIY5Uvw5i4ToGvuC0qeaPHbC3s/H+84+wviXCrPBY8= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/k8sleaderelector v0.142.0/go.mod h1:Gmzr78jfeNM3BfW+64J9OrsqWxZO4mZQmwLnoDeUeaQ= github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.142.0 h1:SNK9/kGwdiIDAVa/l/eRG0S1k5HZOyR2YFlaNnHtT8s= github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.142.0/go.mod h1:n4QAObJb6Jm9RVNp55ctM3IxEiODJGwCd5R+W4J1ehg= github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampcustommessages v0.142.0 h1:xFOR39iAmMz1qoClCNFZtOrAbdelZnaW1qcdcl1cpFE= @@ -1814,8 +1816,12 @@ github.com/open-telemetry/opentelemetry-collector-contrib/internal/healthcheck v github.com/open-telemetry/opentelemetry-collector-contrib/internal/healthcheck v0.142.0/go.mod h1:ugQkddTr3sOZC3j3mCsVTNor+02KED12uqQU5HFCKpI= github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.142.0 h1:NSnnveRKurFrpBxyuY6wZ+acBh5A/zE3Z1IEMH68iFM= github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.142.0/go.mod h1:MNTSHMl1wybxq7SMUy/Ew7JYr2cf70+JVCySwA2zBRI= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sleaderelectortest v0.142.0 h1:XGyvN/ynaWGx9hbcOfepKnzsEK4q71eNZj2QZIW5uqA= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sleaderelectortest v0.142.0/go.mod h1:Vkq/aL4O7f6zMPJyNz44877nM5WzwA5cc5+uW43x8SE= github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.142.0 h1:MTAeMi2AjlWUhNR3vErmOl5H2RIkegHwIAonIRTog5c= github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.142.0/go.mod h1:5jvos+PuIgzL3US//cPUXxDIRoAQp/C5qWG3nRFXSgc= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.142.0 h1:65Q+IlJPMSmxp4JCR9fb2/yDUH1gIFQUbKoBkyfOUIc= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.142.0/go.mod h1:5rRMa75IUNHu6VztLJ84KDYGdE4sfWQL4t9mPXOj0c4= github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.142.0 h1:nZ0Q/iJYBanNv65Nsef0eOgY69KKJ+KfSKYZ2AtTibk= github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.142.0/go.mod h1:FuZFNJ2GtLygx5RkyIFYoA4roDPsl6tpwKIZiWFCvHA= github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.142.0 h1:BO5dnA1qM6TtnbhpeyC24DmywElSH5yamm2SSmjGAFE= @@ -1924,8 +1930,12 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbrecei github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.142.0/go.mod h1:/5ut6KWjhkSQSEoA1Ya94ULorWizRQPQS9LHyMmlOw4= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.142.0 h1:asBjiVAEo6ik0egTb4GP8sc7LYZbLdihUmrVyLyy6kU= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.142.0/go.mod h1:ZX7CH1laVXuItVht0eKCAk3tqh7xF0/neKKyIeOQFys= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.142.0 h1:tzuxivXNCHsTKhjtQMgSiAuyKFK+hYPk1Zt1LaOdrYc= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.142.0/go.mod h1:O66IS3lWpnQsl4kJkRZiHQysm7WnjeLA3R+IeI0XzJ0= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.142.0 h1:rQF6DcB7WKWbU0feTETzDLEpVZxWmakNRPt9h61FZ2g= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.142.0/go.mod h1:H7t0+Ji05xim37uKQY9e2irbFxO9RKy8o1K3DEQ3gXo= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.142.0 h1:TYGu5Lx2M6TmJi6Js0xzjJsTKD1NJLa8DcEGE13zAa4= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.142.0/go.mod h1:F84TsYBAHua8Nh+1AhP++E1rf0ULMoJcjkuFfrYH9EU= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.142.0 h1:3LWr0Y519vpqs487v2B/GhUT1necfmtYbMcaVzLIBFA= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.142.0/go.mod h1:ClPuWTf0N81wynK60xQNpYIYi0vmVNymrF3oXIBNrHk= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver v0.142.0 h1:sYH9NfckZcc5V1UQPD5XDxj4rHhJBjyH2yFH+MOBr/k= @@ -3087,6 +3097,8 @@ golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA= golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc= +golang.org/x/tools/godoc v0.1.0-deprecated h1:o+aZ1BOj6Hsx/GBdJO/s815sqftjSnrZZwyYTHODvtk= +golang.org/x/tools/godoc v0.1.0-deprecated/go.mod h1:qM63CriJ961IHWmnWa9CjZnBndniPt4a3CK0PVB9bIg= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -3256,12 +3268,14 @@ k8s.io/apimachinery v0.35.0-alpha.0 h1:FrJ3gqYFPIldvKa2KHzmT0lL0gqcRr1GiS6thHvdS k8s.io/apimachinery v0.35.0-alpha.0/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw= k8s.io/client-go v0.34.2 h1:Co6XiknN+uUZqiddlfAjT68184/37PS4QAzYvQvDR8M= k8s.io/client-go v0.34.2/go.mod h1:2VYDl1XXJsdcAxw7BenFslRQX28Dxz91U9MWKjX97fE= -k8s.io/component-base v0.34.1 h1:v7xFgG+ONhytZNFpIz5/kecwD+sUhVE6HU7qQUiRM4A= -k8s.io/component-base v0.34.1/go.mod h1:mknCpLlTSKHzAQJJnnHVKqjxR7gBeHRv0rPXA7gdtQ0= +k8s.io/component-base v0.34.2 h1:HQRqK9x2sSAsd8+R4xxRirlTjowsg6fWCPwWYeSvogQ= +k8s.io/component-base v0.34.2/go.mod h1:9xw2FHJavUHBFpiGkZoKuYZ5pdtLKe97DEByaA+hHbM= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZcmKS3g6CthxToOb37KgwE= k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ= +k8s.io/kubelet v0.34.2 h1:Dl+1uh7xwJr70r+SHKyIpvu6XvzuoPu0uDIC4cqgJUs= +k8s.io/kubelet v0.34.2/go.mod h1:RfwR03iuKeVV7Z1qD9XKH98c3tlPImJpQ3qHIW40htM= k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck= k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/docs/sources/opentelemetry/_index.md b/docs/sources/opentelemetry/_index.md index 5cbd39ce733..4143d871f36 100644 --- a/docs/sources/opentelemetry/_index.md +++ b/docs/sources/opentelemetry/_index.md @@ -79,7 +79,10 @@ The following sections list all included components: - [hostmetrics](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/hostmetricsreceiver) - [influxdb](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/influxdbreceiver) - [jaeger](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/jaegerreceiver) +- [k8sobjectsreceiver](github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver) - [kafka](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/kafkareceiver) +- [kubeletstatsreceiver](github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver) +- [prometheusreceive](github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver) - [solace](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/solacereceiver) - [splunkhec](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/splunkhecreceiver) - [syslog](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/syslogreceiver) diff --git a/internal/web/ui/assets_builtin.go b/internal/web/ui/assets_builtin.go index 8d6719611e5..95aadc33dde 100644 --- a/internal/web/ui/assets_builtin.go +++ b/internal/web/ui/assets_builtin.go @@ -1,4 +1,4 @@ -//go:build builtinassets +//go:build embedalloyui package ui @@ -12,11 +12,11 @@ import ( //go:generate npm run build //go:embed dist -var builtinAssetsTarball embed.FS +var embedalloyuiTarball embed.FS // Assets contains the UI's assets. func Assets() http.FileSystem { - inner, err := fs.Sub(builtinAssetsTarball, "dist") + inner, err := fs.Sub(embedalloyuiTarball, "dist") if err != nil { panic(err) } diff --git a/internal/web/ui/assets_nobuiltin.go b/internal/web/ui/assets_nobuiltin.go index d680b35a615..a3d21c61747 100644 --- a/internal/web/ui/assets_nobuiltin.go +++ b/internal/web/ui/assets_nobuiltin.go @@ -1,4 +1,4 @@ -//go:build !builtinassets +//go:build !embedalloyui package ui diff --git a/internal/web/ui/ui.go b/internal/web/ui/ui.go index fe6bda388e8..6049f51a3fa 100644 --- a/internal/web/ui/ui.go +++ b/internal/web/ui/ui.go @@ -22,8 +22,8 @@ import ( // // By default, the UI is retrieved from the ./internal/web/ui/dist directory // relative to working directory, assuming that Alloy is run from the repo -// root. However, if the builtinassets Go tag is present, the built UI will be -// embedded into the binary; run go generate -tags builtinassets for this +// root. However, if the embedalloyui Go tag is present, the built UI will be +// embedded into the binary; run go generate -tags embedalloyui for this // package to generate the assets to embed. // // RegisterRoutes catches all requests from pathPrefix and so should only be diff --git a/tools/make/packaging.mk b/tools/make/packaging.mk index efa518d0951..acf7bd99343 100644 --- a/tools/make/packaging.mk +++ b/tools/make/packaging.mk @@ -32,37 +32,37 @@ dist-alloy-binaries: dist/alloy-linux-amd64 \ dist/alloy-windows-amd64.exe \ dist/alloy-freebsd-amd64 -dist/alloy-linux-amd64: GO_TAGS += netgo builtinassets promtail_journal_enabled +dist/alloy-linux-amd64: GO_TAGS += netgo embedalloyui promtail_journal_enabled dist/alloy-linux-amd64: GOOS := linux dist/alloy-linux-amd64: GOARCH := amd64 dist/alloy-linux-amd64: generate-ui $(PACKAGING_VARS) ALLOY_BINARY=$@ "$(MAKE)" -f $(PARENT_MAKEFILE) alloy -dist/alloy-linux-arm64: GO_TAGS += netgo builtinassets promtail_journal_enabled +dist/alloy-linux-arm64: GO_TAGS += netgo embedalloyui promtail_journal_enabled dist/alloy-linux-arm64: GOOS := linux dist/alloy-linux-arm64: GOARCH := arm64 dist/alloy-linux-arm64: generate-ui $(PACKAGING_VARS) ALLOY_BINARY=$@ "$(MAKE)" -f $(PARENT_MAKEFILE) alloy -dist/alloy-linux-ppc64le: GO_TAGS += netgo builtinassets promtail_journal_enabled +dist/alloy-linux-ppc64le: GO_TAGS += netgo embedalloyui promtail_journal_enabled dist/alloy-linux-ppc64le: GOOS := linux dist/alloy-linux-ppc64le: GOARCH := ppc64le dist/alloy-linux-ppc64le: generate-ui $(PACKAGING_VARS) ALLOY_BINARY=$@ "$(MAKE)" -f $(PARENT_MAKEFILE) alloy -dist/alloy-linux-s390x: GO_TAGS += netgo builtinassets promtail_journal_enabled +dist/alloy-linux-s390x: GO_TAGS += netgo embedalloyui promtail_journal_enabled dist/alloy-linux-s390x: GOOS := linux dist/alloy-linux-s390x: GOARCH := s390x dist/alloy-linux-s390x: generate-ui $(PACKAGING_VARS) ALLOY_BINARY=$@ "$(MAKE)" -f $(PARENT_MAKEFILE) alloy -dist/alloy-darwin-amd64: GO_TAGS += netgo builtinassets +dist/alloy-darwin-amd64: GO_TAGS += netgo embedalloyui dist/alloy-darwin-amd64: GOOS := darwin dist/alloy-darwin-amd64: GOARCH := amd64 dist/alloy-darwin-amd64: generate-ui $(PACKAGING_VARS) ALLOY_BINARY=$@ "$(MAKE)" -f $(PARENT_MAKEFILE) alloy -dist/alloy-darwin-arm64: GO_TAGS += netgo builtinassets +dist/alloy-darwin-arm64: GO_TAGS += netgo embedalloyui dist/alloy-darwin-arm64: GOOS := darwin dist/alloy-darwin-arm64: GOARCH := arm64 dist/alloy-darwin-arm64: generate-ui @@ -73,7 +73,7 @@ dist/alloy-darwin-arm64: generate-ui # # TODO(rfratto): add netgo back to Windows builds if a version of Go is # released which natively supports resolving DNS short names on Windows. -dist/alloy-windows-amd64.exe: GO_TAGS += builtinassets +dist/alloy-windows-amd64.exe: GO_TAGS += embedalloyui dist/alloy-windows-amd64.exe: GOOS := windows dist/alloy-windows-amd64.exe: GOARCH := amd64 dist/alloy-windows-amd64.exe: generate-ui generate-winmanifest @@ -84,7 +84,7 @@ dist/alloy-windows-amd64.exe: generate-ui generate-winmanifest # # TODO(rfratto): add netgo back to Windows builds if a version of Go is # released which natively supports resolving DNS short names on Windows. -dist/alloy-freebsd-amd64: GO_TAGS += netgo builtinassets +dist/alloy-freebsd-amd64: GO_TAGS += netgo embedalloyui dist/alloy-freebsd-amd64: GOOS := freebsd dist/alloy-freebsd-amd64: GOARCH := amd64 dist/alloy-freebsd-amd64: generate-ui @@ -97,14 +97,14 @@ dist/alloy-freebsd-amd64: generate-ui dist-alloy-boringcrypto-binaries: dist/alloy-boringcrypto-linux-amd64 \ dist/alloy-boringcrypto-linux-arm64 -dist/alloy-boringcrypto-linux-amd64: GO_TAGS += netgo builtinassets promtail_journal_enabled +dist/alloy-boringcrypto-linux-amd64: GO_TAGS += netgo embedalloyui promtail_journal_enabled dist/alloy-boringcrypto-linux-amd64: GOEXPERIMENT := boringcrypto dist/alloy-boringcrypto-linux-amd64: GOOS := linux dist/alloy-boringcrypto-linux-amd64: GOARCH := amd64 dist/alloy-boringcrypto-linux-amd64: generate-ui $(PACKAGING_VARS) ALLOY_BINARY=$@ "$(MAKE)" -f $(PARENT_MAKEFILE) alloy -dist/alloy-boringcrypto-linux-arm64: GO_TAGS += netgo builtinassets promtail_journal_enabled +dist/alloy-boringcrypto-linux-arm64: GO_TAGS += netgo embedalloyui promtail_journal_enabled dist/alloy-boringcrypto-linux-arm64: GOEXPERIMENT := boringcrypto dist/alloy-boringcrypto-linux-arm64: GOOS := linux dist/alloy-boringcrypto-linux-arm64: GOARCH := arm64 @@ -123,7 +123,7 @@ dist/alloy-boringcrypto-linux-arm64: generate-ui dist-alloy-service-binaries: dist.temp/alloy-service-windows-amd64.exe -dist.temp/alloy-service-windows-amd64.exe: GO_TAGS += builtinassets +dist.temp/alloy-service-windows-amd64.exe: GO_TAGS += embedalloyui dist.temp/alloy-service-windows-amd64.exe: GOOS := windows dist.temp/alloy-service-windows-amd64.exe: GOARCH := amd64 dist.temp/alloy-service-windows-amd64.exe: generate-ui generate-winmanifest