Kacper murzyn/7.49.1 final (#20885)

* Final updates for 7.49.1 * Add prelude for 7.49.1 release
DataDog · Nov 15, 2023 · 1790cab · 1790cab
1 parent bcd2c46
commit 1790cab
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 27 deletions.
diff --git a/go.mod b/go.mod
@@ -43,15 +43,15 @@ require (
 	code.cloudfoundry.org/lager v2.0.0+incompatible
 	github.com/CycloneDX/cyclonedx-go v0.7.1
 	github.com/DataDog/appsec-internal-go v1.0.1-0.20230723140106-7cb513f54ce1
-	github.com/DataDog/datadog-agent/pkg/gohai v0.49.1-rc.1
-	github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.1-rc.1
-	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.1-rc.1
-	github.com/DataDog/datadog-agent/pkg/security/secl v0.49.1-rc.1
-	github.com/DataDog/datadog-agent/pkg/trace v0.49.1-rc.1
-	github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.1-rc.1
-	github.com/DataDog/datadog-agent/pkg/util/log v0.49.1-rc.1
-	github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.1-rc.1
-	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.1-rc.1
+	github.com/DataDog/datadog-agent/pkg/gohai v0.49.1
+	github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.1
+	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.1
+	github.com/DataDog/datadog-agent/pkg/security/secl v0.49.1
+	github.com/DataDog/datadog-agent/pkg/trace v0.49.1
+	github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.1
+	github.com/DataDog/datadog-agent/pkg/util/log v0.49.1
+	github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.1
+	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.1
 	github.com/DataDog/datadog-go/v5 v5.3.0
 	github.com/DataDog/datadog-operator v1.1.0
 	github.com/DataDog/ebpf-manager v0.3.1
@@ -554,8 +554,8 @@ 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.97
-	github.com/DataDog/datadog-agent/pkg/networkdevice/profile v0.49.1-rc.1
-	github.com/DataDog/datadog-agent/pkg/proto v0.49.1-rc.1
+	github.com/DataDog/datadog-agent/pkg/networkdevice/profile v0.49.1
+	github.com/DataDog/datadog-agent/pkg/proto v0.49.1
 	github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.0
 	github.com/aquasecurity/trivy v0.0.0-00010101000000-000000000000
 	github.com/cloudfoundry-community/go-cfclient/v2 v2.0.1-0.20230503155151-3d15366c5820

diff --git 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.49.1-rc.1
+	github.com/DataDog/datadog-agent/pkg/util/log v0.49.1
 	github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575
 	github.com/moby/sys/mountinfo v0.6.2
 	github.com/shirou/gopsutil/v3 v3.23.8
@@ -14,7 +14,7 @@ require (
 )
 
 require (
-	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.1-rc.1 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.1 // 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/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.49.1-rc.1
-	github.com/DataDog/datadog-agent/pkg/proto v0.49.1-rc.1
-	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.1-rc.1
-	github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.1-rc.1
-	github.com/DataDog/datadog-agent/pkg/util/log v0.49.1-rc.1
-	github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.1-rc.1
-	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.1-rc.1
+	github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.1
+	github.com/DataDog/datadog-agent/pkg/proto v0.49.1
+	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.1
+	github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.1
+	github.com/DataDog/datadog-agent/pkg/util/log v0.49.1
+	github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.1
+	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.1
 	github.com/DataDog/datadog-go/v5 v5.1.1
 	github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0
 	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.49.1-rc.1
-	github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.1-rc.1
+	github.com/DataDog/datadog-agent/pkg/util/log v0.49.1
+	github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.1
 	github.com/containerd/cgroups/v3 v3.0.2
 	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.49.1-rc.1 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.1 // 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.20
 replace github.com/DataDog/datadog-agent/pkg/util/scrubber => ../scrubber
 
 require (
-	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.1-rc.1
+	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.1
 	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
@@ -45,7 +45,7 @@
         "WINDOWS_APMINJECT_SHASUM": "c5c228f6030ce2e19b8bfb28bd054dc246c7f1c799431e73018e6cb46ee59d2f"
     },
     "release-a6": {
-        "INTEGRATIONS_CORE_VERSION": "7.49.1-rc.1",
+        "INTEGRATIONS_CORE_VERSION": "7.49.1",
         "OMNIBUS_SOFTWARE_VERSION": "7.49.0",
         "OMNIBUS_RUBY_VERSION": "7.49.0",
         "JMXFETCH_VERSION": "0.48.0",
@@ -57,7 +57,7 @@
         "WINDOWS_DDNPM_SHASUM": "57a53c23e0b40da1e75094058498f9982dc80f6aa7feb5a1c8aece6e08292840"
     },
     "release-a7": {
-        "INTEGRATIONS_CORE_VERSION": "7.49.1-rc.1",
+        "INTEGRATIONS_CORE_VERSION": "7.49.1",
         "OMNIBUS_SOFTWARE_VERSION": "7.49.0",
         "OMNIBUS_RUBY_VERSION": "7.49.0",
         "JMXFETCH_VERSION": "0.48.0",

diff --git a/releasenotes/notes/prelude-release-7.49.1-a8c44cf5a478cbc9.yaml b/releasenotes/notes/prelude-release-7.49.1-a8c44cf5a478cbc9.yaml
@@ -0,0 +1,5 @@
+prelude:
+    |
+    Release on: 2023-11-15
+
+    - Please refer to the `7.49.1 tag on integrations-core <https://github.com/DataDog/integrations-core/blob/master/AGENT_CHANGELOG.md#datadog-agent-version-7491>`_ 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.20
 replace github.com/DataDog/datadog-agent/test/fakeintake => ../fakeintake
 
 require (
-	github.com/DataDog/datadog-agent/test/fakeintake v0.49.1-rc.1
+	github.com/DataDog/datadog-agent/test/fakeintake v0.49.1
 	// 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