From cd103b16ec72379e156726b5e353de4d8cc89152 Mon Sep 17 00:00:00 2001 From: Ron Federman <73110295+RonFed@users.noreply.github.com> Date: Thu, 2 May 2024 09:55:22 +0300 Subject: [PATCH] Upgrade to go 1.22 (#1152) --- .github/workflows/build.yaml | 6 +++--- .github/workflows/e2e.yaml | 2 +- .github/workflows/go-mod-tidy.yml | 2 +- .github/workflows/publish-cli.yml | 2 +- .github/workflows/publish-modules.yml | 2 +- .github/workflows/verify-api-crds.yml | 2 +- .github/workflows/verify-collector-ocb.yml | 2 +- Dockerfile | 2 +- api/go.mod | 2 +- autoscaler/go.mod | 4 +--- cli/go.mod | 2 +- collector/Dockerfile | 2 +- common/go.mod | 2 +- destinations/go.mod | 2 +- frontend/Dockerfile | 2 +- frontend/go.mod | 2 +- go.work | 8 +++----- instrumentor/go.mod | 4 +--- odiglet/Dockerfile | 2 +- odiglet/base.Dockerfile | 2 +- odiglet/debug.Dockerfile | 2 +- odiglet/go.mod | 4 +--- procdiscovery/go.mod | 4 +--- scheduler/go.mod | 4 +--- 24 files changed, 28 insertions(+), 40 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e1eaa953c..1d82fc979 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -38,7 +38,7 @@ jobs: uses: docker/setup-buildx-action@v3 - uses: actions/setup-go@v5 with: - go-version: "1.21.0" + go-version: "1.22.0" - name: Build Instrumentor Image uses: docker/build-push-action@v5 with: @@ -83,7 +83,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.0" + go-version: "1.22.0" - name: Test common module working-directory: ./common run: | @@ -95,7 +95,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.0" + go-version: "1.22.0" - name: Test procdiscovery module working-directory: ./procdiscovery run: | diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 80f8be383..4f583a7ab 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "~1.21.2" + go-version: "~1.22" check-latest: true - name: Set up Helm uses: azure/setup-helm@v4 diff --git a/.github/workflows/go-mod-tidy.yml b/.github/workflows/go-mod-tidy.yml index 520a0b3af..ae75b75e7 100644 --- a/.github/workflows/go-mod-tidy.yml +++ b/.github/workflows/go-mod-tidy.yml @@ -10,7 +10,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.0" + go-version: "1.22" - name: run make go-mod-tidy run: make go-mod-tidy - name: Check clean repository diff --git a/.github/workflows/publish-cli.yml b/.github/workflows/publish-cli.yml index 5bd5c2670..5e3442e16 100644 --- a/.github/workflows/publish-cli.yml +++ b/.github/workflows/publish-cli.yml @@ -77,7 +77,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: "1.21.0" + go-version: "1.22" - uses: actions/setup-node@v4 with: diff --git a/.github/workflows/publish-modules.yml b/.github/workflows/publish-modules.yml index 16d628d59..eff2a3d1e 100644 --- a/.github/workflows/publish-modules.yml +++ b/.github/workflows/publish-modules.yml @@ -184,7 +184,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.21.0" + go-version: "1.22" - name: Run GoReleaser uses: goreleaser/goreleaser-action@v5 diff --git a/.github/workflows/verify-api-crds.yml b/.github/workflows/verify-api-crds.yml index 885b3bcde..eab34d075 100644 --- a/.github/workflows/verify-api-crds.yml +++ b/.github/workflows/verify-api-crds.yml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.0" + go-version: "1.22" - name: install controller-gen run: make controller-gen - name: Check API CRDs diff --git a/.github/workflows/verify-collector-ocb.yml b/.github/workflows/verify-collector-ocb.yml index 69495534a..170e93075 100644 --- a/.github/workflows/verify-collector-ocb.yml +++ b/.github/workflows/verify-collector-ocb.yml @@ -12,7 +12,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.0" + go-version: "1.22" - name: Generate collector with ocb working-directory: ./collector run: "make genodigoscol" diff --git a/Dockerfile b/Dockerfile index ff0be9703..10a9a95e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.21 as builder +FROM --platform=$BUILDPLATFORM golang:1.22 as builder ARG SERVICE_NAME # Copyy local modules required by the build diff --git a/api/go.mod b/api/go.mod index e39e72815..d35f38f0b 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/keyval-dev/odigos/api -go 1.21 +go 1.22 require ( github.com/keyval-dev/odigos/common v0.0.0 diff --git a/autoscaler/go.mod b/autoscaler/go.mod index d30fef774..2803fd0cf 100644 --- a/autoscaler/go.mod +++ b/autoscaler/go.mod @@ -1,8 +1,6 @@ module github.com/keyval-dev/odigos/autoscaler -go 1.21.0 - -toolchain go1.22.0 +go 1.22.0 require ( github.com/ghodss/yaml v1.0.0 diff --git a/cli/go.mod b/cli/go.mod index 820fa0de5..67f3c73bc 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -1,6 +1,6 @@ module github.com/keyval-dev/odigos/cli -go 1.21 +go 1.22 require ( github.com/google/uuid v1.6.0 diff --git a/collector/Dockerfile b/collector/Dockerfile index a5a1b1cd4..d7ee25227 100644 --- a/collector/Dockerfile +++ b/collector/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21-bullseye AS builder +FROM golang:1.22-bullseye AS builder COPY . /go/src/ WORKDIR /go/src/ RUN make build-odigoscol diff --git a/common/go.mod b/common/go.mod index 338714950..93bf0e15d 100644 --- a/common/go.mod +++ b/common/go.mod @@ -1,6 +1,6 @@ module github.com/keyval-dev/odigos/common -go 1.21 +go 1.22 require ( go.opentelemetry.io/otel/trace v1.24.0 diff --git a/destinations/go.mod b/destinations/go.mod index 9dbc4774e..d7bb54929 100644 --- a/destinations/go.mod +++ b/destinations/go.mod @@ -1,6 +1,6 @@ module github.com/keyval-dev/odigos/destinations -go 1.21 +go 1.22 require ( github.com/keyval-dev/odigos/common v1.0.48 diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 0a85b4184..f1d616f6b 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -10,7 +10,7 @@ COPY frontend//webapp . RUN yarn build -FROM golang:1.21 AS backend +FROM golang:1.22 AS backend WORKDIR /app COPY . . COPY --from=builder /webapp/out frontend/webapp/out diff --git a/frontend/go.mod b/frontend/go.mod index 8960ef11a..ac91e015f 100644 --- a/frontend/go.mod +++ b/frontend/go.mod @@ -1,6 +1,6 @@ module github.com/keyval-dev/odigos/frontend -go 1.21 +go 1.22 require ( github.com/gin-contrib/cors v1.4.0 diff --git a/go.work b/go.work index ff26f2880..349a313f7 100644 --- a/go.work +++ b/go.work @@ -1,17 +1,15 @@ -go 1.21.0 - -toolchain go1.21.3 +go 1.22.0 use ( ./api ./autoscaler ./cli + ./collector/odigosotelcol ./common ./destinations ./frontend ./instrumentor ./odiglet - ./scheduler - ./collector/odigosotelcol ./procdiscovery + ./scheduler ) diff --git a/instrumentor/go.mod b/instrumentor/go.mod index f6435e04b..f0b4bdfe1 100644 --- a/instrumentor/go.mod +++ b/instrumentor/go.mod @@ -1,8 +1,6 @@ module github.com/keyval-dev/odigos/instrumentor -go 1.21.0 - -toolchain go1.21.5 +go 1.22.0 require ( github.com/go-logr/logr v1.4.1 diff --git a/odiglet/Dockerfile b/odiglet/Dockerfile index 71c1126fa..3295d66e9 100644 --- a/odiglet/Dockerfile +++ b/odiglet/Dockerfile @@ -14,7 +14,7 @@ ARG DOTNET_OTEL_VERSION=v0.7.0 ADD https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/download/$DOTNET_OTEL_VERSION/opentelemetry-dotnet-instrumentation-linux-musl.zip . RUN unzip opentelemetry-dotnet-instrumentation-linux-musl.zip && rm opentelemetry-dotnet-instrumentation-linux-musl.zip -FROM --platform=$BUILDPLATFORM keyval/odiglet-base:v1.3 as builder +FROM --platform=$BUILDPLATFORM keyval/odiglet-base:v1.4 as builder WORKDIR /go/src/github.com/keyval-dev/odigos # Copyy local modules required by the build COPY api/ api/ diff --git a/odiglet/base.Dockerfile b/odiglet/base.Dockerfile index f5b7ceb92..b9bf6e4fe 100644 --- a/odiglet/base.Dockerfile +++ b/odiglet/base.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.6-bullseye as builder +FROM golang:1.22.2-bullseye as builder # fury is our registry for linux packages RUN echo "deb [trusted=yes] https://apt.fury.io/cli/ * *" > /etc/apt/sources.list.d/fury-cli.list diff --git a/odiglet/debug.Dockerfile b/odiglet/debug.Dockerfile index aaeee4434..527c855be 100644 --- a/odiglet/debug.Dockerfile +++ b/odiglet/debug.Dockerfile @@ -14,7 +14,7 @@ ARG DOTNET_OTEL_VERSION=v0.7.0 ADD https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/download/$DOTNET_OTEL_VERSION/opentelemetry-dotnet-instrumentation-linux-musl.zip . RUN unzip opentelemetry-dotnet-instrumentation-linux-musl.zip && rm opentelemetry-dotnet-instrumentation-linux-musl.zip -FROM keyval/odiglet-base:v1.0 as builder +FROM keyval/odiglet-base:v1.4 as builder WORKDIR /go/src/github.com/keyval-dev/odigos COPY . . WORKDIR ./odiglet/ diff --git a/odiglet/go.mod b/odiglet/go.mod index 4a76c5bae..f0e809bde 100644 --- a/odiglet/go.mod +++ b/odiglet/go.mod @@ -1,8 +1,6 @@ module github.com/keyval-dev/odigos/odiglet -go 1.21.0 - -toolchain go1.21.3 +go 1.22.0 require ( github.com/fntlnz/mountinfo v1.0.1 diff --git a/procdiscovery/go.mod b/procdiscovery/go.mod index 7474a8b2a..b65006726 100644 --- a/procdiscovery/go.mod +++ b/procdiscovery/go.mod @@ -1,8 +1,6 @@ module github.com/keyval-dev/odigos/procdiscovery -go 1.21.0 - -toolchain go1.21.3 +go 1.22.0 require github.com/keyval-dev/odigos/common v1.0.48 diff --git a/scheduler/go.mod b/scheduler/go.mod index e1b3b399d..ae9ac9c06 100644 --- a/scheduler/go.mod +++ b/scheduler/go.mod @@ -1,8 +1,6 @@ module github.com/keyval-dev/odigos/scheduler -go 1.21.0 - -toolchain go1.22.0 +go 1.22.0 require ( github.com/go-logr/zapr v1.3.0