From 54a4903b934bd5fcc2ac6b975c12a890174ebee4 Mon Sep 17 00:00:00 2001 From: Ron Federman Date: Fri, 13 Dec 2024 15:13:00 +0200 Subject: [PATCH 1/2] Upgrade to go1.23 --- .github/workflows/build.yaml | 10 +++++----- .github/workflows/e2e.yaml | 4 ++-- .github/workflows/go-mod-tidy.yml | 2 +- .github/workflows/publish-modules.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/verify-api-crds.yml | 2 +- .github/workflows/verify-collector-ocb.yml | 2 +- api/go.mod | 2 +- autoscaler/go.mod | 2 +- cli/go.mod | 2 +- collector/exporters/azureblobstorageexporter/go.mod | 4 +--- collector/exporters/googlecloudstorageexporter/go.mod | 4 +--- collector/odigosotelcol/go.mod | 4 +--- .../processors/odigosconditionalattributes/go.mod | 4 +--- .../processors/odigosresourcenameprocessor/go.mod | 4 +--- collector/processors/odigossamplingprocessor/go.mod | 4 +--- .../processors/odigossqldboperationprocessor/go.mod | 2 +- collector/processors/odigostrafficmetrics/go.mod | 2 +- collector/providers/odigosfileprovider/go.mod | 4 +--- common/go.mod | 2 +- destinations/go.mod | 2 +- frontend/go.mod | 2 +- instrumentor/go.mod | 2 +- k8sutils/go.mod | 2 +- odiglet/go.mod | 2 +- opampserver/go.mod | 2 +- procdiscovery/go.mod | 2 +- scheduler/go.mod | 2 +- 28 files changed, 33 insertions(+), 47 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e4003f18b..fc8e2f786 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -42,7 +42,7 @@ jobs: uses: docker/setup-buildx-action@v3 - uses: actions/setup-go@v5 with: - go-version: "1.22.0" + go-version: "1.23.0" - name: Build Instrumentor Image uses: docker/build-push-action@v6 with: @@ -117,7 +117,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.22.0" + go-version: "1.23.0" - name: Set up Goreleaser uses: goreleaser/goreleaser-action@v5 with: @@ -130,7 +130,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.0" + go-version: "1.23.0" - name: Test k8sutils module working-directory: ./k8sutils run: | @@ -142,7 +142,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.0" + go-version: "1.23.0" - name: Test common module working-directory: ./common run: | @@ -154,7 +154,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.0" + go-version: "1.23.0" - name: Test procdiscovery module working-directory: ./procdiscovery run: | diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 5961d5452..c4f20f8f9 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -21,7 +21,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: '~1.22' + go-version: '~1.23' check-latest: true cache: true cache-dependency-path: | @@ -87,7 +87,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: '~1.22' + go-version: '~1.23' check-latest: true cache: true cache-dependency-path: | diff --git a/.github/workflows/go-mod-tidy.yml b/.github/workflows/go-mod-tidy.yml index d2734936f..28e065a71 100644 --- a/.github/workflows/go-mod-tidy.yml +++ b/.github/workflows/go-mod-tidy.yml @@ -11,7 +11,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" - name: run make go-mod-tidy run: make go-mod-tidy - name: Check clean repository diff --git a/.github/workflows/publish-modules.yml b/.github/workflows/publish-modules.yml index ec56e4fe7..5333dfd3b 100644 --- a/.github/workflows/publish-modules.yml +++ b/.github/workflows/publish-modules.yml @@ -197,7 +197,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" - name: Run GoReleaser uses: goreleaser/goreleaser-action@v5 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8c5789668..0ebd41c28 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -74,7 +74,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" - uses: actions/setup-node@v4 with: diff --git a/.github/workflows/verify-api-crds.yml b/.github/workflows/verify-api-crds.yml index 56a9a9bd7..d89718d4e 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.22" + go-version: "1.23" - 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 eeda5e6a6..e283b9072 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.22.6" + go-version: "1.23.0" - name: Generate collector with ocb working-directory: ./collector run: "make genodigoscol" diff --git a/api/go.mod b/api/go.mod index 463c1996c..b8562cf90 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/odigos-io/odigos/api -go 1.22.0 +go 1.23.0 require ( github.com/odigos-io/odigos/common v0.0.0 diff --git a/autoscaler/go.mod b/autoscaler/go.mod index 3638355d4..10cf5c1e5 100644 --- a/autoscaler/go.mod +++ b/autoscaler/go.mod @@ -1,6 +1,6 @@ module github.com/odigos-io/odigos/autoscaler -go 1.22.0 +go 1.23.0 require ( github.com/ghodss/yaml v1.0.0 diff --git a/cli/go.mod b/cli/go.mod index 865369d34..7143f02a2 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -1,6 +1,6 @@ module github.com/odigos-io/odigos/cli -go 1.22.0 +go 1.23.0 require ( github.com/cert-manager/cert-manager v1.16.2 diff --git a/collector/exporters/azureblobstorageexporter/go.mod b/collector/exporters/azureblobstorageexporter/go.mod index f024474ce..6f85968f0 100644 --- a/collector/exporters/azureblobstorageexporter/go.mod +++ b/collector/exporters/azureblobstorageexporter/go.mod @@ -1,8 +1,6 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/odigos/exporter/azureblobstorageexporter -go 1.21.0 - -toolchain go1.22.6 +go 1.23.0 require ( github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 diff --git a/collector/exporters/googlecloudstorageexporter/go.mod b/collector/exporters/googlecloudstorageexporter/go.mod index c46efd221..ca85d032a 100644 --- a/collector/exporters/googlecloudstorageexporter/go.mod +++ b/collector/exporters/googlecloudstorageexporter/go.mod @@ -1,8 +1,6 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/odigos/exporter/googlecloudstorageexporter -go 1.21.0 - -toolchain go1.22.6 +go 1.23.0 require ( cloud.google.com/go/storage v1.30.1 diff --git a/collector/odigosotelcol/go.mod b/collector/odigosotelcol/go.mod index f84fc878b..121e2efa2 100644 --- a/collector/odigosotelcol/go.mod +++ b/collector/odigosotelcol/go.mod @@ -2,9 +2,7 @@ module odigos.io/opentelemetry-collector/cmd/odigosotelcol -go 1.22.0 - -toolchain go1.22.6 +go 1.23.0 require ( github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.106.0 diff --git a/collector/processors/odigosconditionalattributes/go.mod b/collector/processors/odigosconditionalattributes/go.mod index 81de3fd80..b01a46563 100644 --- a/collector/processors/odigosconditionalattributes/go.mod +++ b/collector/processors/odigosconditionalattributes/go.mod @@ -1,8 +1,6 @@ module odigosconditionalattributes -go 1.22.0 - -toolchain go1.22.6 +go 1.23.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/collector/processors/odigosresourcenameprocessor/go.mod b/collector/processors/odigosresourcenameprocessor/go.mod index b7b62ef67..8de889ea2 100644 --- a/collector/processors/odigosresourcenameprocessor/go.mod +++ b/collector/processors/odigosresourcenameprocessor/go.mod @@ -1,8 +1,6 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigosresourcenameprocessor -go 1.21.0 - -toolchain go1.22.6 +go 1.23.0 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.106.0 diff --git a/collector/processors/odigossamplingprocessor/go.mod b/collector/processors/odigossamplingprocessor/go.mod index 3ab5e22ff..ad2a08d7f 100644 --- a/collector/processors/odigossamplingprocessor/go.mod +++ b/collector/processors/odigossamplingprocessor/go.mod @@ -1,8 +1,6 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigossamplingprocessor -go 1.21.0 - -toolchain go1.22.6 +go 1.23.0 require ( github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c diff --git a/collector/processors/odigossqldboperationprocessor/go.mod b/collector/processors/odigossqldboperationprocessor/go.mod index fed85aec1..87ab7a9e7 100644 --- a/collector/processors/odigossqldboperationprocessor/go.mod +++ b/collector/processors/odigossqldboperationprocessor/go.mod @@ -1,6 +1,6 @@ module odigossqldboperationprocessor -go 1.22.0 +go 1.23.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/collector/processors/odigostrafficmetrics/go.mod b/collector/processors/odigostrafficmetrics/go.mod index 96e809d4b..bcd8f4b86 100644 --- a/collector/processors/odigostrafficmetrics/go.mod +++ b/collector/processors/odigostrafficmetrics/go.mod @@ -1,6 +1,6 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/odigos/processor/odigostrafficmetrics -go 1.22.0 +go 1.23.0 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.106.1 diff --git a/collector/providers/odigosfileprovider/go.mod b/collector/providers/odigosfileprovider/go.mod index 3a7ff7f0e..4acb64eea 100644 --- a/collector/providers/odigosfileprovider/go.mod +++ b/collector/providers/odigosfileprovider/go.mod @@ -1,8 +1,6 @@ module odigosfileprovider -go 1.22.0 - -toolchain go1.22.6 +go 1.23.0 require ( github.com/fsnotify/fsnotify v1.8.0 diff --git a/common/go.mod b/common/go.mod index 4e6e2603b..5f8b39c00 100644 --- a/common/go.mod +++ b/common/go.mod @@ -1,6 +1,6 @@ module github.com/odigos-io/odigos/common -go 1.22.0 +go 1.23.0 require ( github.com/goccy/go-yaml v1.11.3 diff --git a/destinations/go.mod b/destinations/go.mod index 36e824627..813187e17 100644 --- a/destinations/go.mod +++ b/destinations/go.mod @@ -1,6 +1,6 @@ module github.com/odigos-io/odigos/destinations -go 1.22.0 +go 1.23.0 require ( github.com/odigos-io/odigos/common v1.0.48 diff --git a/frontend/go.mod b/frontend/go.mod index 617ea6275..9076933b6 100644 --- a/frontend/go.mod +++ b/frontend/go.mod @@ -1,6 +1,6 @@ module github.com/odigos-io/odigos/frontend -go 1.22.0 +go 1.23.0 require ( github.com/99designs/gqlgen v0.17.49 diff --git a/instrumentor/go.mod b/instrumentor/go.mod index 3c5cec29a..c0cdc3de5 100644 --- a/instrumentor/go.mod +++ b/instrumentor/go.mod @@ -1,6 +1,6 @@ module github.com/odigos-io/odigos/instrumentor -go 1.22.0 +go 1.23.0 require ( github.com/go-logr/logr v1.4.2 diff --git a/k8sutils/go.mod b/k8sutils/go.mod index d0434ee38..124c25125 100644 --- a/k8sutils/go.mod +++ b/k8sutils/go.mod @@ -1,6 +1,6 @@ module github.com/odigos-io/odigos/k8sutils -go 1.22.0 +go 1.23.0 require ( github.com/odigos-io/odigos/api v0.0.0 diff --git a/odiglet/go.mod b/odiglet/go.mod index 4e06377dd..91c2b0b53 100644 --- a/odiglet/go.mod +++ b/odiglet/go.mod @@ -1,6 +1,6 @@ module github.com/odigos-io/odigos/odiglet -go 1.22.7 +go 1.23.0 require ( github.com/go-logr/logr v1.4.2 diff --git a/opampserver/go.mod b/opampserver/go.mod index 80702d765..cb453eb95 100644 --- a/opampserver/go.mod +++ b/opampserver/go.mod @@ -1,6 +1,6 @@ module github.com/odigos-io/odigos/opampserver -go 1.22.0 +go 1.23.0 require ( github.com/go-logr/logr v1.4.2 diff --git a/procdiscovery/go.mod b/procdiscovery/go.mod index 317c61a28..513daf78f 100644 --- a/procdiscovery/go.mod +++ b/procdiscovery/go.mod @@ -1,6 +1,6 @@ module github.com/odigos-io/odigos/procdiscovery -go 1.22.0 +go 1.23.0 require ( github.com/hashicorp/go-version v1.7.0 diff --git a/scheduler/go.mod b/scheduler/go.mod index d886f7817..24b0507cb 100644 --- a/scheduler/go.mod +++ b/scheduler/go.mod @@ -1,6 +1,6 @@ module github.com/odigos-io/odigos/scheduler -go 1.22.0 +go 1.23.0 require ( github.com/go-logr/zapr v1.3.0 From d3259ca32ec7077700c96fb783f5dc53f426e2a6 Mon Sep 17 00:00:00 2001 From: Ron Federman Date: Fri, 13 Dec 2024 15:17:39 +0200 Subject: [PATCH 2/2] update Dockerfiles --- Dockerfile | 2 +- collector/Dockerfile | 2 +- frontend/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7c319e6f3..acba3585e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.22 AS builder +FROM --platform=$BUILDPLATFORM golang:1.23 AS builder ARG SERVICE_NAME # Copyy local modules required by the build diff --git a/collector/Dockerfile b/collector/Dockerfile index e556b552f..fe7c10d09 100644 --- a/collector/Dockerfile +++ b/collector/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.22-bullseye AS builder +FROM --platform=$BUILDPLATFORM golang:1.23-bullseye AS builder COPY . /go/src/ WORKDIR /go/src/ diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 06d2fe775..20c6d97e1 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -9,7 +9,7 @@ COPY --from=deps /app/node_modules ./node_modules COPY frontend/webapp . RUN yarn build -FROM --platform=$BUILDPLATFORM golang:1.22 AS backend +FROM --platform=$BUILDPLATFORM golang:1.23 AS backend WORKDIR /app COPY . . COPY --from=builder /webapp/out frontend/webapp/out