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

Otl go 1.20 #2559

Closed
wants to merge 5 commits into from
Closed

Otl go 1.20 #2559

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a3749d5
Update the Collector to Golang 1.20
jvoravong Feb 14, 2023
e9a72f2
Update CHANGELOG.md
jvoravong Feb 14, 2023
b3edf98
Update versions in CI/CD files
jvoravong Feb 14, 2023
ad73b59
Set go mod tidy compat to 1.19 for default behavior
jvoravong Feb 14, 2023
0a294bc
Update go.mod and go.sum
jvoravong Feb 14, 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: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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.20

.PHONY: install-tools
install-tools:
Expand Down
2 changes: 1 addition & 1 deletion Makefile.Common
View file
Open in desktop
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.20
jvoravong marked this conversation as resolved.
Show resolved Hide resolved

.PHONY: misspell
misspell:
Expand Down
2 changes: 1 addition & 1 deletion examples/prometheus-federation/prom-counter/go.mod
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
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/signalfx/splunk-otel-collector

go 1.19
go 1.20

require (
github.com/alecthomas/participle/v2 v2.0.0-beta.5
Expand Down
7 changes: 3 additions & 4 deletions internal/buildscripts/update-deps
View file
Open in desktop
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.20
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.20
bre
jvoravong marked this conversation as resolved.
Show resolved Hide resolved
done
2 changes: 1 addition & 1 deletion internal/tools/go.mod
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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