[WIP] match Go support with upstream policy

DataDog · May 22, 2024 · 277175e · 277175e
1 parent 14d15d5
commit 277175e
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 47 deletions.
diff --git a/.github/workflows/appsec.yml b/.github/workflows/appsec.yml
@@ -95,7 +95,7 @@ jobs:
     strategy:
       matrix:
         runs-on: [ macos-11, macos-14 ] # oldest and newest macos runners available - macos-14 mainly is here to cover the fact it is an ARM machine
-        go-version: [ "1.22", "1.21", "1.20" ]
+        go-version: [ oldstable, stable ]
       fail-fast: true # saving some CI time - macos runners too long to get
     steps:
       - uses: actions/checkout@v4
@@ -190,6 +190,8 @@ jobs:
     needs: go-mod-caching
     strategy:
       matrix:
+        # TODO: make this work with the "stable" and "oldstable" versions?
+        # Go support will be tied to the distribution
         go-version: [ "1.22", "1.21", "1.20" ]
         distribution: [ bookworm, bullseye, buster, alpine ]
         platform: [ linux/amd64, linux/arm64 ]

diff --git a/.github/workflows/main-branch-tests.yml b/.github/workflows/main-branch-tests.yml
@@ -22,7 +22,7 @@ jobs:
   unit-integration-tests:
     strategy:
       matrix:
-        go-version: ["1.20", "1.21", "1.22"]
+        go-version: [ oldstable, stable ]
       fail-fast: false
     uses: ./.github/workflows/unit-integration-tests.yml
     with:
@@ -33,7 +33,7 @@ jobs:
     strategy:
       matrix:
         runs-on: [ macos-latest, windows-latest, ubuntu-latest ]
-        go-version: ["1.20", "1.21", "1.22"]
+        go-version: [ oldstable, stable ]
       fail-fast: false
     uses: ./.github/workflows/multios-unit-tests.yml
     with:

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -18,6 +18,6 @@ jobs:
     name: PR Unit and Integration Tests
     uses: ./.github/workflows/unit-integration-tests.yml
     with:
-      go-version: "1.20"
+      go-version: oldstable
       ref: ${{ github.ref }}
     secrets: inherit
diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
@@ -99,7 +99,7 @@ jobs:
       matrix:
         # TODO: cross-compilation from/to different hardware architectures once
         #       github provides native ARM runners.
-        go: [ "1.20", "1.21", "1.22" ]
+        go: [ oldstable, stable ]
         build-env: [ alpine, bookworm, bullseye ]
         build-with-cgo: [ 0, 1 ]
         deployment-env: [ alpine, debian11, debian12, al2, al2023, busybox, scratch ]

diff --git a/README.md b/README.md
@@ -43,48 +43,10 @@ If you installed more packages than you intended, you can use `go mod tidy` to r
  - [Application Security Monitoring](https://docs.datadoghq.com/security_platform/application_security/setup_and_configure/?code-lang=go)
  - If you are migrating from an older version of the tracer (e.g. 0.6.x) you may also find the [migration document](MIGRATING.md) we've put together helpful.
 
-### Support Policy
+### Go Support Policy
 
-Datadog APM for Go is built upon dependencies defined in specific versions of the host operating system, Go releases, and the Datadog Agent/API. For Go the two latest releases are [GA](#support-ga) supported and the version before that is in [Maintenance](#support-maintenance). We do make efforts to support older releases, but generally these releases are considered [Legacy](#support-legacy). This library only officially supports [first class ports](https://github.com/golang/go/wiki/PortingPolicy#first-class-ports) of Go.
-
-| **Level**                                              | **Support provided**                                                                                                                                                         |
-|--------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| <span id="support-ga">General Availability (GA)</span> | Full implementation of all features. Full support for new features, bug & security fixes.                                                                                    |
-| <span id="support-maintenance">Maintenance</span>      | Full implementation of existing features. May receive new features. Support for bug & security fixes only.                                                                   |
-| <span id="support-legacy">Legacy</span>                | Legacy implementation. May have limited function, but no maintenance provided. Not guaranteed to compile the latest version of dd-trace-go. [Contact our customer support team for special requests.](https://www.datadoghq.com/support/) |
-
-### Supported Versions
-<!-- NOTE: When updating the below section ensure you update the minimum supported version listed in the public docs here: https://docs.datadoghq.com/tracing/setup_overview/setup/go/?tab=containers#compatibility-requirements -->
-| **Go Version** | **Support level**                   |
-|----------------|-------------------------------------|
-| 1.22           | [GA](#support-ga)                   |
-| 1.21           | [GA](#support-ga)                   |
-| 1.20           | [Maintenance](#support-maintenance) |
-| 1.19           | [Legacy](#support-legacy)           |
-
-* Datadog's Trace Agent >= 5.21.1
-
-
-#### Package Versioning
-
-A **Minor** version change will be released whenever a new version of Go is released. At that time the newest version of Go is added to [GA](#support-ga), the second oldest supported version moved to [Maintenance](#support-maintenance) and the oldest previously supported version dropped to [Legacy](#support-legacy).
-**For example**:
-For a dd-trace-go version 1.37.*
-
-| Go Version | Support                             |
-|------------|-------------------------------------|
-| 1.18       | [GA](#support-ga)                   |
-| 1.17       | [GA](#support-ga)                   |
-| 1.16       | [Maintenance](#support-maintenance) |
-
-Then after Go 1.19 is released there will be a new dd-trace-go version 1.38.0 with support:
-
-| Go Version | Support                             |
-|------------|-------------------------------------|
-| 1.19       | [GA](#support-ga)                   |
-| 1.18       | [GA](#support-ga)                   |
-| 1.17       | [Maintenance](#support-maintenance) |
-| 1.16       | [Legacy](#support-legacy)           |
+Datadog APM for Go is built upon dependencies defined in specific versions of the host operating system, Go releases, and the Datadog Agent/API. dd-trace-go supports the two latest releases of Go, matching the [official Go policy](https://go.dev/doc/devel/release#policy). This library only officially supports [first class ports](https://go.dev/wiki/PortingPolicy) of Go.
+_TODO: rationale, example?_
 
 ### Contributing
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module gopkg.in/DataDog/dd-trace-go.v1
 
-go 1.20
+go 1.21
 
 require (
 	cloud.google.com/go/pubsub v1.33.0