Skip to content
Merged
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/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ jobs:
compatibility-test:
strategy:
matrix:
go-version: ["1.26.0", "1.25.0", "1.24.0"]
go-version: ["1.26.0", "1.25.0"]
platform:
- os: ubuntu-latest
arch: "386"
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

## [Unreleased]

### Removed

- Drop support for [Go 1.24]. (#7984)

<!-- Released section -->
<!-- Don't change this section unless doing release -->

Expand Down
7 changes: 0 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,25 +55,18 @@ Currently, this project supports the following environments.
|----------|------------|--------------|
| Ubuntu | 1.26 | amd64 |
| Ubuntu | 1.25 | amd64 |
| Ubuntu | 1.24 | amd64 |
| Ubuntu | 1.26 | 386 |
| Ubuntu | 1.25 | 386 |
| Ubuntu | 1.24 | 386 |
| Ubuntu | 1.26 | arm64 |
| Ubuntu | 1.25 | arm64 |
| Ubuntu | 1.24 | arm64 |
| macOS | 1.26 | amd64 |
| macOS | 1.25 | amd64 |
| macOS | 1.24 | amd64 |
| macOS | 1.26 | arm64 |
| macOS | 1.25 | arm64 |
| macOS | 1.24 | arm64 |
| Windows | 1.26 | amd64 |
| Windows | 1.25 | amd64 |
| Windows | 1.24 | amd64 |
| Windows | 1.26 | 386 |
| Windows | 1.25 | 386 |
| Windows | 1.24 | 386 |

While this project should work for other systems, no compatibility guarantees
are made for those systems currently.
Expand Down
2 changes: 1 addition & 1 deletion bridge/opencensus/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/bridge/opencensus

go 1.24.0
go 1.25.0

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

go 1.24.0
go 1.25.0

require (
go.opencensus.io v0.24.0
Expand Down
2 changes: 1 addition & 1 deletion bridge/opentracing/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/bridge/opentracing

go 1.24.0
go 1.25.0

replace go.opentelemetry.io/otel => ../..

Expand Down
7 changes: 2 additions & 5 deletions exporters/otlp/otlplog/otlploggrpc/exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,7 @@ func TestExporterConcurrentSafe(t *testing.T) {
ctx, cancel := context.WithCancel(t.Context())
runs := new(uint64)
for range goroutines {
wg.Add(1)
go func() {
defer wg.Done()

wg.Go(func() {
r := make([]sdklog.Record, 1)
for {
select {
Expand All @@ -141,7 +138,7 @@ func TestExporterConcurrentSafe(t *testing.T) {
atomic.AddUint64(runs, 1)
}
}
}()
})
}

for atomic.LoadUint64(runs) == 0 {
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/otlplog/otlploggrpc/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc

go 1.24.0
go 1.25.0

// Contains broken dependency on go.opentelemetry.io/otel/sdk/log/logtest.
retract v0.12.0
Expand Down
7 changes: 2 additions & 5 deletions exporters/otlp/otlplog/otlploghttp/exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,7 @@ func TestExporterConcurrentSafe(t *testing.T) {
ctx, cancel := context.WithCancel(t.Context())
runs := new(uint64)
for range goroutines {
wg.Add(1)
go func() {
defer wg.Done()

wg.Go(func() {
r := make([]log.Record, 1)
for {
select {
Expand All @@ -109,7 +106,7 @@ func TestExporterConcurrentSafe(t *testing.T) {
atomic.AddUint64(runs, 1)
}
}
}()
})
}

for atomic.LoadUint64(runs) == 0 {
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/otlplog/otlploghttp/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp

go 1.24.0
go 1.25.0

// Contains broken dependency on go.opentelemetry.io/otel/sdk/log/logtest.
retract v0.12.0
Expand Down
6 changes: 2 additions & 4 deletions exporters/otlp/otlpmetric/otlpmetricgrpc/exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,12 @@ func TestExporterDoesNotBlockTemporalityAndAggregation(t *testing.T) {
require.NoError(t, err)

var wg sync.WaitGroup
wg.Add(1)
go func() {
defer wg.Done()
wg.Go(func() {
rm := new(metricdata.ResourceMetrics)
t.Log("starting export")
require.NoError(t, exp.Export(ctx, rm))
t.Log("export complete")
}()
})

assert.Eventually(t, func() bool {
const inst = metric.InstrumentKindCounter
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc

go 1.24.0
go 1.25.0

retract v0.32.2 // Contains unresolvable dependencies.

Expand Down
6 changes: 2 additions & 4 deletions exporters/otlp/otlpmetric/otlpmetrichttp/exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,12 @@ func TestExporterDoesNotBlockTemporalityAndAggregation(t *testing.T) {
require.NoError(t, err)

var wg sync.WaitGroup
wg.Add(1)
go func() {
defer wg.Done()
wg.Go(func() {
rm := new(metricdata.ResourceMetrics)
t.Log("starting export")
require.NoError(t, exp.Export(ctx, rm))
t.Log("export complete")
}()
})

assert.Eventually(t, func() bool {
const inst = metric.InstrumentKindCounter
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/otlpmetric/otlpmetrichttp/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp

go 1.24.0
go 1.25.0

retract v0.32.2 // Contains unresolvable dependencies.

Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/otlptrace/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/exporters/otlp/otlptrace

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 exporters/otlp/otlptrace/otlptracegrpc/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc

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 exporters/otlp/otlptrace/otlptracehttp/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp

go 1.24.0
go 1.25.0

require (
github.com/cenkalti/backoff/v5 v5.0.3
Expand Down
6 changes: 2 additions & 4 deletions exporters/prometheus/exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1162,12 +1162,10 @@ func TestCollectorConcurrentSafe(t *testing.T) {
var wg sync.WaitGroup
concurrencyLevel := 10
for range concurrencyLevel {
wg.Add(1)
go func() {
defer wg.Done()
wg.Go(func() {
_, err := registry.Gather() // this calls collector.Collect
assert.NoError(t, err)
}()
})
}

wg.Wait()
Expand Down
2 changes: 1 addition & 1 deletion exporters/prometheus/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/exporters/prometheus

go 1.24.0
go 1.25.0

// v0.59.0 produces incorrect metric names when bracketed units are used.
// https://github.com/open-telemetry/opentelemetry-go/issues/7039
Expand Down
2 changes: 1 addition & 1 deletion exporters/stdout/stdoutlog/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/exporters/stdout/stdoutlog

go 1.24.0
go 1.25.0

// Contains broken dependency on go.opentelemetry.io/otel/sdk/log/logtest.
retract v0.12.0
Expand Down
2 changes: 1 addition & 1 deletion exporters/stdout/stdoutmetric/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/exporters/stdout/stdoutmetric

go 1.24.0
go 1.25.0

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

go 1.24.0
go 1.25.0

replace (
go.opentelemetry.io/otel => ../../..
Expand Down
2 changes: 1 addition & 1 deletion exporters/zipkin/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// See the blog post "Deprecating Zipkin Exporter": https://opentelemetry.io/blog/2025/deprecating-zipkin-exporters/
module go.opentelemetry.io/otel/exporters/zipkin

go 1.24.0
go 1.25.0

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

go 1.24.0
go 1.25.0

require (
github.com/cespare/xxhash/v2 v2.3.0
Expand Down
12 changes: 4 additions & 8 deletions internal/global/internal_logging_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,12 @@ import (

func TestLoggerConcurrentSafe(t *testing.T) {
var wg sync.WaitGroup
wg.Add(1)
go func() {
defer wg.Done()
wg.Go(func() {
SetLogger(stdr.New(log.New(io.Discard, "", 0)))
}()
wg.Add(1)
go func() {
defer wg.Done()
})
wg.Go(func() {
Info("")
}()
})

wg.Wait()
ResetForTest(t)
Expand Down
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 go.opentelemetry.io/otel/internal/tools

go 1.24.0
go 1.25.0

require (
github.com/Masterminds/semver v1.5.0
Expand Down
2 changes: 1 addition & 1 deletion log/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/log

go 1.24.0
go 1.25.0

require (
github.com/go-logr/logr v1.4.3
Expand Down
2 changes: 1 addition & 1 deletion log/logtest/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/log/logtest

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 metric/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/metric

go 1.24.0
go 1.25.0

require (
github.com/stretchr/testify v1.11.1
Expand Down
36 changes: 12 additions & 24 deletions metric/instrument_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,44 +98,32 @@ func TestWithAttributesConcurrentSafe(*testing.T) {
}

var wg sync.WaitGroup
wg.Add(1)
go func() {
defer wg.Done()
wg.Go(func() {
opt := []AddOption{WithAttributes(attrs...)}
_ = NewAddConfig(opt)
}()
wg.Add(1)
go func() {
defer wg.Done()
})
wg.Go(func() {
opt := []AddOption{WithAttributes(attrs...)}
_ = NewAddConfig(opt)
}()
})

wg.Add(1)
go func() {
defer wg.Done()
wg.Go(func() {
opt := []RecordOption{WithAttributes(attrs...)}
_ = NewRecordConfig(opt)
}()
wg.Add(1)
go func() {
defer wg.Done()
})
wg.Go(func() {
opt := []RecordOption{WithAttributes(attrs...)}
_ = NewRecordConfig(opt)
}()
})

wg.Add(1)
go func() {
defer wg.Done()
wg.Go(func() {
opt := []ObserveOption{WithAttributes(attrs...)}
_ = NewObserveConfig(opt)
}()
wg.Add(1)
go func() {
defer wg.Done()
})
wg.Go(func() {
opt := []ObserveOption{WithAttributes(attrs...)}
_ = NewObserveConfig(opt)
}()
})

wg.Wait()
}
2 changes: 1 addition & 1 deletion schema/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/schema

go 1.24.0
go 1.25.0

require (
github.com/Masterminds/semver/v3 v3.4.0
Expand Down
2 changes: 1 addition & 1 deletion sdk/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/sdk

go 1.24.0
go 1.25.0

replace go.opentelemetry.io/otel => ../

Expand Down
Loading
Loading