Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 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
27 changes: 27 additions & 0 deletions .chloggen/codeboten_1.25.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: breaking

# The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog)
component: all

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Increase minimum Go version to 1.25

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [14567]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ section of the general project contributing guide.
Working with the project sources requires the following tools:

1. [git](https://git-scm.com/)
2. [go](https://golang.org/) (version 1.24 and up)
2. [go](https://golang.org/) (version 1.25 and up)
3. [make](https://www.gnu.org/software/make/)
4. [docker](https://www.docker.com/)

Expand Down Expand Up @@ -259,7 +259,7 @@ before merging (but see the above paragraph about writing good commit messages i

## General Notes

This project uses Go 1.24.* and [Github Actions.](https://github.com/features/actions)
This project uses Go 1.25.* and [Github Actions.](https://github.com/features/actions)

It is recommended to run `make gofmt all` before submitting your PR.

Expand Down
4 changes: 3 additions & 1 deletion Makefile.Common
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ JUNIT_OUT_DIR ?= $(TOOLS_MOD_DIR)/testresults
test:
# GODEBUG=fips140=only is used to surface any FIPS-140-3 non-compliant cryptographic
# calls into the Go standard library. See: https://go.dev/doc/security/fips140#fips-140-3-mode
# Ensure gotestsum is built before running with FIPS mode to avoid download failures
@$(GO_TOOL) gotestsum --version >/dev/null 2>&1 || true
GODEBUG=fips140=only $(GO_TOOL) gotestsum --packages="./..." -- $(GOTEST_OPT)

.PHONY: test-with-cover
Expand Down Expand Up @@ -62,7 +64,7 @@ modernize:
.PHONY: tidy
tidy:
rm -fr go.sum
$(GOCMD) mod tidy -compat=1.24.0
$(GOCMD) mod tidy -compat=1.25.0

.PHONY: lint
lint:
Expand Down
2 changes: 1 addition & 1 deletion client/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/client

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion cmd/builder/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

module go.opentelemetry.io/collector/cmd/builder

go 1.24.0
go 1.25.0

require (
github.com/knadh/koanf/parsers/yaml v1.1.0
Expand Down
2 changes: 1 addition & 1 deletion cmd/builder/internal/builder/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ func GetModules(cfg *Config) error {
return nil
}

if _, err := runGoCommand(cfg, "mod", "tidy", "-compat=1.24"); err != nil {
if _, err := runGoCommand(cfg, "mod", "tidy", "-compat=1.25"); err != nil {
return fmt.Errorf("failed to update go.mod: %w", err)
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/builder/internal/builder/templates/go.mod.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module {{.Distribution.Module}}

go 1.24
go 1.25

require (
{{- range .ConfmapConverters}}
Expand Down
2 changes: 1 addition & 1 deletion cmd/builder/internal/init/templates/go.mod.tmpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module {{.Name}}

go 1.24
go 1.25

tool go.opentelemetry.io/collector/cmd/builder
2 changes: 1 addition & 1 deletion cmd/mdatagen/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/cmd/mdatagen

go 1.24.0
go 1.25.0

require (
github.com/google/go-cmp v0.7.0
Expand Down
2 changes: 1 addition & 1 deletion cmd/otelcorecol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module go.opentelemetry.io/collector/cmd/otelcorecol

go 1.24.0
go 1.25.0

require (
go.opentelemetry.io/collector/component v1.51.0
Expand Down
2 changes: 1 addition & 1 deletion component/componentstatus/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/component/componentstatus

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion component/componenttest/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/component/componenttest

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion component/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/component

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion config/configauth/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/config/configauth

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion config/configcompression/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/config/configcompression

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion config/configgrpc/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/config/configgrpc

go 1.24.0
go 1.25.0

require (
github.com/mostynb/go-grpc-compression v1.2.3
Expand Down
2 changes: 1 addition & 1 deletion config/confighttp/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/config/confighttp

go 1.24.0
go 1.25.0

require (
github.com/golang/snappy v1.0.0
Expand Down
2 changes: 1 addition & 1 deletion config/confighttp/xconfighttp/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/config/confighttp/xconfighttp

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion config/configmiddleware/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/config/configmiddleware

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion config/confignet/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/config/confignet

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion config/configopaque/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/config/configopaque

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion config/configoptional/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/config/configoptional

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion config/configretry/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/config/configretry

go 1.24.0
go 1.25.0

require (
github.com/cenkalti/backoff/v5 v5.0.3
Expand Down
2 changes: 1 addition & 1 deletion config/configtelemetry/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/config/configtelemetry

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion config/configtls/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/config/configtls

go 1.24.0
go 1.25.0

require (
github.com/foxboron/go-tpm-keyfiles v0.0.0-20250903184740-5d135037bd4d
Expand Down
2 changes: 1 addition & 1 deletion confmap/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/confmap

go 1.24.0
go 1.25.0

require (
github.com/go-viper/mapstructure/v2 v2.5.0
Expand Down
2 changes: 1 addition & 1 deletion confmap/internal/e2e/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/confmap/internal/e2e

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion confmap/provider/envprovider/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/confmap/provider/envprovider

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion confmap/provider/fileprovider/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/confmap/provider/fileprovider

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion confmap/provider/httpprovider/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/confmap/provider/httpprovider

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion confmap/provider/httpsprovider/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/confmap/provider/httpsprovider

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion confmap/provider/yamlprovider/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/confmap/provider/yamlprovider

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
14 changes: 5 additions & 9 deletions confmap/resolver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -398,14 +398,12 @@ func TestResolverShutdownClosesWatch(t *testing.T) {
require.NoError(t, errN)

var watcherWG sync.WaitGroup
watcherWG.Add(1)
go func() {
watcherWG.Go(func() {
errW, ok := <-resolver.Watch()
// Channel is closed, no exception
assert.NoError(t, errW)
require.NoError(t, errW)
assert.False(t, ok)
watcherWG.Done()
}()
})

require.NoError(t, resolver.Shutdown(context.Background()))
watcherWG.Wait()
Expand Down Expand Up @@ -536,12 +534,10 @@ func newRaceDetectorProvider() ProviderFactory {
}

func (p *provider) Retrieve(_ context.Context, _ string, watcher WatcherFunc) (*Retrieved, error) {
p.wg.Add(1)
go func() {
p.wg.Go(func() {
// mock a config change event and wait for goroutine to return.
defer p.wg.Done()
watcher(&ChangeEvent{})
}()
})
return NewRetrieved(map[string]any{})
}

Expand Down
2 changes: 1 addition & 1 deletion confmap/xconfmap/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/confmap/xconfmap

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion connector/connectortest/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/connector/connectortest

go 1.24.0
go 1.25.0

require (
github.com/google/uuid v1.6.0
Expand Down
2 changes: 1 addition & 1 deletion connector/forwardconnector/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/connector/forwardconnector

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion connector/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/connector

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion connector/xconnector/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/connector/xconnector

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion consumer/consumererror/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/consumer/consumererror

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion consumer/consumererror/xconsumererror/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/consumer/consumererror/xconsumererror

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion consumer/consumertest/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/consumer/consumertest

go 1.24.0
go 1.25.0

replace go.opentelemetry.io/collector/consumer => ../

Expand Down
Loading
Loading