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

upgrade golang to 1.22.6 #5248

Merged
merged 3 commits into from
Aug 16, 2024
Merged

upgrade golang to 1.22.6 #5248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14494ee
upgrade golang to 1.22.6
jeffreyc-splunk Aug 16, 2024
e298906
make gendependabot
jeffreyc-splunk Aug 16, 2024
e51f48c
update changelog
jeffreyc-splunk Aug 16, 2024
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
4 changes: 4 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ updates:
directory: "/docker/httpd"
schedule:
interval: "weekly"
- package-ecosystem: "docker"
directory: "/docker/httpd-discovery"
schedule:
interval: "weekly"
crobert-1 marked this conversation as resolved.
Show resolved Hide resolved
- package-ecosystem: "docker"
directory: "/docker/httpd_basicauth"
schedule:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto-instrumentation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ env:
PYTHON_VERSION: '3.11'
PIP_VERSION: '22.0.4'
REQUIREMENTS_PATH: "internal/buildscripts/packaging/tests/requirements.txt"
GO_VERSION: 1.21.12
GO_VERSION: 1.22.6

jobs:
cross-compile:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ concurrency:
cancel-in-progress: true

env:
GO_VERSION: 1.21.12
GO_VERSION: 1.22.6

jobs:
setup-environment:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/darwin-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
- '!internal/buildscripts/**'

env:
GO_VERSION: '1.21.12'
GO_VERSION: '1.22.6'

concurrency:
group: darwin-test-${{ github.event.pull_request.number || github.ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gendependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- '.github/workflows/scripts/gendependabot.sh'

env:
GO_VERSION: 1.21.12
GO_VERSION: 1.22.6

jobs:
gendependabot:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ concurrency:
cancel-in-progress: true

env:
GO_VERSION: "1.21.12"
GO_VERSION: "1.22.6"
jobs:
agent-bundle-linux:
runs-on: ${{ fromJSON('["ubuntu-20.04", "otel-arm64"]')[matrix.ARCH == 'arm64'] }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-examples.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ concurrency:
cancel-in-progress: true

env:
GO_VERSION: 1.21.12
GO_VERSION: 1.22.6

jobs:
lint:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux-package-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env:
PYTHON_VERSION: '3.11'
PIP_VERSION: '22.0.4'
REQUIREMENTS_PATH: "internal/buildscripts/packaging/tests/requirements.txt"
GO_VERSION: 1.21.12
GO_VERSION: 1.22.6

jobs:
setup-environment:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vuln-scans.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
- cron: '0 0 * * 1-5' # Every weekday at midnight UTC

env:
GO_VERSION: '1.21.12'
GO_VERSION: '1.22.6'

concurrency:
group: vuln-scans-${{ github.event.pull_request.number || github.ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/win-package-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ concurrency:
cancel-in-progress: true

env:
GO_VERSION: 1.21.12
GO_VERSION: 1.22.6

jobs:
setup-environment:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
- '!internal/buildscripts/**'

env:
GO_VERSION: '1.21.12'
GO_VERSION: '1.22.6'

concurrency:
group: windows-test-${{ github.event.pull_request.number || github.ref }}
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ fossa:
fi

.go-cache:
image: '${DOCKER_HUB_REPO}/golang:1.21.12'
image: '${DOCKER_HUB_REPO}/golang:1.22.6'
variables:
GOPATH: "$CI_PROJECT_DIR/.go"
before_script:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### 🛑 Breaking changes 🛑

- (Splunk) `confmap`: Do not expand special shell variable such as `$*` in configuration files. ([#5206](https://github.com/signalfx/splunk-otel-collector/pull/5206))
- (Splunk) Upgrade golang to 1.22 ([#5248](https://github.com/signalfx/splunk-otel-collector/pull/5248))

### 🚀 New components 🚀

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 github.com/signalfx/splunk-otel-collector/examples/prometheus-federation/prom-counter

go 1.21
go 1.22

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 github.com/signalfx/splunk-otel-collector/examples/splunk-hec-traces/tracing

go 1.21
go 1.22

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 github.com/signalfx/splunk-otel-collector/examples/splunk-hec/logging

go 1.21
go 1.22

require go.uber.org/zap v1.27.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.21.0
go 1.22

require (
github.com/alecthomas/participle/v2 v2.1.1
Expand Down
2 changes: 1 addition & 1 deletion internal/signalfx-agent/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/signalfx-agent

go 1.21.0
go 1.22

replace (
code.cloudfoundry.org/go-loggregator => github.com/signalfx/go-loggregator v1.0.1-0.20200205155641-5ba5ca92118d
Expand Down
4 changes: 1 addition & 3 deletions internal/tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/signalfx/splunk-otel-collector/internal/tools

go 1.21.0

toolchain go1.21.12
go 1.22

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/pkg/extension/smartagentextension

go 1.21.0
go 1.22

require (
github.com/signalfx/defaults v1.2.2-0.20180531161417-70562fe60657
Expand Down
4 changes: 1 addition & 3 deletions pkg/processor/timestampprocessor/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/signalfx/splunk-otel-collector/pkg/processor/timestampprocessor

go 1.21.0

toolchain go1.21.12
go 1.22

require (
github.com/stretchr/testify v1.9.0
Expand Down
2 changes: 1 addition & 1 deletion pkg/receiver/smartagentreceiver/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/pkg/receiver/smartagentreceiver

go 1.21.0
go 1.22

require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.107.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.21.0
go 1.22

require (
github.com/docker/docker v26.1.5+incompatible
Expand Down
2 changes: 1 addition & 1 deletion tests/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/tests/tools

go 1.21
go 1.22

require github.com/Songmu/gotesplit v0.3.1

Expand Down
Loading