From 7b562e77cf9b3fe43dba5a351ccb0c5d1d8a4291 Mon Sep 17 00:00:00 2001 From: Kacper <89013263+kacper-murzyn@users.noreply.github.com> Date: Fri, 15 Dec 2023 16:22:51 +0100 Subject: [PATCH] Agent 7.50.0 final PR (#21584) * Final updates for 7.50.0 release * 7.50.0 changelog prelude added --- comp/core/telemetry/go.mod | 2 +- go.mod | 80 +++++++++---------- pkg/aggregator/ckey/go.mod | 4 +- pkg/config/env/go.mod | 10 +-- pkg/config/logs/go.mod | 6 +- pkg/config/model/go.mod | 4 +- pkg/gohai/go.mod | 4 +- pkg/metrics/go.mod | 20 ++--- pkg/orchestrator/model/go.mod | 4 +- pkg/process/util/api/go.mod | 6 +- pkg/tagset/go.mod | 2 +- pkg/telemetry/go.mod | 4 +- pkg/trace/go.mod | 14 ++-- pkg/util/cgroups/go.mod | 6 +- pkg/util/filesystem/go.mod | 4 +- pkg/util/http/go.mod | 6 +- pkg/util/log/go.mod | 2 +- release.json | 16 ++-- ...elude-release-7.50.0-12dd2626366f99a2.yaml | 5 ++ test/new-e2e/go.mod | 4 +- 20 files changed, 104 insertions(+), 99 deletions(-) create mode 100644 releasenotes/notes/prelude-release-7.50.0-12dd2626366f99a2.yaml diff --git a/comp/core/telemetry/go.mod b/comp/core/telemetry/go.mod index 8f1e77f48bbf6..8fbec4ac0cd9c 100644 --- a/comp/core/telemetry/go.mod +++ b/comp/core/telemetry/go.mod @@ -5,7 +5,7 @@ go 1.20 replace github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../../pkg/util/fxutil require ( - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.50.0-rc.7 + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.50.0 github.com/prometheus/client_golang v1.17.0 github.com/prometheus/client_model v0.5.0 github.com/stretchr/testify v1.8.4 diff --git a/go.mod b/go.mod index f553f43d882d5..59e95aec88d46 100644 --- a/go.mod +++ b/go.mod @@ -72,15 +72,15 @@ require ( code.cloudfoundry.org/lager v2.0.0+incompatible github.com/CycloneDX/cyclonedx-go v0.7.2 github.com/DataDog/appsec-internal-go v1.0.1 - github.com/DataDog/datadog-agent/pkg/gohai v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/security/secl v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 + github.com/DataDog/datadog-agent/pkg/gohai v0.50.0 + github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0 + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0 + github.com/DataDog/datadog-agent/pkg/security/secl v0.50.0 + github.com/DataDog/datadog-agent/pkg/trace v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0 github.com/DataDog/datadog-go/v5 v5.3.0 // do not update datadog-operator to 1.2.1 because the indirect dependency github.com/DataDog/datadog-api-client-go/v2 v2.15.0 is trigger a huge Go heap memory increase. github.com/DataDog/datadog-operator v1.1.0 @@ -583,35 +583,35 @@ require github.com/lorenzosaino/go-sysctl v0.3.1 require ( github.com/DATA-DOG/go-sqlmock v1.5.0 github.com/DataDog/agent-payload/v5 v5.0.100 - github.com/DataDog/datadog-agent/comp/core/telemetry v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/aggregator/ckey v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/config/env v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/config/logs v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/config/model v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/errors v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/metrics v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/networkdevice/profile v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/orchestrator/model v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/process/util/api v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/status/health v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/tagset v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/telemetry v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/backoff v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/cache v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/common v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/compression v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/executable v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/http v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/json v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/optional v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/sort v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/statstracker v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/testutil v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/version v0.50.0-rc.7 + github.com/DataDog/datadog-agent/comp/core/telemetry v0.50.0 + github.com/DataDog/datadog-agent/pkg/aggregator/ckey v0.50.0 + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.50.0 + github.com/DataDog/datadog-agent/pkg/config/env v0.50.0 + github.com/DataDog/datadog-agent/pkg/config/logs v0.50.0 + github.com/DataDog/datadog-agent/pkg/config/model v0.50.0 + github.com/DataDog/datadog-agent/pkg/errors v0.50.0 + github.com/DataDog/datadog-agent/pkg/metrics v0.50.0 + github.com/DataDog/datadog-agent/pkg/networkdevice/profile v0.50.0 + github.com/DataDog/datadog-agent/pkg/orchestrator/model v0.50.0 + github.com/DataDog/datadog-agent/pkg/process/util/api v0.50.0 + github.com/DataDog/datadog-agent/pkg/proto v0.50.0 + github.com/DataDog/datadog-agent/pkg/status/health v0.50.0 + github.com/DataDog/datadog-agent/pkg/tagset v0.50.0 + github.com/DataDog/datadog-agent/pkg/telemetry v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/backoff v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/cache v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/common v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/compression v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/executable v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/http v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/json v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/optional v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/sort v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/statstracker v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/testutil v0.50.0 + github.com/DataDog/datadog-agent/pkg/version v0.50.0 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.0 github.com/aquasecurity/trivy v0.0.0-00010101000000-000000000000 github.com/aws/aws-sdk-go-v2/service/kms v1.22.2 @@ -634,8 +634,8 @@ require ( require ( github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect - github.com/DataDog/datadog-agent/pkg/util/buf v0.50.0-rc.7 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/buf v0.50.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.50.0 // indirect github.com/DataDog/datadog-api-client-go/v2 v2.13.0 // indirect github.com/DataDog/go-sqllexer v0.0.8 // indirect github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect diff --git a/pkg/aggregator/ckey/go.mod b/pkg/aggregator/ckey/go.mod index 3abc711a6988e..9db2b1e905d99 100644 --- a/pkg/aggregator/ckey/go.mod +++ b/pkg/aggregator/ckey/go.mod @@ -8,8 +8,8 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/tagset v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/sort v0.50.0-rc.7 + github.com/DataDog/datadog-agent/pkg/tagset v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/sort v0.50.0 github.com/stretchr/testify v1.8.4 github.com/twmb/murmur3 v1.1.8 ) diff --git a/pkg/config/env/go.mod b/pkg/config/env/go.mod index 5dbfa0a776bb5..aacaed478911a 100644 --- a/pkg/config/env/go.mod +++ b/pkg/config/env/go.mod @@ -11,15 +11,15 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/config/model v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.50.0-rc.7 + github.com/DataDog/datadog-agent/pkg/config/model v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.50.0 github.com/stretchr/testify v1.8.4 ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0 // indirect github.com/DataDog/viper v1.12.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect diff --git a/pkg/config/logs/go.mod b/pkg/config/logs/go.mod index 6705ed6ecc3e1..a2e091b8f8b46 100644 --- a/pkg/config/logs/go.mod +++ b/pkg/config/logs/go.mod @@ -10,9 +10,9 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/config/model v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 + github.com/DataDog/datadog-agent/pkg/config/model v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0 github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 github.com/stretchr/testify v1.8.4 ) diff --git a/pkg/config/model/go.mod b/pkg/config/model/go.mod index 5ab083d477e08..04fd740c2f690 100644 --- a/pkg/config/model/go.mod +++ b/pkg/config/model/go.mod @@ -9,7 +9,7 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0 github.com/DataDog/viper v1.12.0 github.com/spf13/afero v1.1.2 github.com/spf13/pflag v1.0.3 @@ -17,7 +17,7 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.4.7 // indirect diff --git a/pkg/gohai/go.mod b/pkg/gohai/go.mod index 968b402d27667..a751bdfe46601 100644 --- a/pkg/gohai/go.mod +++ b/pkg/gohai/go.mod @@ -5,7 +5,7 @@ module github.com/DataDog/datadog-agent/pkg/gohai go 1.20 require ( - github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0 github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 github.com/moby/sys/mountinfo v0.7.1 github.com/shirou/gopsutil/v3 v3.23.10 @@ -14,7 +14,7 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/kr/pretty v0.3.1 // indirect diff --git a/pkg/metrics/go.mod b/pkg/metrics/go.mod index e193b176f5751..2272fa12b9a39 100644 --- a/pkg/metrics/go.mod +++ b/pkg/metrics/go.mod @@ -18,22 +18,22 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/aggregator/ckey v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/config/model v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/tagset v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/telemetry v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/buf v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 + github.com/DataDog/datadog-agent/pkg/aggregator/ckey v0.50.0 + github.com/DataDog/datadog-agent/pkg/config/model v0.50.0 + github.com/DataDog/datadog-agent/pkg/tagset v0.50.0 + github.com/DataDog/datadog-agent/pkg/telemetry v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/buf v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0 github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0 github.com/stretchr/testify v1.8.4 go.uber.org/atomic v1.7.0 ) require ( - github.com/DataDog/datadog-agent/comp/core/telemetry v0.50.0-rc.7 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.50.0-rc.7 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 // indirect - github.com/DataDog/datadog-agent/pkg/util/sort v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.50.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.50.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/sort v0.50.0 // indirect github.com/DataDog/sketches-go v1.4.2 // indirect github.com/DataDog/viper v1.12.0 // indirect github.com/beorn7/perks v1.0.1 // indirect diff --git a/pkg/orchestrator/model/go.mod b/pkg/orchestrator/model/go.mod index 6d587aaa917b6..69aa959c023e8 100644 --- a/pkg/orchestrator/model/go.mod +++ b/pkg/orchestrator/model/go.mod @@ -8,12 +8,12 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0 github.com/patrickmn/go-cache v2.1.0+incompatible ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/pkg/process/util/api/go.mod b/pkg/process/util/api/go.mod index 99d85ec0ccc92..287b0046a898d 100644 --- a/pkg/process/util/api/go.mod +++ b/pkg/process/util/api/go.mod @@ -10,14 +10,14 @@ replace ( require ( github.com/DataDog/agent-payload/v5 v5.0.97 - github.com/DataDog/datadog-agent/pkg/telemetry v0.50.0-rc.7 + github.com/DataDog/datadog-agent/pkg/telemetry v0.50.0 github.com/gogo/protobuf v1.3.2 github.com/stretchr/testify v1.8.4 ) require ( - github.com/DataDog/datadog-agent/comp/core/telemetry v0.50.0-rc.7 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.50.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.50.0 // indirect github.com/DataDog/mmh3 v0.0.0-20200805151601-30884ca2197a // indirect github.com/DataDog/zstd v1.4.8 // indirect github.com/DataDog/zstd_0 v0.0.0-20210310093942-586c1286621f // indirect diff --git a/pkg/tagset/go.mod b/pkg/tagset/go.mod index 9c1dd78047c34..bcdee2a16239c 100644 --- a/pkg/tagset/go.mod +++ b/pkg/tagset/go.mod @@ -5,7 +5,7 @@ go 1.20 replace github.com/DataDog/datadog-agent/pkg/util/sort => ../util/sort/ require ( - github.com/DataDog/datadog-agent/pkg/util/sort v0.50.0-rc.7 + github.com/DataDog/datadog-agent/pkg/util/sort v0.50.0 github.com/stretchr/testify v1.8.4 github.com/twmb/murmur3 v1.1.8 ) diff --git a/pkg/telemetry/go.mod b/pkg/telemetry/go.mod index 187bf0edf7d4c..33ac64d01a8a9 100644 --- a/pkg/telemetry/go.mod +++ b/pkg/telemetry/go.mod @@ -7,10 +7,10 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/fxutil => ../util/fxutil ) -require github.com/DataDog/datadog-agent/comp/core/telemetry v0.50.0-rc.7 +require github.com/DataDog/datadog-agent/comp/core/telemetry v0.50.0 require ( - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.50.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/pkg/trace/go.mod b/pkg/trace/go.mod index 58bce1b19f52c..755ef693a34dd 100644 --- a/pkg/trace/go.mod +++ b/pkg/trace/go.mod @@ -10,13 +10,13 @@ go 1.20 replace github.com/docker/distribution => github.com/docker/distribution v2.8.1+incompatible require ( - github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 + github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0 + github.com/DataDog/datadog-agent/pkg/proto v0.50.0 + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0 github.com/DataDog/datadog-go/v5 v5.1.1 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.1 github.com/DataDog/sketches-go v1.4.2 diff --git a/pkg/util/cgroups/go.mod b/pkg/util/cgroups/go.mod index 89a18f6f41eff..ff5664a775cf8 100644 --- a/pkg/util/cgroups/go.mod +++ b/pkg/util/cgroups/go.mod @@ -9,8 +9,8 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7 + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0 github.com/containerd/cgroups/v3 v3.0.2 github.com/google/go-cmp v0.5.8 github.com/karrick/godirwalk v1.17.0 @@ -18,7 +18,7 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/coreos/go-systemd/v22 v22.3.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/pkg/util/filesystem/go.mod b/pkg/util/filesystem/go.mod index bc3e3ef2792dd..550e2ca7538bc 100644 --- a/pkg/util/filesystem/go.mod +++ b/pkg/util/filesystem/go.mod @@ -9,7 +9,7 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0 github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 github.com/shirou/gopsutil/v3 v3.23.9 github.com/stretchr/testify v1.8.4 @@ -17,7 +17,7 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-ole/go-ole v1.2.6 // indirect diff --git a/pkg/util/http/go.mod b/pkg/util/http/go.mod index 75c5f9ee3fd04..e66fba3c0b600 100644 --- a/pkg/util/http/go.mod +++ b/pkg/util/http/go.mod @@ -10,14 +10,14 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/config/model v0.50.0-rc.7 - github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 + github.com/DataDog/datadog-agent/pkg/config/model v0.50.0 + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0 github.com/stretchr/testify v1.8.4 golang.org/x/net v0.15.0 ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0 // indirect github.com/DataDog/viper v1.12.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/pkg/util/log/go.mod b/pkg/util/log/go.mod index a8dcd57285974..c950f6c59babe 100644 --- a/pkg/util/log/go.mod +++ b/pkg/util/log/go.mod @@ -5,7 +5,7 @@ go 1.20 replace github.com/DataDog/datadog-agent/pkg/util/scrubber => ../scrubber require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0 github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 github.com/stretchr/testify v1.8.1 go.uber.org/zap v1.22.0 diff --git a/release.json b/release.json index 88feaf9992481..b883fe91bab4f 100644 --- a/release.json +++ b/release.json @@ -45,25 +45,25 @@ "WINDOWS_APMINJECT_SHASUM": "c5c228f6030ce2e19b8bfb28bd054dc246c7f1c799431e73018e6cb46ee59d2f" }, "release-a6": { - "INTEGRATIONS_CORE_VERSION": "7.50.0-rc.6", - "OMNIBUS_SOFTWARE_VERSION": "7.50.0-rc.4", - "OMNIBUS_RUBY_VERSION": "7.50.0-rc.1", + "INTEGRATIONS_CORE_VERSION": "7.50.0", + "OMNIBUS_SOFTWARE_VERSION": "7.50.0", + "OMNIBUS_RUBY_VERSION": "7.50.0", "JMXFETCH_VERSION": "0.49.0", "JMXFETCH_HASH": "b5c2c3ff27603f469bb11961d559f1154887963e02b9d70d5f1fc7efa527a486", "SECURITY_AGENT_POLICIES_VERSION": "v0.50.0", - "MACOS_BUILD_VERSION": "6.50.0-rc.5", + "MACOS_BUILD_VERSION": "6.50.0", "WINDOWS_DDNPM_DRIVER": "release-signed", "WINDOWS_DDNPM_VERSION": "2.6.0", "WINDOWS_DDNPM_SHASUM": "b1611ad4ceb8366c88767aeb638abefb226081efbf546b8b886952dd1b18ec05" }, "release-a7": { - "INTEGRATIONS_CORE_VERSION": "7.50.0-rc.6", - "OMNIBUS_SOFTWARE_VERSION": "7.50.0-rc.4", - "OMNIBUS_RUBY_VERSION": "7.50.0-rc.1", + "INTEGRATIONS_CORE_VERSION": "7.50.0", + "OMNIBUS_SOFTWARE_VERSION": "7.50.0", + "OMNIBUS_RUBY_VERSION": "7.50.0", "JMXFETCH_VERSION": "0.49.0", "JMXFETCH_HASH": "b5c2c3ff27603f469bb11961d559f1154887963e02b9d70d5f1fc7efa527a486", "SECURITY_AGENT_POLICIES_VERSION": "v0.50.0", - "MACOS_BUILD_VERSION": "7.50.0-rc.5", + "MACOS_BUILD_VERSION": "7.50.0", "WINDOWS_DDNPM_DRIVER": "release-signed", "WINDOWS_DDNPM_VERSION": "2.6.0", "WINDOWS_DDNPM_SHASUM": "b1611ad4ceb8366c88767aeb638abefb226081efbf546b8b886952dd1b18ec05" diff --git a/releasenotes/notes/prelude-release-7.50.0-12dd2626366f99a2.yaml b/releasenotes/notes/prelude-release-7.50.0-12dd2626366f99a2.yaml new file mode 100644 index 0000000000000..aba7e29b38ec6 --- /dev/null +++ b/releasenotes/notes/prelude-release-7.50.0-12dd2626366f99a2.yaml @@ -0,0 +1,5 @@ +prelude: + | + Release on: 2023-12-18 + + - Please refer to the `7.50.0 tag on integrations-core `_ for the list of changes on the Core Checks diff --git a/test/new-e2e/go.mod b/test/new-e2e/go.mod index b09c47763290d..9266c04313825 100644 --- a/test/new-e2e/go.mod +++ b/test/new-e2e/go.mod @@ -13,8 +13,8 @@ replace ( require ( github.com/DataDog/agent-payload/v5 v5.0.73 - github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7 - github.com/DataDog/datadog-agent/test/fakeintake v0.50.0-rc.7 + github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0 + github.com/DataDog/datadog-agent/test/fakeintake v0.50.0 github.com/DataDog/datadog-api-client-go v1.16.0 github.com/DataDog/datadog-api-client-go/v2 v2.15.0 // Are you bumping github.com/DataDog/test-infra-definitions ?