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.

Sign up for GitHub

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

Jump to bottom

Update Go version to 1.20 #4206

Merged
merged 6 commits into from
Mar 4, 2023
Merged

Update Go version to 1.20 #4206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8e48e04
Updated Go Version from 1.19 to 1.20
SaarthakMaini Feb 4, 2023
4c485d2
Update golangci-lint version to v1.51.0
SaarthakMaini Feb 4, 2023
4756c24
Solve S1011: Linter Error
SaarthakMaini Feb 5, 2023
aa6b733
Merge branch 'main' of https://github.com/SaarthakMaini/jaeger into g…
SaarthakMaini Feb 5, 2023
a1e740e
Solve 'File is not `gofmt` -ed with `-s`'
SaarthakMaini Feb 5, 2023
e929913
Merge branch 'main' into go_version_update
yurishkuro Mar 4, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/ci-all-in-one-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Setup Node.js version
uses: ./.github/actions/setup-node.js
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-build-binaries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:

- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Setup Node.js version
uses: ./.github/actions/setup-node.js
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-cassandra.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Run cassandra integration tests
run: bash scripts/cassandra-integration-test.sh ${{ matrix.version.image }} ${{ matrix.version.schema }}
2 changes: 1 addition & 1 deletion .github/workflows/ci-crossdock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Export BRANCH variable
uses: ./.github/actions/setup-branch
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-docker-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Setup Node.js version
uses: ./.github/actions/setup-node.js
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-elasticsearch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Install tools
run: make install-ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-grpc-badger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Run Badger storage integration tests
run: make badger-storage-integration-test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-hotrod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Export BRANCH variable
uses: ./.github/actions/setup-branch
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-kafka.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Run kafka integration tests
run: bash scripts/kafka-integration-test.sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-opensearch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Install tools
run: make install-ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-protogen-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Run protogen validation
run: make proto && git diff --name-status --exit-code
2 changes: 1 addition & 1 deletion .github/workflows/ci-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-unit-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Install tools
run: make install-ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fossa.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

- uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Add GOPATH
run: |
Expand Down
4 changes: 2 additions & 2 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
run:
go: '1.19'
go: '1.20'
timeout: 10m
skip-dirs:
- mocks
Expand Down Expand Up @@ -27,7 +27,7 @@ linters-settings:
- G404
- G601
gosimple:
go: "1.19"
go: "1.20"

linters:
enable:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ draft-release:
.PHONY: install-tools
install-tools:
go install github.com/vektra/mockery/[email protected]
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.50.1
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.0
go install mvdan.cc/gofumpt@latest

.PHONY: install-ci
Expand Down
4 changes: 1 addition & 3 deletions cmd/anonymizer/app/query/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,7 @@ func (q *Query) QueryTrace(traceID string) ([]model.Span, error) {
if err != nil {
return nil, unwrapNotFoundErr(err)
}
for i := range received.Spans {
spans = append(spans, received.Spans[i])
}
spans = append(spans, received.Spans...)
}

return spans, nil
Expand Down
2 changes: 1 addition & 1 deletion docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VERSION := 1.0.0
ROOT_IMAGE ?= alpine:3.16
CERT_IMAGE := $(ROOT_IMAGE)
GOLANG_IMAGE := golang:1.19-alpine
GOLANG_IMAGE := golang:1.20-alpine

DOCKER_REGISTRY ?= localhost:5000
BASE_IMAGE ?= $(DOCKER_REGISTRY)/baseimg_alpine:latest
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jaegertracing/jaeger

go 1.19
go 1.20

require (
github.com/HdrHistogram/hdrhistogram-go v1.1.2
Expand Down