Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to go1.23 #1983

Merged
merged 2 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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: |
Expand All @@ -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: |
Expand All @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go-mod-tidy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-modules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify-api-crds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify-collector-ocb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion autoscaler/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion cli/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion collector/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/

Expand Down
4 changes: 1 addition & 3 deletions collector/exporters/azureblobstorageexporter/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 1 addition & 3 deletions collector/exporters/googlecloudstorageexporter/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 1 addition & 3 deletions collector/odigosotelcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions collector/processors/odigosconditionalattributes/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 1 addition & 3 deletions collector/processors/odigosresourcenameprocessor/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 1 addition & 3 deletions collector/processors/odigossamplingprocessor/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion collector/processors/odigossqldboperationprocessor/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module odigossqldboperationprocessor

go 1.22.0
go 1.23.0

require (
github.com/stretchr/testify v1.9.0
Expand Down
2 changes: 1 addition & 1 deletion collector/processors/odigostrafficmetrics/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 1 addition & 3 deletions collector/providers/odigosfileprovider/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion common/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion destinations/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion frontend/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion instrumentor/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion k8sutils/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion odiglet/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion opampserver/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion procdiscovery/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion scheduler/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading