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..26372334493 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 @@ -61,6 +61,11 @@ RUN apt-get update \ COPY --from=build --chown=${UID}:${UID} /src/alloy/build/alloy /bin/alloy COPY --chown=${UID}:${UID} example-config.alloy /etc/alloy/config.alloy +# Provide /bin/otelcol compatibility entrypoint. Useful when using Alloy's OTel Engine with +# OpenTelemetry Collector helm chart and other ecosystem tools that expect otelcol binary. +COPY packaging/docker/otelcol.sh /bin/otelcol +RUN chmod 755 /bin/otelcol + # Create alloy user in container, but do not set it as default # # NOTE: non-root support in Docker containers is an experimental, diff --git a/Dockerfile.windows b/Dockerfile.windows index 4993bc66a58..5d05d660a61 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." @@ -89,6 +89,10 @@ FROM ${BASE_IMAGE_WINDOWS} COPY --from=builder ["/src/alloy/build/alloy", "C:/Program Files/GrafanaLabs/Alloy/alloy.exe"] COPY --from=builder ["/src/alloy/example-config.alloy", "C:/Program Files/GrafanaLabs/Alloy/config.alloy"] +# Provide otelcol compatibility entrypoint. Useful when using Alloy's OTel Engine with +# OpenTelemetry Collector helm chart and other ecosystem tools that expect otelcol binary. +COPY ["packaging/docker/otelcol.cmd", "C:/Program Files/GrafanaLabs/Alloy/otelcol.cmd"] + ENTRYPOINT ["C:/Program Files/GrafanaLabs/Alloy/alloy.exe"] ENV ALLOY_DEPLOY_MODE=docker CMD ["run", "C:/Program Files/GrafanaLabs/Alloy/config.alloy", "--storage.path=C:/ProgramData/GrafanaLabs/Alloy/data"] diff --git a/collector/builder-config.yaml b/collector/builder-config.yaml index 3ff0fc05270..ffaad67d8af 100644 --- a/collector/builder-config.yaml +++ b/collector/builder-config.yaml @@ -6,35 +6,87 @@ dist: output_path: . extensions: - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.142.0 + - gomod: github.com/grafana/alloy/extension/alloyengine v0.1.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.142.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.142.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.142.0 - - gomod: github.com/grafana/alloy/extension/alloyengine v0.1.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.142.0 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.142.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.142.0 - - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.142.0 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.142.0 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter v0.142.0 +# TODO: Address this as part of https://github.com/grafana/alloy/issues/5348 +# - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/faroexporter v0.142.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.142.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.142.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.142.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.142.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.142.0 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.142.0 + - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.142.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.142.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.142.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.142.0 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.142.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/intervalprocessor v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstarttimeprocessor v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.142.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.142.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.142.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.142.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.142.0 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.142.0 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.142.0 receivers: + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscloudwatchreceiver v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awss3receiver v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudflarereceiver v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/faroreceiver v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.142.0 + - 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 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.142.0 - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.142.0 connectors: + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.142.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.142.0 - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.142.0 providers: @@ -90,4 +142,6 @@ replaces: - github.com/opencontainers/runc => github.com/opencontainers/runc v1.2.8 # Replace controller-runtime with pinned version - sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.20.4 + # Fork to grafana repo to address issue with freebsd build tags. This can be removed once https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/42645 is fixed + - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver => github.com/grafana/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.0.0-20260126095124-0af81a9e8966 # END GENERATED REPLACES \ No newline at end of file diff --git a/collector/components.go b/collector/components.go index 92bfb0f265f..815f690298a 100644 --- a/collector/components.go +++ b/collector/components.go @@ -11,27 +11,77 @@ import ( "go.opentelemetry.io/collector/processor" "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/service/telemetry/otelconftelemetry" + countconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector" + grafanacloudconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector" + servicegraphconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector" + spanmetricsconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector" forwardconnector "go.opentelemetry.io/collector/connector/forwardconnector" - debugexporter "go.opentelemetry.io/collector/exporter/debugexporter" - nopexporter "go.opentelemetry.io/collector/exporter/nopexporter" - otlpexporter "go.opentelemetry.io/collector/exporter/otlpexporter" - otlphttpexporter "go.opentelemetry.io/collector/exporter/otlphttpexporter" + awss3exporter "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter" + faroexporter "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/faroexporter" fileexporter "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter" + googlecloudexporter "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter" + googlecloudpubsubexporter "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter" kafkaexporter "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" + loadbalancingexporter "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter" prometheusexporter "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter" prometheusremotewriteexporter "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter" + splunkhecexporter "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter" + syslogexporter "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter" zipkinexporter "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter" - zpagesextension "go.opentelemetry.io/collector/extension/zpagesextension" + debugexporter "go.opentelemetry.io/collector/exporter/debugexporter" + nopexporter "go.opentelemetry.io/collector/exporter/nopexporter" + otlpexporter "go.opentelemetry.io/collector/exporter/otlpexporter" + otlphttpexporter "go.opentelemetry.io/collector/exporter/otlphttpexporter" + alloyengine "github.com/grafana/alloy/extension/alloyengine" + basicauthextension "github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension" + bearertokenauthextension "github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension" + headerssetterextension "github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension" healthcheckextension "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension" + jaegerremotesampling "github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling" + oauth2clientauthextension "github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension" pprofextension "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension" - alloyengine "github.com/grafana/alloy/extension/alloyengine" - batchprocessor "go.opentelemetry.io/collector/processor/batchprocessor" - memorylimiterprocessor "go.opentelemetry.io/collector/processor/memorylimiterprocessor" + sigv4authextension "github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension" + filestorage "github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage" + zpagesextension "go.opentelemetry.io/collector/extension/zpagesextension" attributesprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor" + cumulativetodeltaprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor" + deltatocumulativeprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor" + filterprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor" + groupbyattrsprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor" + intervalprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/intervalprocessor" + k8sattributesprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor" + metricstarttimeprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstarttimeprocessor" + probabilisticsamplerprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor" resourceprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor" + resourcedetectionprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor" spanprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor" - probabilisticsamplerprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor" - filterprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor" + tailsamplingprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor" + transformprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor" + batchprocessor "go.opentelemetry.io/collector/processor/batchprocessor" + memorylimiterprocessor "go.opentelemetry.io/collector/processor/memorylimiterprocessor" + awscloudwatchreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscloudwatchreceiver" + awsecscontainermetricsreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver" + awss3receiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awss3receiver" + cloudflarereceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudflarereceiver" + datadogreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver" + faroreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/faroreceiver" + filelogreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver" + filestatsreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver" + fluentforwardreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver" + googlecloudpubsubreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver" + 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" + tcplogreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver" + vcenterreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver" + zipkinreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver" otlpreceiver "go.opentelemetry.io/collector/receiver/otlpreceiver" ) @@ -42,82 +92,182 @@ func components() (otelcol.Factories, error) { } factories.Extensions, err = otelcol.MakeFactoryMap[extension.Factory]( - zpagesextension.NewFactory(), + alloyengine.NewFactory(), + basicauthextension.NewFactory(), + bearertokenauthextension.NewFactory(), + headerssetterextension.NewFactory(), healthcheckextension.NewFactory(), + jaegerremotesampling.NewFactory(), + oauth2clientauthextension.NewFactory(), pprofextension.NewFactory(), - alloyengine.NewFactory(), + sigv4authextension.NewFactory(), + filestorage.NewFactory(), + zpagesextension.NewFactory(), ) if err != nil { return otelcol.Factories{}, err } factories.ExtensionModules = make(map[component.Type]string, len(factories.Extensions)) - factories.ExtensionModules[zpagesextension.NewFactory().Type()] = "go.opentelemetry.io/collector/extension/zpagesextension v0.142.0" + factories.ExtensionModules[alloyengine.NewFactory().Type()] = "github.com/grafana/alloy/extension/alloyengine v0.1.0" + factories.ExtensionModules[basicauthextension.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.142.0" + factories.ExtensionModules[bearertokenauthextension.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.142.0" + factories.ExtensionModules[headerssetterextension.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.142.0" factories.ExtensionModules[healthcheckextension.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.142.0" + factories.ExtensionModules[jaegerremotesampling.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.142.0" + factories.ExtensionModules[oauth2clientauthextension.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.142.0" factories.ExtensionModules[pprofextension.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.142.0" - factories.ExtensionModules[alloyengine.NewFactory().Type()] = "github.com/grafana/alloy/extension/alloyengine v0.1.0" + factories.ExtensionModules[sigv4authextension.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.142.0" + factories.ExtensionModules[filestorage.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.142.0" + factories.ExtensionModules[zpagesextension.NewFactory().Type()] = "go.opentelemetry.io/collector/extension/zpagesextension v0.142.0" factories.Receivers, err = otelcol.MakeFactoryMap[receiver.Factory]( + awscloudwatchreceiver.NewFactory(), + awsecscontainermetricsreceiver.NewFactory(), + awss3receiver.NewFactory(), + cloudflarereceiver.NewFactory(), + datadogreceiver.NewFactory(), + faroreceiver.NewFactory(), + filelogreceiver.NewFactory(), + filestatsreceiver.NewFactory(), + fluentforwardreceiver.NewFactory(), + googlecloudpubsubreceiver.NewFactory(), + hostmetricsreceiver.NewFactory(), + influxdbreceiver.NewFactory(), + jaegerreceiver.NewFactory(), + k8sobjectsreceiver.NewFactory(), + kafkareceiver.NewFactory(), + kubeletstatsreceiver.NewFactory(), + prometheusreceiver.NewFactory(), + solacereceiver.NewFactory(), + splunkhecreceiver.NewFactory(), + syslogreceiver.NewFactory(), + tcplogreceiver.NewFactory(), + vcenterreceiver.NewFactory(), + zipkinreceiver.NewFactory(), otlpreceiver.NewFactory(), ) if err != nil { return otelcol.Factories{}, err } factories.ReceiverModules = make(map[component.Type]string, len(factories.Receivers)) + factories.ReceiverModules[awscloudwatchreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscloudwatchreceiver v0.142.0" + factories.ReceiverModules[awsecscontainermetricsreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.142.0" + factories.ReceiverModules[awss3receiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awss3receiver v0.142.0" + factories.ReceiverModules[cloudflarereceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudflarereceiver v0.142.0" + factories.ReceiverModules[datadogreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver v0.142.0" + factories.ReceiverModules[faroreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/faroreceiver v0.142.0" + factories.ReceiverModules[filelogreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.142.0" + factories.ReceiverModules[filestatsreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.142.0" + factories.ReceiverModules[fluentforwardreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.142.0" + factories.ReceiverModules[googlecloudpubsubreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.142.0" + 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" + factories.ReceiverModules[tcplogreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.142.0" + factories.ReceiverModules[vcenterreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver v0.142.0" + factories.ReceiverModules[zipkinreceiver.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.142.0" factories.ReceiverModules[otlpreceiver.NewFactory().Type()] = "go.opentelemetry.io/collector/receiver/otlpreceiver v0.142.0" factories.Exporters, err = otelcol.MakeFactoryMap[exporter.Factory]( - debugexporter.NewFactory(), - nopexporter.NewFactory(), - otlpexporter.NewFactory(), - otlphttpexporter.NewFactory(), + awss3exporter.NewFactory(), + faroexporter.NewFactory(), fileexporter.NewFactory(), + googlecloudexporter.NewFactory(), + googlecloudpubsubexporter.NewFactory(), kafkaexporter.NewFactory(), + loadbalancingexporter.NewFactory(), prometheusexporter.NewFactory(), prometheusremotewriteexporter.NewFactory(), + splunkhecexporter.NewFactory(), + syslogexporter.NewFactory(), zipkinexporter.NewFactory(), + debugexporter.NewFactory(), + nopexporter.NewFactory(), + otlpexporter.NewFactory(), + otlphttpexporter.NewFactory(), ) if err != nil { return otelcol.Factories{}, err } factories.ExporterModules = make(map[component.Type]string, len(factories.Exporters)) - factories.ExporterModules[debugexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/debugexporter v0.142.0" - factories.ExporterModules[nopexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/nopexporter v0.142.0" - factories.ExporterModules[otlpexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/otlpexporter v0.142.0" - factories.ExporterModules[otlphttpexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/otlphttpexporter v0.142.0" + factories.ExporterModules[awss3exporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter v0.142.0" + factories.ExporterModules[faroexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/faroexporter v0.142.0" factories.ExporterModules[fileexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.142.0" + factories.ExporterModules[googlecloudexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.142.0" + factories.ExporterModules[googlecloudpubsubexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.142.0" factories.ExporterModules[kafkaexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.142.0" + factories.ExporterModules[loadbalancingexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.142.0" factories.ExporterModules[prometheusexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.142.0" factories.ExporterModules[prometheusremotewriteexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.142.0" + factories.ExporterModules[splunkhecexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.142.0" + factories.ExporterModules[syslogexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.142.0" factories.ExporterModules[zipkinexporter.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.142.0" + factories.ExporterModules[debugexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/debugexporter v0.142.0" + factories.ExporterModules[nopexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/nopexporter v0.142.0" + factories.ExporterModules[otlpexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/otlpexporter v0.142.0" + factories.ExporterModules[otlphttpexporter.NewFactory().Type()] = "go.opentelemetry.io/collector/exporter/otlphttpexporter v0.142.0" factories.Processors, err = otelcol.MakeFactoryMap[processor.Factory]( - batchprocessor.NewFactory(), - memorylimiterprocessor.NewFactory(), attributesprocessor.NewFactory(), + cumulativetodeltaprocessor.NewFactory(), + deltatocumulativeprocessor.NewFactory(), + filterprocessor.NewFactory(), + groupbyattrsprocessor.NewFactory(), + intervalprocessor.NewFactory(), + k8sattributesprocessor.NewFactory(), + metricstarttimeprocessor.NewFactory(), + probabilisticsamplerprocessor.NewFactory(), resourceprocessor.NewFactory(), + resourcedetectionprocessor.NewFactory(), spanprocessor.NewFactory(), - probabilisticsamplerprocessor.NewFactory(), - filterprocessor.NewFactory(), + tailsamplingprocessor.NewFactory(), + transformprocessor.NewFactory(), + batchprocessor.NewFactory(), + memorylimiterprocessor.NewFactory(), ) if err != nil { return otelcol.Factories{}, err } factories.ProcessorModules = make(map[component.Type]string, len(factories.Processors)) - factories.ProcessorModules[batchprocessor.NewFactory().Type()] = "go.opentelemetry.io/collector/processor/batchprocessor v0.142.0" - factories.ProcessorModules[memorylimiterprocessor.NewFactory().Type()] = "go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.142.0" factories.ProcessorModules[attributesprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.142.0" + factories.ProcessorModules[cumulativetodeltaprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.142.0" + factories.ProcessorModules[deltatocumulativeprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.142.0" + factories.ProcessorModules[filterprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.142.0" + factories.ProcessorModules[groupbyattrsprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.142.0" + factories.ProcessorModules[intervalprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/intervalprocessor v0.142.0" + factories.ProcessorModules[k8sattributesprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.142.0" + factories.ProcessorModules[metricstarttimeprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstarttimeprocessor v0.142.0" + factories.ProcessorModules[probabilisticsamplerprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.142.0" factories.ProcessorModules[resourceprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.142.0" + factories.ProcessorModules[resourcedetectionprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.142.0" factories.ProcessorModules[spanprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.142.0" - factories.ProcessorModules[probabilisticsamplerprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.142.0" - factories.ProcessorModules[filterprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.142.0" + factories.ProcessorModules[tailsamplingprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.142.0" + factories.ProcessorModules[transformprocessor.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.142.0" + factories.ProcessorModules[batchprocessor.NewFactory().Type()] = "go.opentelemetry.io/collector/processor/batchprocessor v0.142.0" + factories.ProcessorModules[memorylimiterprocessor.NewFactory().Type()] = "go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.142.0" factories.Connectors, err = otelcol.MakeFactoryMap[connector.Factory]( + countconnector.NewFactory(), + grafanacloudconnector.NewFactory(), + servicegraphconnector.NewFactory(), + spanmetricsconnector.NewFactory(), forwardconnector.NewFactory(), ) if err != nil { return otelcol.Factories{}, err } factories.ConnectorModules = make(map[component.Type]string, len(factories.Connectors)) + factories.ConnectorModules[countconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.142.0" + factories.ConnectorModules[grafanacloudconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector v0.142.0" + factories.ConnectorModules[servicegraphconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.142.0" + factories.ConnectorModules[spanmetricsconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.142.0" factories.ConnectorModules[forwardconnector.NewFactory().Type()] = "go.opentelemetry.io/collector/connector/forwardconnector v0.142.0" return factories, nil diff --git a/collector/go.mod b/collector/go.mod index f3a7ef8444c..2c6fa5c7bb4 100644 --- a/collector/go.mod +++ b/collector/go.mod @@ -7,18 +7,68 @@ go 1.25.6 require ( github.com/grafana/alloy v0.0.0-00010101000000-000000000000 github.com/grafana/alloy/extension/alloyengine v0.1.0 + github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/faroexporter v0.142.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.142.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.142.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.142.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.142.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.142.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.142.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.142.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.142.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/intervalprocessor v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstarttimeprocessor v0.142.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.142.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.142.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscloudwatchreceiver v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awss3receiver v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudflarereceiver v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/faroreceiver v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.142.0 + 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 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver v0.142.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.142.0 github.com/spf13/cobra v1.10.2 github.com/stretchr/testify v1.11.1 go.opentelemetry.io/collector/component v1.49.0 @@ -399,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 @@ -545,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 @@ -620,36 +672,22 @@ require ( github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/oliver006/redis_exporter v1.74.0 // indirect github.com/open-telemetry/opamp-go v0.22.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter v0.142.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/faroexporter v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter 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/basicauthextension v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension 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/headerssetterextension v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension 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/extension/sigv4authextension v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage 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 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.142.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.142.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.142.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.142.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/gopsutilenv v0.142.0 // indirect 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 @@ -658,6 +696,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.142.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.142.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog v0.142.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.142.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/configkafka v0.142.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic v0.142.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.142.0 // indirect @@ -673,34 +712,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.142.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.142.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/intervalprocessor v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstarttimeprocessor v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscloudwatchreceiver v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awss3receiver v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudflarereceiver v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/faroreceiver v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver v0.142.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.142.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.142.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.1 // indirect github.com/opencontainers/runc v1.3.3 // indirect @@ -755,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 @@ -791,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 @@ -961,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 @@ -1001,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 @@ -1057,3 +1073,5 @@ replace github.com/deneonet/benc => github.com/deneonet/benc v1.1.7 replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.2.8 replace sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.20.4 + +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver => github.com/grafana/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.0.0-20260126095124-0af81a9e8966 diff --git a/collector/go.sum b/collector/go.sum index aad7cea749c..7cc233b94f3 100644 --- a/collector/go.sum +++ b/collector/go.sum @@ -1161,6 +1161,8 @@ github.com/grafana/mysqld_exporter v0.17.2-0.20250226152553-be612e3fdedd h1:FW1K github.com/grafana/mysqld_exporter v0.17.2-0.20250226152553-be612e3fdedd/go.mod h1:iEFA+REkm+0WRvVxy0cA1bBhJlFcQB998yymb45TqMU= github.com/grafana/node_exporter v0.18.1-grafana-r01.0.20251024135609-318b01780c89 h1:Ab3Z4AXC1Hffr4NbeYq0vTQhJbiGTTO2xd0ZV0kC1v8= github.com/grafana/node_exporter v0.18.1-grafana-r01.0.20251024135609-318b01780c89/go.mod h1:BUJCdmzfsndvLKeFuONqMPsEA0fkeVuAyt8II4Lk0Dg= +github.com/grafana/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.0.0-20260126095124-0af81a9e8966 h1:flIED1bVVc8XGgEM9J2M8oRnllD0R+Gydf/mXHSeww0= +github.com/grafana/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.0.0-20260126095124-0af81a9e8966/go.mod h1:TeJMg8YjVMx9w+vYu6HD15o37zW2HUizPZrh58hUSGY= github.com/grafana/opentelemetry-collector/featuregate v0.0.0-20240325174506-2fd1623b2ca0 h1:i/Ne0XwoRokYj52ZcSmnvuyID3h/uA91n0Ycg/grHU8= github.com/grafana/opentelemetry-collector/featuregate v0.0.0-20240325174506-2fd1623b2ca0/go.mod h1:mm8+xyQfgDmqhyegZRNIQmoKsNnDTwWKFLsdMoXAb7A= github.com/grafana/opentelemetry-ebpf-instrumentation v1.4.11 h1:Pi46xuPzRjAeB6XB4PzdF8kV93jl4NB58OZj08Bi33U= @@ -1734,6 +1736,8 @@ github.com/open-telemetry/opamp-go v0.22.0 h1:7UnsQgFFS7ffM09JQk+9aGVBAAlsLfcooZ github.com/open-telemetry/opamp-go v0.22.0/go.mod h1:339N71soCPrhHywbAcKUZJDODod581ZOxCpTkrl3zYQ= github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.142.0 h1:zDntB1s/YjfwIrzuJQDe6X7/o6idKJczEUl9hoQeN1E= github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.142.0/go.mod h1:9/6Jj8yifyRDUEPA35QQ3sZ3Knlw+Z3hKCMXS7xJCR0= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector v0.142.0 h1:gOscW1MmngDXfN9EsEUXuUJ2E1iF+ZJO+3nYhD52Pug= +github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector v0.142.0/go.mod h1:LNS5iHwfRTQ96kZQKqUSPGjxQPPxatr+Fu+TpjD3U7E= github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.142.0 h1:gUWJVueEPsCHQxqldPvH5lyBgeiKixURotpspp0PZS0= github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.142.0/go.mod h1:1m6QXwJpU6qSj6Bpa2bTrJRfCBvifxZPEhHnr8ePJzo= github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.142.0 h1:36uZ/NP9YyGJULi+QjIVWD2cxSn5WKAeQ1IlY+X/v/o= @@ -1780,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= @@ -1804,12 +1810,18 @@ github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.142.0/go.mod h1:ZmMdcBia20ih8NYia5b4dNhfNLT68xHgaqF+fNW+TLM= github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.142.0 h1:fAl09gr9B7LyZBvhBVsvNYMdm8sofMT4lgb3MHjfuRM= github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.142.0/go.mod h1:TL+PKrQbFZw9z5N/2egn0bV/UmOFWUnKq4m9Vh86IoM= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/gopsutilenv v0.142.0 h1:dWesj+gA1TVz8fRsPqN73JbV7JjOVvlF/qL3Bz/M6hE= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/gopsutilenv v0.142.0/go.mod h1:Xa18FtJ9co6rnl0y1bpcspNEIhPRxrfKCS3HgeugnBQ= github.com/open-telemetry/opentelemetry-collector-contrib/internal/healthcheck v0.142.0 h1:MXX7W+nwaPz0R7uvwvEj06zu6ex6Zgj8uAPja0Xr32o= 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= @@ -1826,6 +1838,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.1 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.142.0/go.mod h1:jpvcWt3roQEeUZCZJvrUWV9EAbVdXOUPDBBCc3ExxcA= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog v0.142.0 h1:Oj4O8Igkm2BPIGY4jvecJscRzc0kjeOllhpVrRysD+M= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog v0.142.0/go.mod h1:VyGN2LJpdokmsdKVH9IaZjjwoywC2YCo8HkzqoB0/ZY= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.142.0 h1:DxmzuF38A4R3zMmdpiqnkY6ZsIeAkjlvao/RWK/cFsA= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.142.0/go.mod h1:dhgxI7FxMfzgUE4BkxeCD/U5vrNFIxHQ4tFAeQYoJVo= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.142.0 h1:N5J6TArF3DZr8xibVA3vht5onHGjevWYc1mhBi3kmBI= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.142.0/go.mod h1:zNkIEuXEi5nOcKE2RUbWwFcGZ+S7eHhsVf0kG+KB6O4= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/configkafka v0.142.0 h1:2/Z7Zxg911+2A/aMuOnNUzn6F+42PdJJc2XUX1ME39A= @@ -1860,6 +1874,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometh github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.142.0/go.mod h1:vqrxUspQ5sYFuy8ccbX7PXVe64AEXJV9oh9mtTagPHE= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.142.0 h1:9yZTdgSz2zdxxjszjf1Xv/iDg3r+dafWMP2T2gXuX88= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.142.0/go.mod h1:0guVg9cTJHN2w4egMmxaybQsZ5CABpj1iTZ9yZvSCF4= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.142.0 h1:a0ENR1mtubC89WMiXHBDYOm7WWb/zu6WW2WTUU6ea4M= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.142.0/go.mod h1:oHASqzYgg9+AEXfZZTz5xFKXVWtMUMHpd+AvXvgSvO0= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest v0.142.0 h1:B7uEQqy0lgbnsJBK1V9y7TfDndbGUUwkEGNHnvTxYOg= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest v0.142.0/go.mod h1:0XDrrd/GcSMUB7g0FtAb3pifYbIVCbU8W9df/t6a4NQ= github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.142.0 h1:+kSCQPM3XpsFOXgJtCeWCbGHsyhWe6R69K49JfgUotI= @@ -1904,18 +1920,22 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/faroreceiver github.com/open-telemetry/opentelemetry-collector-contrib/receiver/faroreceiver v0.142.0/go.mod h1:Lqa348mf7+Uds6a4TirRVy2RuSZOhISrlZxrF50tTwE= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.142.0 h1:PiArV40Tn4GrwLtL9RWfrN3vC+lx69uVAy1p+Zo+Y7k= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.142.0/go.mod h1:WyUGg8RamQ3HnKTTVy6AEROyro5W/qB++VXMboz12rI= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.142.0 h1:L59G0cUxF7ZsLomfVHi1PMXKGAjulKmm2hjLTgt3uic= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.142.0/go.mod h1:TeJMg8YjVMx9w+vYu6HD15o37zW2HUizPZrh58hUSGY= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.142.0 h1:MVWXMTn2ja/RZlJNdjqD4aD6foCaRvbUqaG7+D806j8= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.142.0/go.mod h1:Uib/zzXO/SPxG+WH45ztKUM3dDgN4ztLMwq9+qsvDVg= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.142.0 h1:CiIPboEMYQxAc0BQvz+6UioozEH/Q/bkWZJn6hXrNMs= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.142.0/go.mod h1:6NCC/2rSWg+B2zhM1ILka00vwSuHpLU9UkqmYb8AO+A= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.142.0 h1:YNnphtz6PC3N6pDm7T2mGPPqvV5ynv00WNFjwAz2D4c= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.142.0/go.mod h1:NFNazUgXeRHg527kmlulZAoSBIUAmEoocg0vM2MoPSs= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.142.0 h1:eJpeg8Z7hvuRX/J9iWOdzOl31QNKJh1S0DGgp7/By+Y= 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= @@ -2590,6 +2610,8 @@ go.opentelemetry.io/collector/scraper v0.142.0 h1:f37NTJBicYpVr5dcnINCuKc3AHgZOP go.opentelemetry.io/collector/scraper v0.142.0/go.mod h1:GLN3c0B/c+xTaCe5oxO4T8RQ7+zHAYfZrxJdZ92NiqM= go.opentelemetry.io/collector/scraper/scraperhelper v0.142.0 h1:1FzLPll3R+X1MC1MLMTyHVC6XngGTOijsQ/KAccfh+4= go.opentelemetry.io/collector/scraper/scraperhelper v0.142.0/go.mod h1:jibHXSU+6MK1E0qXzCB7OSMxw2LImKXM7Zv3cNvMzMM= +go.opentelemetry.io/collector/scraper/scrapertest v0.142.0 h1:j57Cb5sRg4VSh7KDO1ns+HKItk7OYCoNXkMT/ajtW4I= +go.opentelemetry.io/collector/scraper/scrapertest v0.142.0/go.mod h1:6ad9eiqrwPTnUbLye5Xoygaa+FfC3dN6T5y6v9WGgeI= go.opentelemetry.io/collector/semconv v0.128.1-0.20250610090210-188191247685 h1:XCN7qkZRNzRYfn6chsMZkbFZxoFcW6fZIsZs2aCzcbc= go.opentelemetry.io/collector/semconv v0.128.1-0.20250610090210-188191247685/go.mod h1:OPXer4l43X23cnjLXIZnRj/qQOjSuq4TgBLI76P9hns= go.opentelemetry.io/collector/service v0.142.0 h1:3p2V3E3v97bmjJB591VkHlZQ+ez/PjGDHDF247jImLo= @@ -3075,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= @@ -3244,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/dependency-replacements.yaml b/dependency-replacements.yaml index 0401cf3665e..f20130bad94 100644 --- a/dependency-replacements.yaml +++ b/dependency-replacements.yaml @@ -122,3 +122,9 @@ replaces: - comment: Replace controller-runtime with pinned version dependency: sigs.k8s.io/controller-runtime replacement: sigs.k8s.io/controller-runtime v0.20.4 + + - comment: > + Fork to grafana repo to address issue with freebsd build tags. + This can be removed once https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/42645 is fixed + dependency: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver + replacement: github.com/grafana/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.0.0-20260126095124-0af81a9e8966 diff --git a/docs/sources/_index.md b/docs/sources/_index.md index d4af9b30354..2eb8e37c79d 100644 --- a/docs/sources/_index.md +++ b/docs/sources/_index.md @@ -11,6 +11,9 @@ cascade: BEYLA_VERSION: v2.8.5 FULL_PRODUCT_NAME: Grafana Alloy PRODUCT_NAME: Alloy + FULL_OTEL_ENGINE: Alloy OpenTelemetry Engine + OTEL_ENGINE: OTel Engine + DEFAULT_ENGINE: Default Engine hero: title: Grafana Alloy level: 1 diff --git a/docs/sources/_index.md.t b/docs/sources/_index.md.t index 6d9888a58dc..84216af5bac 100644 --- a/docs/sources/_index.md.t +++ b/docs/sources/_index.md.t @@ -11,6 +11,9 @@ cascade: BEYLA_VERSION: v2.8.5 FULL_PRODUCT_NAME: Grafana Alloy PRODUCT_NAME: Alloy + FULL_OTEL_ENGINE: Alloy OpenTelemetry Engine + OTEL_ENGINE: OTel Engine + DEFAULT_ENGINE: Default Engine hero: title: Grafana Alloy level: 1 diff --git a/docs/sources/opentelemetry/_index.md b/docs/sources/opentelemetry/_index.md new file mode 100644 index 00000000000..4143d871f36 --- /dev/null +++ b/docs/sources/opentelemetry/_index.md @@ -0,0 +1,152 @@ +--- +canonical: https://grafana.com/docs/alloy/latest/opentelemetry/ +description: Grafana Alloy is a flexible, high performance, vendor-neutral distribution of the OpenTelemetry Collector +menuTitle: OpenTelemetry Engine +title: The OpenTelemetry Engine +_build: + list: false +noindex: true +weight: 10 +--- + +# The {{% param "FULL_OTEL_ENGINE" %}} + +{{< param "FULL_PRODUCT_NAME" >}} combines the Prometheus-native, production-grade collection features of {{< param "PRODUCT_NAME" >}} with the broad ecosystem and standards of OpenTelemetry. +The {{< param "FULL_OTEL_ENGINE" >}} is a bundled OpenTelemetry Collector distribution embedded within {{< param "PRODUCT_NAME" >}} that lets you run {{< param "PRODUCT_NAME" >}} as a fully compatible OTel Collector while retaining access to all {{< param "PRODUCT_NAME" >}} features and integrations. + +{{< docs/shared lookup="stability/experimental_otel.md" source="alloy" version="" >}} + +## Terminology + +{{< param "PRODUCT_NAME" >}} supports two runtime engines and an extension: + +- **{{< param "DEFAULT_ENGINE" >}}**: The default {{< param "PRODUCT_NAME" >}} runtime and [configuration syntax](../get-started/syntax/). + This remains the default, stable experience with [backward compatibility](../introduction/backward-compatibility/) guarantees for {{< param "PRODUCT_NAME" >}} users. + +- **{{< param "OTEL_ENGINE" >}}**: The standard OpenTelemetry Collector runtime embedded within {{< param "PRODUCT_NAME" >}}. + It uses [upstream collector YAML configuration](https://opentelemetry.io/docs/collector/configuration/) for pipelines and components. + +- **{{< param "PRODUCT_NAME" >}} Engine extension**: An OpenTelemetry Collector extension that allows you to run both the {{< param "DEFAULT_ENGINE" >}} and the {{< param "OTEL_ENGINE" >}} in parallel. + +## Included components + +The {{< param "OTEL_ENGINE" >}} bundle includes: + +- Standard components from the OpenTelemetry Collector core +- A curated selection of components from contributor repositories +- The `alloyengine` extension + +The following sections list all included components: + +{{< collapse title="Extensions" >}} + +- [alloyengine](https://github.com/grafana/alloy/tree/main/extension/alloyengine) +- [basicauth](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/basicauthextension) +- [bearertokenauth](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/bearertokenauthextension) +- [headerssetter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/headerssetterextension) +- [healthcheck](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/healthcheckextension) +- [jaegerremotesampling](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/jaegerremotesampling) +- [oauth2clientauth](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/oauth2clientauthextension) +- [pprof](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/pprofextension) +- [sigv4auth](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/sigv4authextension) +- [filestorage](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/storage/filestorage) +- [zpages](https://github.com/open-telemetry/opentelemetry-collector/tree/main/extension/zpagesextension) + +{{< /collapse >}} + +{{< collapse title="Configuration Providers" >}} + +- [env](https://github.com/open-telemetry/opentelemetry-collector/tree/main/confmap/provider/envprovider) +- [file](https://github.com/open-telemetry/opentelemetry-collector/tree/main/confmap/provider/fileprovider) +- [http](https://github.com/open-telemetry/opentelemetry-collector/tree/main/confmap/provider/httpprovider) +- [https](https://github.com/open-telemetry/opentelemetry-collector/tree/main/confmap/provider/httpsprovider) +- [yaml](https://github.com/open-telemetry/opentelemetry-collector/tree/main/confmap/provider/yamlprovider) + +{{< /collapse >}} + +{{< collapse title="Receivers" >}} + +- [awscloudwatch](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/awscloudwatchreceiver) +- [awsecscontainermetrics](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/awsecscontainermetricsreceiver) +- [awss3](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/awss3receiver) +- [cloudflare](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/cloudflarereceiver) +- [datadog](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/datadogreceiver) +- [faro](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/faroreceiver) +- [filelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/filelogreceiver) +- [filestats](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/filestatsreceiver) +- [fluentforward](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/fluentforwardreceiver) +- [googlecloudpubsub](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/googlecloudpubsubreceiver) +- [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) +- [tcplog](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/tcplogreceiver) +- [vcenter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/vcenterreceiver) +- [zipkin](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/zipkinreceiver) +- [otlp](https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver) +{{< /collapse >}} + +{{< collapse title="Connectors" >}} +- [count](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/connector/countconnector) +- [grafanacloud](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/connector/grafanacloudconnector) +- [servicegraph](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/connector/servicegraphconnector) +- [spanmetrics](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/connector/spanmetricsconnector) +- [forward](https://github.com/open-telemetry/opentelemetry-collector/tree/main/connector/forwardconnector) + +{{< /collapse >}} + +{{< collapse title="Processors" >}} + +- [attributes](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/attributesprocessor) +- [cumulativetodelta](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/cumulativetodeltaprocessor) +- [deltatocumulative](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/deltatocumulativeprocessor) +- [filter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/filterprocessor) +- [groupbyattrs](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/groupbyattrsprocessor) +- [interval](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/intervalprocessor) +- [k8sattributes](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/k8sattributesprocessor) +- [metricstarttime](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/metricstarttimeprocessor) +- [probabilisticsampler](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/probabilisticsamplerprocessor) +- [resource](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/resourceprocessor) +- [resourcedetection](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/resourcedetectionprocessor) +- [span](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/spanprocessor) +- [tailsampling](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/tailsamplingprocessor) +- [transform](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/transformprocessor) +- [batch](https://github.com/open-telemetry/opentelemetry-collector/tree/main/processor/batchprocessor) +- [memorylimiter](https://github.com/open-telemetry/opentelemetry-collector/tree/main/processor/memorylimiterprocessor) + +{{< /collapse >}} + +{{< collapse title="Exporters" >}} + +- [awss3](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/awss3exporter) +- [faro](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/faroexporter) +- [file](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/fileexporter) +- [googlecloud](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/googlecloudexporter) +- [googlecloudpubsub](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/googlecloudpubsubexporter) +- [kafka](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/kafkaexporter) +- [loadbalancing](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/loadbalancingexporter) +- [prometheus](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/prometheusexporter) +- [prometheusremotewrite](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/prometheusremotewriteexporter) +- [splunkhec](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/splunkhecexporter) +- [syslog](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/syslogexporter) +- [zipkin](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/zipkinexporter) +- [debug](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/debugexporter) +- [nop](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/nopexporter) +- [otlp](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlpexporter) +- [otlphttp](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlphttpexporter) + +{{< /collapse >}} + +To view the full list of components and their versions, refer to the [OpenTelemetry Collector Builder manifest](https://github.com/grafana/alloy/blob/main/collector/builder-config.yaml). + +## Next steps + +- [Get started](./get-started/) with the {{< param "OTEL_ENGINE" >}} +- [OTel CLI](../reference/cli/otel/) reference documentation + diff --git a/docs/sources/opentelemetry/get-started.md b/docs/sources/opentelemetry/get-started.md new file mode 100644 index 00000000000..2c8afdd3279 --- /dev/null +++ b/docs/sources/opentelemetry/get-started.md @@ -0,0 +1,168 @@ +--- +canonical: https://grafana.com/docs/alloy/latest/opentelemetry/get-started +description: Get started with the Alloy OpenTelemetry Engine +menuTitle: Get Started +title: Get Started with the Alloy OpenTelemetry Engine +_build: + list: false +noindex: true +weight: 10 +--- + +# Get Started with the {{% param "FULL_OTEL_ENGINE" %}} + +You can run the {{< param "OTEL_ENGINE" >}} using the CLI, Helm chart, or service installation. + +## Prerequisites + +There are no additional prerequisites. +The tools needed to run the {{< param "OTEL_ENGINE" >}} are shipped within {{< param "PRODUCT_NAME" >}}. + +Before you start, validate your OpenTelemetry YAML configuration with the `validate` command: + +```bash +./build/alloy otel validate --config= +``` + +## Run with the CLI + +The {{< param "OTEL_ENGINE" >}} is available under the {{< param "PRODUCT_NAME" >}} `otel` command. +The CLI is the easiest way to experiment locally or on a single host. +Refer to the [OTel CLI](../../reference/cli/otel/) documentation for more information. + +The following example configuration file accepts telemetry over [OTLP](https://opentelemetry.io/docs/specs/otel/protocol/) and sends it to the configured backend: + +```yaml +extensions: + basicauth/my_auth: + client_auth: + username: + password: + +receivers: + otlp: + protocols: + grpc: {} + http: {} + +processors: + batch: + timeout: 1s + send_batch_size: 512 + +exporters: + otlphttp/my_backend: + endpoint: + auth: + authenticator: basicauth/my_auth + +service: + extensions: [basicauth/my_auth] + pipelines: + traces: + receivers: [otlp] + processors: [batch] + exporters: [otlphttp/my_backend] +``` + +Replace the following: + +- _``_: Your username, if you are using Grafana Cloud this will be your Grafana Cloud instance ID. +- _``_: Your password, if you are using Grafana Cloud this will be your Grafana Cloud API token. +- _``_: The URL to export data to, if you are using Grafana Cloud this will be your Grafana Cloud OTLP endpoint URL. + +For more information about where to find these values for Grafana Cloud, refer to [Send data using OpenTelemetry Protocol](https://grafana.com/docs/grafana-cloud/send-data/otlp/send-data-otlp/). + +To start the {{< param "OTEL_ENGINE" >}}, run the following command: + +```shell +alloy otel --config= [ ...] +``` + +{{< param "PRODUCT_NAME" >}} then accepts incoming OTLP data on `0.0.0.0:4317` for gRPC and `0.0.0.0:4318` for HTTP requests. +Metrics are also available on the default collector port and endpoint at `0.0.0.0:8888/metrics`. +Since the {{< param "DEFAULT_ENGINE" >}} isn't running, the UI and metrics aren't available at `0.0.0.0:12345/metrics`. + +### Run the {{% param "PRODUCT_NAME" %}} Engine extension + +You can also run the {{< param "OTEL_ENGINE" >}} with the {{< param "DEFAULT_ENGINE" >}}. +Modify your YAML configuration to include the `alloyengine` extension, which accepts a path to the {{< param "DEFAULT_ENGINE" >}} configuration and starts a {{< param "DEFAULT_ENGINE" >}} pipeline alongside the {{< param "OTEL_ENGINE" >}} pipeline. + +The following example shows the configuration: + +```yaml +extensions: + basicauth/my_auth: + client_auth: + username: + password: + alloyengine: + config: + file: + flags: + server.http.listen-addr: 0.0.0.0:12345 + +receivers: + otlp: + protocols: + grpc: {} + http: {} + +processors: + batch: + timeout: 1s + send_batch_size: 512 + +exporters: + otlphttp/my_backend: + endpoint: + auth: + authenticator: basicauth/my_auth + +service: + extensions: [basicauth/my_auth, alloyengine] + pipelines: + traces: + receivers: [otlp] + processors: [batch] + exporters: [otlphttp/my_backend] +``` + +Replace the following: + +- _``_: The path to your {{< param "DEFAULT_ENGINE" >}} configuration file. +- _``_: Your username, if you are using Grafana Cloud this will be your Grafana Cloud instance ID. +- _``_: Your password, if you are using Grafana Cloud this will be your Grafana Cloud API token. +- _``_: The URL to export data to, if you are using Grafana Cloud this will be your Grafana Cloud OTLP endpoint URL. + +This example adds the `alloyengine` block in the extension declarations and enables the extension in the `service` block. +You can then run {{< param "PRODUCT_NAME" >}} with the exact same command as before: + +```shell +alloy otel --config= [ ...] +``` + +This starts both the {{< param "DEFAULT_ENGINE" >}} and {{< param "OTEL_ENGINE" >}}. +The output of both engines is visible in the logs. +You can access the {{< param "DEFAULT_ENGINE" >}} UI and metrics on port `12345`. + +## Run with {{% param "PRODUCT_NAME" %}} Helm chart + +TODO + +## Run with service installation + +Service installation support for systemd, launchd, and similar systems isn't included in the initial experimental release. +Service installers will work seamlessly with the {{< param "OTEL_ENGINE" >}} as the feature matures. +In the meantime, use the CLI or Helm options for testing. + +## Considerations + +1. **Storage configuration**: The {{< param "DEFAULT_ENGINE" >}} accepts the `--storage.path` flag to set a base directory for components to store data on disk. + The {{< param "OTEL_ENGINE" >}} uses the `filestorage` extension instead of a CLI flag. + Refer to the [upstream documentation](https://opentelemetry.io/docs/collector/resiliency/#persistent-storage-write-ahead-log---wal) for more information. +1. **Server ports**: The {{< param "DEFAULT_ENGINE" >}} exposes its HTTP server on port `12345`. + The {{< param "OTEL_ENGINE" >}} exposes its HTTP server on port `8888`. + The {{< param "OTEL_ENGINE" >}} HTTP server doesn't expose a UI, support bundles, or reload endpoint functionality like the {{< param "DEFAULT_ENGINE" >}}. +1. **Fleet management**: [Grafana Fleet Management](https://grafana.com/blog/opentelemetry-and-grafana-labs-whats-new-and-whats-next-in-2026/#fleet-management) isn't supported yet for the {{< param "OTEL_ENGINE" >}}. + You must define and manage the input configuration manually. \ No newline at end of file diff --git a/docs/sources/reference/cli/otel.md b/docs/sources/reference/cli/otel.md index 135a2b3ecad..c010f3b1dec 100644 --- a/docs/sources/reference/cli/otel.md +++ b/docs/sources/reference/cli/otel.md @@ -19,9 +19,10 @@ weight: 350 [experimental]: https://grafana.com/docs/release-life-cycle/ -The `otel` command runs Grafana Alloy using the OpenTelemetry (OTel) Collector engine. This command accepts OpenTelemetry Collector YAML configuration files. +The `otel` command runs {{< param "PRODUCT_NAME" >}} with the {{< param "OTEL_ENGINE" >}}. This command accepts OpenTelemetry Collector YAML configuration files. -The Alloy OTel distribution includes receivers, processors, exporters, extensions, and connectors from the OpenTelemetry Collector core and contrib repositories. This includes components for OTLP, Prometheus, Kafka, Zipkin, and other popular integrations. +The {{< param "OTEL_ENGINE" >}} includes receivers, processors, exporters, extensions, and connectors from the OpenTelemetry Collector core and contrib repositories. +This includes components for OTLP, Prometheus, Kafka, Zipkin, and other popular integrations. As with the `run` command, this runs in the foreground until an interrupt is received. @@ -33,101 +34,27 @@ alloy otel --config= [ ...] Replace the following: -* _``_: Path to an OpenTelemetry Collector configuration file. -* _``_: One or more flags that configure the OpenTelemetry Collector. +- _``_: Path to an OpenTelemetry Collector configuration file. +- _``_: One or more flags that [configure the OpenTelemetry Collector](https://opentelemetry.io/docs/collector/configuration/). + These flags are the same as upstream. + Run `alloy otel --help` to show the complete list of supported flags. ## Configuration -The `otel` command accepts standard OpenTelemetry Collector YAML configuration files. The configuration file defines receivers, processors, exporters, and other components that make up your telemetry pipeline. +The `otel` command accepts standard OpenTelemetry Collector YAML configuration files. +The configuration file defines receivers, processors, exporters, and other components that make up your telemetry pipeline. -For information about configuration options, refer to the [OpenTelemetry Collector documentation](https://opentelemetry.io/docs/collector/configuration/). +### Run the {{% param "DEFAULT_ENGINE" %}} in parallel -### Optionally Running the Default Engine +The {{< param "OTEL_ENGINE" >}} includes the option to run pipelines with the {{< param "DEFAULT_ENGINE" >}} alongside the {{< param "OTEL_ENGINE" >}} using the built-in {{< param "PRODUCT_NAME" >}} Engine extension. -The Alloy Collector Distro includes the option to run pipelines using the Default Engine alongside the OTel Engine using the built in Alloy Engine extension. More information on how to run the extension can be found [here](https://github.com/grafana/alloy/blob/main/extension/alloyengine/README.md) +This runs a {{< param "DEFAULT_ENGINE" >}} pipeline _in parallel_ to the {{< param "OTEL_ENGINE" >}} pipeline. +The two pipelines can't natively interact. -This will run a Default Engine pipeline _in parallel_ to the OTel Engine pipeline - the two pipelines cannot natively interact. +### Examples -### Available Components - -The included components are based off the upstream core distribution, in order to ensure that full end-to-end pipelines are accessible for most use cases. In addition to upstream components, we also integrate some of our own components that enable functionality to work well within the Alloy ecosystem. - -To view the full list of components and their versioning, please refer to the [OCB manifest](https://github.com/grafana/alloy/blob/main/collector/builder-config.yaml) - -## Examples - -### Running with OTel Engine only - -This example runs the OTel Engine without the Alloy Engine extension: - -```shell -alloy otel --config=config.yaml -``` - -Example `config.yaml`: - -```yaml -receivers: - otlp: - protocols: - grpc: - endpoint: 0.0.0.0:4317 - -processors: - batch: - -exporters: - debug: - -service: - pipelines: - traces: - receivers: [otlp] - processors: [batch] - exporters: [debug] -``` - -### Running with OTel Engine and Alloy Engine extension - -This example runs both the OTel Engine and the Alloy Engine extension in parallel: - -```shell -alloy otel --config=config.yaml -``` - -Example `config.yaml`: - -```yaml -extensions: - alloyengine: - config: - file: path/to/alloy-config.alloy - flags: - server.http.listen-addr: 0.0.0.0:12345 - stability.level: experimental - -receivers: - otlp: - protocols: - grpc: - endpoint: 0.0.0.0:4317 - -processors: - batch: - -exporters: - debug: - -service: - extensions: [alloyengine] - pipelines: - traces: - receivers: [otlp] - processors: [batch] - exporters: [debug] -``` +Refer to [Get started](../../../opentelemetry/get-started/) for examples that show you how to run the {{< param "OTEL_ENGINE" >}} and {{< param "PRODUCT_NAME" >}} Engine extension. ## Related documentation -* [OpenTelemetry Collector documentation](https://opentelemetry.io/docs/collector/): Official OpenTelemetry Collector documentation. - +- [OpenTelemetry Collector documentation](https://opentelemetry.io/docs/collector/): Official OpenTelemetry Collector documentation. diff --git a/docs/sources/shared/stability/experimental_otel.md b/docs/sources/shared/stability/experimental_otel.md new file mode 100644 index 00000000000..73657681d1a --- /dev/null +++ b/docs/sources/shared/stability/experimental_otel.md @@ -0,0 +1,15 @@ +--- +canonical: https://grafana.com/docs/alloy/latest/shared/stability/experimental_otel/ +description: Shared content, experimental +headless: true +--- + +> **EXPERIMENTAL**: {{< param "OTEL_ENGINE" >}} is an [experimental][] feature. +> Experimental features are subject to frequent breaking changes, and may be removed with no equivalent replacement. +> +> To maintain full compatibility of the {{< param "OTEL_ENGINE" >}} with the upstream OpenTelemetry Collector and expose a compatible command line interface, the {{< param "OTEL_ENGINE" >}} isn't hidden behind a stability [flag][]. +> +> Make sure that you understand the risks involved before using an experimental feature in your production environments. + +[flag]: https://grafana.com/docs/alloy//reference/cli/run/ +[experimental]: https://grafana.com/docs/release-life-cycle/ diff --git a/extension/alloyengine/go.mod b/extension/alloyengine/go.mod index 7fdb89b1e36..2960894df27 100644 --- a/extension/alloyengine/go.mod +++ b/extension/alloyengine/go.mod @@ -1057,4 +1057,7 @@ replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.2.8 // Replace controller-runtime with pinned version replace sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.20.4 +// Fork to grafana repo to address issue with freebsd build tags. This can be removed once https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/42645 is fixed +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver => github.com/grafana/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.0.0-20260126095124-0af81a9e8966 + // END GENERATED REPLACES diff --git a/extension/alloyengine/go.sum b/extension/alloyengine/go.sum index de15e3175f7..0fc5c1230aa 100644 --- a/extension/alloyengine/go.sum +++ b/extension/alloyengine/go.sum @@ -1179,6 +1179,8 @@ github.com/grafana/mysqld_exporter v0.17.2-0.20250226152553-be612e3fdedd h1:FW1K github.com/grafana/mysqld_exporter v0.17.2-0.20250226152553-be612e3fdedd/go.mod h1:iEFA+REkm+0WRvVxy0cA1bBhJlFcQB998yymb45TqMU= github.com/grafana/node_exporter v0.18.1-grafana-r01.0.20251024135609-318b01780c89 h1:Ab3Z4AXC1Hffr4NbeYq0vTQhJbiGTTO2xd0ZV0kC1v8= github.com/grafana/node_exporter v0.18.1-grafana-r01.0.20251024135609-318b01780c89/go.mod h1:BUJCdmzfsndvLKeFuONqMPsEA0fkeVuAyt8II4Lk0Dg= +github.com/grafana/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.0.0-20260126095124-0af81a9e8966 h1:flIED1bVVc8XGgEM9J2M8oRnllD0R+Gydf/mXHSeww0= +github.com/grafana/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.0.0-20260126095124-0af81a9e8966/go.mod h1:TeJMg8YjVMx9w+vYu6HD15o37zW2HUizPZrh58hUSGY= github.com/grafana/opentelemetry-collector/featuregate v0.0.0-20240325174506-2fd1623b2ca0 h1:i/Ne0XwoRokYj52ZcSmnvuyID3h/uA91n0Ycg/grHU8= github.com/grafana/opentelemetry-collector/featuregate v0.0.0-20240325174506-2fd1623b2ca0/go.mod h1:mm8+xyQfgDmqhyegZRNIQmoKsNnDTwWKFLsdMoXAb7A= github.com/grafana/opentelemetry-ebpf-instrumentation v1.4.11 h1:Pi46xuPzRjAeB6XB4PzdF8kV93jl4NB58OZj08Bi33U= @@ -1917,8 +1919,6 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/faroreceiver github.com/open-telemetry/opentelemetry-collector-contrib/receiver/faroreceiver v0.142.0/go.mod h1:Lqa348mf7+Uds6a4TirRVy2RuSZOhISrlZxrF50tTwE= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.142.0 h1:PiArV40Tn4GrwLtL9RWfrN3vC+lx69uVAy1p+Zo+Y7k= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.142.0/go.mod h1:WyUGg8RamQ3HnKTTVy6AEROyro5W/qB++VXMboz12rI= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.142.0 h1:L59G0cUxF7ZsLomfVHi1PMXKGAjulKmm2hjLTgt3uic= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.142.0/go.mod h1:TeJMg8YjVMx9w+vYu6HD15o37zW2HUizPZrh58hUSGY= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.142.0 h1:MVWXMTn2ja/RZlJNdjqD4aD6foCaRvbUqaG7+D806j8= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.142.0/go.mod h1:Uib/zzXO/SPxG+WH45ztKUM3dDgN4ztLMwq9+qsvDVg= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.142.0 h1:CiIPboEMYQxAc0BQvz+6UioozEH/Q/bkWZJn6hXrNMs= diff --git a/go.mod b/go.mod index bee286e9a69..791fe2028fa 100644 --- a/go.mod +++ b/go.mod @@ -1098,4 +1098,7 @@ replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.2.8 // Replace controller-runtime with pinned version replace sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.20.4 +// Fork to grafana repo to address issue with freebsd build tags. This can be removed once https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/42645 is fixed +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver => github.com/grafana/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.0.0-20260126095124-0af81a9e8966 + // END GENERATED REPLACES diff --git a/go.sum b/go.sum index 2b4ccf58f04..83a66f910a5 100644 --- a/go.sum +++ b/go.sum @@ -1189,6 +1189,8 @@ github.com/grafana/mysqld_exporter v0.17.2-0.20250226152553-be612e3fdedd h1:FW1K github.com/grafana/mysqld_exporter v0.17.2-0.20250226152553-be612e3fdedd/go.mod h1:iEFA+REkm+0WRvVxy0cA1bBhJlFcQB998yymb45TqMU= github.com/grafana/node_exporter v0.18.1-grafana-r01.0.20251024135609-318b01780c89 h1:Ab3Z4AXC1Hffr4NbeYq0vTQhJbiGTTO2xd0ZV0kC1v8= github.com/grafana/node_exporter v0.18.1-grafana-r01.0.20251024135609-318b01780c89/go.mod h1:BUJCdmzfsndvLKeFuONqMPsEA0fkeVuAyt8II4Lk0Dg= +github.com/grafana/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.0.0-20260126095124-0af81a9e8966 h1:flIED1bVVc8XGgEM9J2M8oRnllD0R+Gydf/mXHSeww0= +github.com/grafana/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.0.0-20260126095124-0af81a9e8966/go.mod h1:TeJMg8YjVMx9w+vYu6HD15o37zW2HUizPZrh58hUSGY= github.com/grafana/opentelemetry-collector/featuregate v0.0.0-20240325174506-2fd1623b2ca0 h1:i/Ne0XwoRokYj52ZcSmnvuyID3h/uA91n0Ycg/grHU8= github.com/grafana/opentelemetry-collector/featuregate v0.0.0-20240325174506-2fd1623b2ca0/go.mod h1:mm8+xyQfgDmqhyegZRNIQmoKsNnDTwWKFLsdMoXAb7A= github.com/grafana/opentelemetry-ebpf-instrumentation v1.4.11 h1:Pi46xuPzRjAeB6XB4PzdF8kV93jl4NB58OZj08Bi33U= @@ -1928,8 +1930,6 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/faroreceiver github.com/open-telemetry/opentelemetry-collector-contrib/receiver/faroreceiver v0.142.0/go.mod h1:Lqa348mf7+Uds6a4TirRVy2RuSZOhISrlZxrF50tTwE= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.142.0 h1:PiArV40Tn4GrwLtL9RWfrN3vC+lx69uVAy1p+Zo+Y7k= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.142.0/go.mod h1:WyUGg8RamQ3HnKTTVy6AEROyro5W/qB++VXMboz12rI= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.142.0 h1:L59G0cUxF7ZsLomfVHi1PMXKGAjulKmm2hjLTgt3uic= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.142.0/go.mod h1:TeJMg8YjVMx9w+vYu6HD15o37zW2HUizPZrh58hUSGY= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.142.0 h1:MVWXMTn2ja/RZlJNdjqD4aD6foCaRvbUqaG7+D806j8= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.142.0/go.mod h1:Uib/zzXO/SPxG+WH45ztKUM3dDgN4ztLMwq9+qsvDVg= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.142.0 h1:CiIPboEMYQxAc0BQvz+6UioozEH/Q/bkWZJn6hXrNMs= 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/packaging/docker/otelcol.cmd b/packaging/docker/otelcol.cmd new file mode 100644 index 00000000000..40033259353 --- /dev/null +++ b/packaging/docker/otelcol.cmd @@ -0,0 +1,4 @@ +@echo off +REM Compatibility wrapper for OpenTelemetry Collector integrations. +REM Delegate to Alloy's OTel engine and pass through all arguments. +"C:\Program Files\GrafanaLabs\Alloy\alloy.exe" otel %* diff --git a/packaging/docker/otelcol.sh b/packaging/docker/otelcol.sh new file mode 100644 index 00000000000..7f690787485 --- /dev/null +++ b/packaging/docker/otelcol.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env sh +# Compatibility wrapper for OpenTelemetry Collector integrations. +# Delegate to Alloy's OTel engine and pass through all arguments. +exec /bin/alloy otel "$@" 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