diff --git a/.github/workflows/release-build.yaml b/.github/workflows/release-build.yaml index 8c3b89a39..325ad02b3 100644 --- a/.github/workflows/release-build.yaml +++ b/.github/workflows/release-build.yaml @@ -25,7 +25,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.5 + go-version: 1.22.7 - name: Install msitools run: sudo apt-get install -y wixl # More assembly might be required: Docker logins, GPG, etc. diff --git a/.github/workflows/release-nightly.yaml b/.github/workflows/release-nightly.yaml index 5c89c0fe1..f8321c00f 100644 --- a/.github/workflows/release-nightly.yaml +++ b/.github/workflows/release-nightly.yaml @@ -26,7 +26,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.5 + go-version: 1.22.7 - name: Install msitools run: sudo apt-get install -y wixl # More assembly might be required: Docker logins, GPG, etc. diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 25b8cd729..56a2706a9 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -22,7 +22,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.5 + go-version: 1.22.7 - name: Install msitools run: sudo apt-get install -y wixl # More assembly might be required: Docker logins, GPG, etc. diff --git a/.github/workflows/tests-integration.yaml b/.github/workflows/tests-integration.yaml index ec2adce56..06c621ff3 100644 --- a/.github/workflows/tests-integration.yaml +++ b/.github/workflows/tests-integration.yaml @@ -32,7 +32,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.5 + go-version: 1.22.7 - name: Install msitools run: sudo apt-get install -y wixl - name: Install qemu diff --git a/cmd/collector/go.mod b/cmd/collector/go.mod index dcfaafd0b..ce821c8a6 100644 --- a/cmd/collector/go.mod +++ b/cmd/collector/go.mod @@ -2,7 +2,7 @@ module observe/otelcol -go 1.22.5 +go 1.22.7 require ( github.com/observeinc/observe-agent/components/processors/observek8sattributesprocessor v0.0.0-00010101000000-000000000000 diff --git a/components/processors/observek8sattributesprocessor/go.mod b/components/processors/observek8sattributesprocessor/go.mod index 61bcd5797..3c4ec6c5d 100644 --- a/components/processors/observek8sattributesprocessor/go.mod +++ b/components/processors/observek8sattributesprocessor/go.mod @@ -1,6 +1,6 @@ module github.com/observeinc/observe-agent/components/processors/observek8sattributesprocessor -go 1.22.5 +go 1.22.7 require ( github.com/stretchr/testify v1.9.0 diff --git a/go.mod b/go.mod index 23b36b071..2cea41536 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module observe-agent -go 1.22.5 +go 1.22.7 require ( github.com/prometheus/client_model v0.6.1 diff --git a/go.work b/go.work index f48623cb7..2d4ef2966 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.22.5 +go 1.22.7 use ( . diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 27cc7caf7..9959951f1 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -1,6 +1,6 @@ module observe-agent/internal/tools -go 1.22.5 +go 1.22.7 require ( github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index 49826ac4a..e026e44a8 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -12,10 +12,10 @@ RUN tar czhf observe-agent.tar.gz /observe-agent $(ldd /observe-agent | grep -oP # however, we can copy full directory as root (/) to be base file structure for scratch image RUN mkdir /output && tar xf /observe-agent.tar.gz --directory /output -FROM alpine:3.20.2 AS directories +FROM alpine:3.20.3 AS directories RUN mkdir -p /var/lib/observe-agent/filestorage -FROM alpine:3.20.2 AS certs +FROM alpine:3.20.3 AS certs RUN apk --update add ca-certificates FROM debian:12.5 AS systemd @@ -28,7 +28,7 @@ RUN tar czhf journalctl.tar.gz /bin/journalctl $(ldd /bin/journalctl | grep -oP # however, we can copy full directory as root (/) to be base file structure for scratch image RUN mkdir /output && tar xf /journalctl.tar.gz --directory /output -FROM alpine:3.20.2 +FROM alpine:3.20.3 ADD packaging/docker/observe-agent /etc/observe-agent COPY --from=systemd /output/ / COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt diff --git a/vendor/modules.txt b/vendor/modules.txt index 0bec7cf6a..91078b384 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -706,7 +706,7 @@ github.com/munnerz/goautoneg ## explicit github.com/mwitkow/go-conntrack # github.com/observeinc/observe-agent/components/processors/observek8sattributesprocessor v0.0.0-00010101000000-000000000000 => ./components/processors/observek8sattributesprocessor -## explicit; go 1.22.5 +## explicit; go 1.22.7 # github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.107.0 ## explicit; go 1.21.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector