From 98ca8254ec6a5860cc0b3a4eb557371cf7b6a198 Mon Sep 17 00:00:00 2001
From: Ara Pulido <ara.pulido@datadoghq.com>
Date: Fri, 7 Jun 2024 11:12:57 +0200
Subject: [PATCH 1/2] Pin version 7.54.0

---
 bin/compile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/compile b/bin/compile
index 0b76fd3..72b6e52 100644
--- a/bin/compile
+++ b/bin/compile
@@ -12,7 +12,7 @@ set -o pipefail
 
 # Set agent pinned version
 DD_AGENT_PINNED_VERSION_6="6.53.0-1"
-DD_AGENT_PINNED_VERSION_7="7.53.0-1"
+DD_AGENT_PINNED_VERSION_7="7.54.0-1"
 
 # Parse and derive params
 BUILD_DIR=$1

From 481d55c43a38f528174b3259f92d466f7ef2f8bb Mon Sep 17 00:00:00 2001
From: Ara Pulido <ara.pulido@datadoghq.com>
Date: Fri, 7 Jun 2024 12:57:40 +0200
Subject: [PATCH 2/2] Prepare version 2.21

---
 CHANGELOG.md     | 4 ++++
 extra/datadog.sh | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6155ea..ae380cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [2.21] - 2024-06-07
+
+### Added
+- Datadog Agent 7 pinned version is now `7.54.0`.
 
 ## [2.20] - 2024-05-01
 
diff --git a/extra/datadog.sh b/extra/datadog.sh
index a49b7ae..1c48cf3 100644
--- a/extra/datadog.sh
+++ b/extra/datadog.sh
@@ -77,7 +77,7 @@ done
 # Add tags to the config file
 DYNOHOST="$(hostname )"
 DYNOTYPE=${DYNO%%.*}
-BUILDPACKVERSION="dev"
+BUILDPACKVERSION="2.21"
 DYNO_TAGS="dyno:$DYNO dynotype:$DYNOTYPE buildpackversion:$BUILDPACKVERSION"
 
 # We want always to have the Dyno ID as a host alias to improve correlation