Kacper murzyn/7.47.0 final (#19089)

* Final updates for 7.47.0 * Add prelude for 7.47.0 release
DataDog · Aug 31, 2023 · b8c31bf · b8c31bf
1 parent 97143b0
commit b8c31bf
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 29 deletions.
diff --git a/go.mod b/go.mod
@@ -44,15 +44,15 @@ require (
 	github.com/CycloneDX/cyclonedx-go v0.7.1
 	github.com/DataDog/agent-payload/v5 v5.0.90-0.20230717070528-bfb5d051f2ab
 	github.com/DataDog/appsec-internal-go v0.0.0-20230215162203-5149228be86a
-	github.com/DataDog/datadog-agent/pkg/gohai v0.47.0-rc.9
-	github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.9
-	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.9
-	github.com/DataDog/datadog-agent/pkg/security/secl v0.47.0-rc.9
-	github.com/DataDog/datadog-agent/pkg/trace v0.47.0-rc.9
-	github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.9
-	github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.9
-	github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.9
-	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.9
+	github.com/DataDog/datadog-agent/pkg/gohai v0.47.0
+	github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0
+	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0
+	github.com/DataDog/datadog-agent/pkg/security/secl v0.47.0
+	github.com/DataDog/datadog-agent/pkg/trace v0.47.0
+	github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0
+	github.com/DataDog/datadog-agent/pkg/util/log v0.47.0
+	github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0
+	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0
 	github.com/DataDog/datadog-go/v5 v5.1.1
 	github.com/DataDog/datadog-operator v1.0.3
 	github.com/DataDog/ebpf-manager v0.2.9
@@ -567,7 +567,7 @@ require (
 require github.com/lorenzosaino/go-sysctl v0.3.1
 
 require (
-	github.com/DataDog/datadog-agent/pkg/proto v0.47.0-rc.9
+	github.com/DataDog/datadog-agent/pkg/proto v0.47.0
 	github.com/aquasecurity/trivy v0.0.0-00010101000000-000000000000
 	github.com/cloudfoundry-community/go-cfclient/v2 v2.0.1-0.20230503155151-3d15366c5820
 	github.com/gocomply/scap v0.1.2-0.20230531064509-55a00f73e8d6

diff --git a/pkg/trace/go.mod b/pkg/trace/go.mod
@@ -10,12 +10,12 @@ go 1.18
 replace github.com/docker/distribution => github.com/docker/distribution v2.8.1+incompatible
 
 require (
-	github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.9
-	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.9
-	github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.9
-	github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.9
-	github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.9
-	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.9
+	github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0
+	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0
+	github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0
+	github.com/DataDog/datadog-agent/pkg/util/log v0.47.0
+	github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0
+	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0
 	github.com/DataDog/datadog-go/v5 v5.1.1
 	github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.2.3
 	github.com/DataDog/sketches-go v1.4.2

diff --git a/pkg/util/cgroups/go.mod b/pkg/util/cgroups/go.mod
@@ -9,16 +9,16 @@ replace (
 )
 
 require (
-	github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.9
-	github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.9
+	github.com/DataDog/datadog-agent/pkg/util/log v0.47.0
+	github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0
 	github.com/containerd/cgroups v1.0.4
 	github.com/google/go-cmp v0.5.8
 	github.com/karrick/godirwalk v1.17.0
 	github.com/stretchr/testify v1.8.1
 )
 
 require (
-	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.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/log/go.mod b/pkg/util/log/go.mod
@@ -5,7 +5,7 @@ go 1.18
 replace github.com/DataDog/datadog-agent/pkg/util/scrubber => ../scrubber
 
 require (
-	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.9
+	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.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
@@ -29,25 +29,25 @@
         "SECURITY_AGENT_POLICIES_VERSION": "master"
     },
     "release-a6": {
-        "INTEGRATIONS_CORE_VERSION": "7.47.0-rc.9",
-        "OMNIBUS_SOFTWARE_VERSION": "7.47.0-rc.1",
-        "OMNIBUS_RUBY_VERSION": "7.47.0-rc.1",
+        "INTEGRATIONS_CORE_VERSION": "7.47.0",
+        "OMNIBUS_SOFTWARE_VERSION": "7.47.0",
+        "OMNIBUS_RUBY_VERSION": "7.47.0",
         "JMXFETCH_VERSION": "0.47.9",
         "JMXFETCH_HASH": "fb5c3fc2fb42db1ee5c3a7c6187b316d79d69c50b967db0b7ffde590622d0395",
         "SECURITY_AGENT_POLICIES_VERSION": "v0.47.1",
-        "MACOS_BUILD_VERSION": "6.47.0-rc.1",
+        "MACOS_BUILD_VERSION": "6.47.0",
         "WINDOWS_DDNPM_DRIVER": "release-signed",
         "WINDOWS_DDNPM_VERSION": "2.4.1",
         "WINDOWS_DDNPM_SHASUM": "f12af44306eac3ea15828fd12c24d44ae519692a94a0f1f5d4fa868c3e596b07"
     },
     "release-a7": {
-        "INTEGRATIONS_CORE_VERSION": "7.47.0-rc.9",
-        "OMNIBUS_SOFTWARE_VERSION": "7.47.0-rc.1",
-        "OMNIBUS_RUBY_VERSION": "7.47.0-rc.1",
+        "INTEGRATIONS_CORE_VERSION": "7.47.0",
+        "OMNIBUS_SOFTWARE_VERSION": "7.47.0",
+        "OMNIBUS_RUBY_VERSION": "7.47.0",
         "JMXFETCH_VERSION": "0.47.9",
         "JMXFETCH_HASH": "fb5c3fc2fb42db1ee5c3a7c6187b316d79d69c50b967db0b7ffde590622d0395",
         "SECURITY_AGENT_POLICIES_VERSION": "v0.47.1",
-        "MACOS_BUILD_VERSION": "7.47.0-rc.1",
+        "MACOS_BUILD_VERSION": "7.47.0",
         "WINDOWS_DDNPM_DRIVER": "release-signed",
         "WINDOWS_DDNPM_VERSION": "2.4.1",
         "WINDOWS_DDNPM_SHASUM": "f12af44306eac3ea15828fd12c24d44ae519692a94a0f1f5d4fa868c3e596b07"

diff --git a/releasenotes/notes/prelude-release-7.47.0-72e55990a005407d.yaml b/releasenotes/notes/prelude-release-7.47.0-72e55990a005407d.yaml
@@ -0,0 +1,5 @@
+prelude:
+    |
+    Release on: 2023-08-29
+
+    - Please refer to the `7.47.0 tag on integrations-core <https://github.com/DataDog/integrations-core/blob/master/AGENT_CHANGELOG.md#datadog-agent-version-7470>`_ for the list of changes on the Core Checks
diff --git a/test/new-e2e/go.mod b/test/new-e2e/go.mod
@@ -9,7 +9,7 @@ go 1.18
 replace github.com/DataDog/datadog-agent/test/fakeintake => ../fakeintake
 
 require (
-	github.com/DataDog/datadog-agent/test/fakeintake v0.47.0-rc.9
+	github.com/DataDog/datadog-agent/test/fakeintake v0.47.0
 	// Are you bumping github.com/DataDog/test-infra-definitions ?
 	// You should bump `TEST_INFRA_DEFINITIONS_BUILDIMAGES` in `.gitlab-ci.yml`
 	// `TEST_INFRA_DEFINITIONS_BUILDIMAGES` matches the commit sha in the module version