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

Otl go 1.20 #2559

Closed
wants to merge 5 commits into from
Closed
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
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ env:
PIP_VERSION: '22.0.4'
REQUIREMENTS_PATH: "internal/buildscripts/packaging/tests/requirements.txt"
RESULT_PATH: "~/testresults"
GO_VERSION: 1.19.4
GO_VERSION: 1.20.0

jobs:
setup-environment:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deps-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v3
with:
go-version: 1.19.4
go-version: 1.20.0
- name: Setup Go Environment
run: |
echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-go@v3
with:
go-version: 1.19.4
go-version: 1.20.0
- id: module-cache
uses: actions/cache@v3
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trivy-scans.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
- '.trivyignore'

env:
GO_VERSION: '1.19.4'
GO_VERSION: 1.20.0

jobs:
trivy-fs-scan:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.19.4
go-version: 1.20.0

- name: Install golang dependency
run: |
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ fossa:
done

.go-cache:
image: '${DOCKER_HUB_REPO}/golang:1.19.4'
image: '${DOCKER_HUB_REPO}/golang:1.20.0'
variables:
GOPATH: "$CI_PROJECT_DIR/.go"
before_script:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

- [Updated golang to 1.20](https://github.com/signalfx/splunk-otel-collector/pull/2559)

## v0.70.0

This Splunk OpenTelemetry Collector release includes changes from the [opentelemetry-collector v0.70.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.70.0) and the [opentelemetry-collector-contrib v0.70.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.70.0) releases where appropriate.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ gendependabot:
.PHONY: tidy-all
tidy-all:
$(MAKE) $(FOR_GROUP_TARGET) TARGET="tidy"
go mod tidy -compat=1.18
go mod tidy -compat=1.19

.PHONY: install-tools
install-tools:
Expand Down
2 changes: 1 addition & 1 deletion Makefile.Common
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ lint: checklicense misspell
.PHONY: tidy
tidy:
rm -fr go.sum
$(GOCMD) mod tidy -compat=1.18
$(GOCMD) mod tidy -compat=1.19

.PHONY: misspell
misspell:
Expand Down
2 changes: 1 addition & 1 deletion examples/prometheus-federation/prom-counter/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module app

go 1.19
go 1.20

require (
go.opentelemetry.io/otel v0.20.0
Expand Down
2 changes: 1 addition & 1 deletion examples/splunk-hec-traces/tracing/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module app

go 1.19
go 1.20

require (
go.opentelemetry.io/otel v1.1.0
Expand Down
2 changes: 1 addition & 1 deletion examples/splunk-hec/logging/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module app

go 1.19
go 1.20

require go.uber.org/zap v1.24.0

Expand Down
210 changes: 104 additions & 106 deletions go.mod

Large diffs are not rendered by default.

796 changes: 205 additions & 591 deletions go.sum

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions internal/buildscripts/update-deps
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ for gomod in $( find "$REPO_DIR" -name "go.mod" | grep -v "/examples/" | sort );
pkg="$( echo "$line" | awk '{print $1}' )"
fi
go mod edit -replace="${pkg}"="${pkg}"@$(desired_contrib_version "$line")
go mod tidy -compat=1.18
go mod tidy -compat=1.19
done

lines="$( (grep 'go.opentelemetry.io/collector' "$gomod" | grep -v 'ignore-update-deps' | grep -v '^[[:space:]]*//' | grep -v '=>' | grep -v ' // indirect' | sort -u) || true )"
Expand All @@ -63,7 +63,6 @@ for gomod in $( find "$REPO_DIR" -name "go.mod" | grep -v "/examples/" | sort );

IFS=$OFS

go mod tidy -compat=1.18

popd >/dev/null
go mod tidy -compat=1.19
bre
jvoravong marked this conversation as resolved.
Show resolved Hide resolved
done
2 changes: 1 addition & 1 deletion internal/tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/signalfx/splunk-otel-collector/internal/tools

go 1.19
go 1.20

require (
github.com/client9/misspell v0.3.4
Expand Down
2 changes: 1 addition & 1 deletion pkg/extension/smartagentextension/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/signalfx/splunk-otel-collector/receiver/smartagentextension

go 1.19
go 1.20

require (
github.com/signalfx/defaults v1.2.2-0.20180531161417-70562fe60657
Expand Down
2 changes: 1 addition & 1 deletion pkg/processor/timestamp/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/signalfx/splunk-otel-collector/processor/timestampprocessor

go 1.19
go 1.20

require (
github.com/stretchr/testify v1.8.1
Expand Down
2 changes: 1 addition & 1 deletion pkg/receiver/smartagent/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/signalfx/splunk-otel-collector/receiver/smartagentreceiver

go 1.19
go 1.20

require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.70.0
Expand Down
2 changes: 1 addition & 1 deletion tests/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/signalfx/splunk-otel-collector/tests

go 1.19
go 1.20

require (
github.com/Masterminds/sprig/v3 v3.2.3
Expand Down