From c399c7855535bc98e6911baf1a18e80f534f2f10 Mon Sep 17 00:00:00 2001 From: Alex Lew Date: Wed, 26 Feb 2025 09:55:42 -0800 Subject: [PATCH 1/2] fix: bump alpine version --- packaging/docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index 4f00de6c8..adaba0fca 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.3 AS directories +FROM alpine:3.21.3 AS directories RUN mkdir -p /var/lib/observe-agent/filestorage -FROM alpine:3.20.3 AS certs +FROM alpine:3.21.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.3 +FROM alpine:3.21.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 From fd4c0ec6f7ad27203f5774f9f5487cfaa42cc068 Mon Sep 17 00:00:00 2001 From: Alex Lew Date: Wed, 26 Feb 2025 11:51:15 -0800 Subject: [PATCH 2/2] feat: bump to go1.22.12 --- .github/workflows/release-build.yaml | 2 +- .github/workflows/release-nightly.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/tests-integration.yaml | 2 +- .github/workflows/tests-unit.yaml | 2 +- README.md | 2 +- components/processors/observek8sattributesprocessor/go.mod | 2 +- go.mod | 2 +- go.work | 2 +- internal/tools/go.mod | 2 +- observecol/go.mod | 2 +- vendor/modules.txt | 6 +++--- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release-build.yaml b/.github/workflows/release-build.yaml index a1328d29b..79953495f 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.8 + go-version: 1.22.12 - 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 8c09fe68d..186627371 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.8 + go-version: 1.22.12 - name: Install msitools run: sudo apt-get install -y wixl diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2a36b3587..9a28208d5 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.8 + go-version: 1.22.12 - name: Install msitools run: sudo apt-get install -y wixl diff --git a/.github/workflows/tests-integration.yaml b/.github/workflows/tests-integration.yaml index ceef0019c..1ded07561 100644 --- a/.github/workflows/tests-integration.yaml +++ b/.github/workflows/tests-integration.yaml @@ -34,7 +34,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.8 + go-version: 1.22.12 - name: Install msitools run: sudo apt-get install -y wixl - name: Install qemu diff --git a/.github/workflows/tests-unit.yaml b/.github/workflows/tests-unit.yaml index 731eba6c6..b7bf96632 100644 --- a/.github/workflows/tests-unit.yaml +++ b/.github/workflows/tests-unit.yaml @@ -18,7 +18,7 @@ jobs: test: strategy: matrix: - go: [ 1.22.8 ] + go: [ 1.22.12 ] platform: [ ubuntu-latest ] runs-on: ${{ matrix.platform }} steps: diff --git a/README.md b/README.md index 428e77a77..a748c72e6 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Code for the Observe agent and CLI. The agent code is based on the OpenTelemetry # Build -To run the code you need to have `golang v1.22.8` installed. Then you can run the following command to compile the binary. +To run the code you need to have `golang v1.22.12` installed. Then you can run the following command to compile the binary. ```sh go build -o observe-agent diff --git a/components/processors/observek8sattributesprocessor/go.mod b/components/processors/observek8sattributesprocessor/go.mod index 70d37f292..70d516171 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.8 +go 1.22.12 require ( github.com/jmespath/go-jmespath v0.4.0 diff --git a/go.mod b/go.mod index d953e4853..a674a9a4d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/observeinc/observe-agent -go 1.22.8 +go 1.22.12 require ( github.com/jarcoal/httpmock v1.3.1 diff --git a/go.work b/go.work index 984f7d489..be452a7e5 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.22.8 +go 1.22.12 use ( . diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 2979972ac..220db2ec0 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -1,6 +1,6 @@ module observe-agent/internal/tools -go 1.22.8 +go 1.22.12 require ( github.com/go-viper/mapstructure/v2 v2.1.0 // indirect diff --git a/observecol/go.mod b/observecol/go.mod index 7d9a02435..62e7c86de 100644 --- a/observecol/go.mod +++ b/observecol/go.mod @@ -2,7 +2,7 @@ module github.com/observeinc/observe-agent/observecol -go 1.22.8 +go 1.22.12 require ( github.com/observeinc/observe-agent v0.0.0-00010101000000-000000000000 diff --git a/vendor/modules.txt b/vendor/modules.txt index a6881459d..7cbb06b31 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -838,11 +838,11 @@ github.com/munnerz/goautoneg ## explicit github.com/mwitkow/go-conntrack # github.com/observeinc/observe-agent v0.0.0-00010101000000-000000000000 => . -## explicit; go 1.22.8 +## explicit; go 1.22.12 # github.com/observeinc/observe-agent/components/processors/observek8sattributesprocessor v0.0.0-00010101000000-000000000000 => ./components/processors/observek8sattributesprocessor -## explicit; go 1.22.8 +## explicit; go 1.22.12 # github.com/observeinc/observe-agent/observecol v0.0.0-00010101000000-000000000000 => ./observecol -## explicit; go 1.22.8 +## explicit; go 1.22.12 # github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.118.0 ## explicit; go 1.22.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector