diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 327eb0fcc28..cbd999680f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ env: # backwards compatibility with the previous two minor releases and we # explicitly test our code for these versions so keeping this at prior # versions does not add value. - DEFAULT_GO_VERSION: "~1.24.0" + DEFAULT_GO_VERSION: "~1.25.0" jobs: lint: runs-on: ubuntu-latest @@ -102,7 +102,7 @@ jobs: compatibility-test: strategy: matrix: - go-version: ["1.24.0", "1.23.0"] + go-version: ["1.25.0", "1.24.0", "1.23.0"] platform: - os: ubuntu-latest arch: "386" diff --git a/CHANGELOG.md b/CHANGELOG.md index 8484e61fe34..a18d80a66f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] +This release is the last to support [Go 1.23]. +The next release will require at least [Go 1.24]. + ### Added - Add the `WithTraceAttributeFn` option to `go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda`. (#7556) @@ -16,6 +19,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - The `go.opentelemetry.io/contrib/detectors/autodetect` package is added to automatically compose user defined `resource.Detector`s at runtime. (#7522) - Add the `WithLoggerProviderOptions`, `WithMeterProviderOptions` and `WithTracerProviderOptions` options to `NewSDK` to allow passing custom options to providers in `go.opentelemetry.io/contrib/otelconf`. (#7552) - Added V2 version of AWS EC2 detector `go.opentelemetry.io/contrib/detectors/aws/ec2/v2` due to deprecation of `github.com/aws/aws-sdk-go`. (#6961) +- Support testing of [Go 1.25]. (#7732) ### Changed @@ -1572,6 +1576,7 @@ First official tagged release of `contrib` repository. +[Go 1.25]: https://go.dev/doc/go1.25 [Go 1.24]: https://go.dev/doc/go1.24 [Go 1.23]: https://go.dev/doc/go1.23 [Go 1.22]: https://go.dev/doc/go1.22 diff --git a/README.md b/README.md index a634df44574..3b377e6720b 100644 --- a/README.md +++ b/README.md @@ -52,16 +52,22 @@ This project is tested on the following systems. | OS | Go Version | Architecture | | -------- | ---------- | ------------ | +| Ubuntu | 1.25 | amd64 | | Ubuntu | 1.24 | amd64 | | Ubuntu | 1.23 | amd64 | +| Ubuntu | 1.25 | 386 | | Ubuntu | 1.24 | 386 | | Ubuntu | 1.23 | 386 | +| macOS 13 | 1.25 | amd64 | | macOS 13 | 1.24 | amd64 | | macOS 13 | 1.23 | amd64 | +| macOS | 1.25 | arm64 | | macOS | 1.24 | arm64 | | macOS | 1.23 | arm64 | +| Windows | 1.25 | amd64 | | Windows | 1.24 | amd64 | | Windows | 1.23 | amd64 | +| Windows | 1.25 | 386 | | Windows | 1.24 | 386 | | Windows | 1.23 | 386 | diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/Dockerfile b/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/Dockerfile index 065304d741a..7902d58d7e5 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/Dockerfile +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/Dockerfile @@ -1,6 +1,6 @@ # Copyright The OpenTelemetry Authors # SPDX-License-Identifier: Apache-2.0 -FROM golang:1.24 AS base +FROM golang:1.25 AS base COPY . /src/ WORKDIR /src/instrumentation/github.com/aws/aws-lambda-go/otellambda/example RUN apt-get update diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/Dockerfile b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/Dockerfile index 1a0fe7925d2..bca57e54705 100644 --- a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/Dockerfile +++ b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/Dockerfile @@ -1,6 +1,6 @@ # Copyright The OpenTelemetry Authors # SPDX-License-Identifier: Apache-2.0 -FROM golang:1.24-alpine AS base +FROM golang:1.25-alpine AS base COPY . /src/ WORKDIR /src/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example diff --git a/instrumentation/net/http/httptrace/otelhttptrace/example/Dockerfile b/instrumentation/net/http/httptrace/otelhttptrace/example/Dockerfile index d317887ffd3..5cbd3a43d63 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/example/Dockerfile +++ b/instrumentation/net/http/httptrace/otelhttptrace/example/Dockerfile @@ -1,6 +1,6 @@ # Copyright The OpenTelemetry Authors # SPDX-License-Identifier: Apache-2.0 -FROM golang:1.24-alpine AS base +FROM golang:1.25-alpine AS base COPY . /src/ WORKDIR /src/instrumentation/net/http/httptrace/otelhttptrace/example diff --git a/instrumentation/net/http/otelhttp/example/Dockerfile b/instrumentation/net/http/otelhttp/example/Dockerfile index f41a716dd40..07c91bfd9dc 100644 --- a/instrumentation/net/http/otelhttp/example/Dockerfile +++ b/instrumentation/net/http/otelhttp/example/Dockerfile @@ -1,6 +1,6 @@ # Copyright The OpenTelemetry Authors # SPDX-License-Identifier: Apache-2.0 -FROM golang:1.24-alpine AS base +FROM golang:1.25-alpine AS base COPY . /src/ WORKDIR /src/instrumentation/net/http/otelhttp/example