From aea61eabb61731945654bcf9447ca7745feef408 Mon Sep 17 00:00:00 2001
From: Nicholas Cristofaro <nicholas.cristofaro@thethingsindustries.com>
Date: Wed, 12 Feb 2025 11:19:11 -0300
Subject: [PATCH 1/2] Merge pull request #7508 from
 TheThingsNetwork/backport/update-webhook-disabled-error

Update errWebhookDisabled attributes
---
 config/messages.json                        |  2 +-
 pkg/applicationserver/io/web/sink/health.go | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/config/messages.json b/config/messages.json
index 5109030ed5..665fdefe86 100644
--- a/config/messages.json
+++ b/config/messages.json
@@ -2764,7 +2764,7 @@
   },
   "error:pkg/applicationserver/io/web/sink:webhook_disabled": {
     "translations": {
-      "en": "webhook disabled"
+      "en": "webhook {webhook_id} of application {application_id} is disabled"
     },
     "description": {
       "package": "pkg/applicationserver/io/web/sink",
diff --git a/pkg/applicationserver/io/web/sink/health.go b/pkg/applicationserver/io/web/sink/health.go
index 3c14829e4c..f8f427ba9e 100644
--- a/pkg/applicationserver/io/web/sink/health.go
+++ b/pkg/applicationserver/io/web/sink/health.go
@@ -19,6 +19,7 @@ import (
 	"net/http"
 	"time"
 
+	"go.thethings.network/lorawan-stack/v3/pkg/applicationserver/io/web/internal"
 	"go.thethings.network/lorawan-stack/v3/pkg/errors"
 	"go.thethings.network/lorawan-stack/v3/pkg/ttnpb"
 	"google.golang.org/protobuf/types/known/timestamppb"
@@ -60,7 +61,9 @@ const (
 	healthStateUnhealthy
 )
 
-var errWebhookDisabled = errors.DefineAborted("webhook_disabled", "webhook disabled")
+var errWebhookDisabled = errors.DefineAborted(
+	"webhook_disabled", "webhook {webhook_id} of application {application_id} is disabled",
+)
 
 // preRunCheck verifies if the webhook should be executed.
 func (hcs *healthCheckSink) preRunCheck(ctx context.Context) (healthState, error) {
@@ -102,7 +105,10 @@ func (hcs *healthCheckSink) preRunCheck(ctx context.Context) (healthState, error
 
 		default:
 			// The webhook is above the threshold, and the cooldown period has not passed yet.
-			return healthStateUnhealthy, errWebhookDisabled.New()
+			return healthStateUnhealthy, errWebhookDisabled.WithAttributes(
+				"application_id", internal.WebhookIDFromContext(ctx).ApplicationIds.ApplicationId,
+				"webhook_id", internal.WebhookIDFromContext(ctx).WebhookId,
+			)
 		}
 
 	default:

From 67676436d06991ac347f91638a73e9c6fa1d4384 Mon Sep 17 00:00:00 2001
From: Nicholas Cristofaro <nicholas.cristofaro@thethingsindustries.com>
Date: Wed, 12 Feb 2025 11:20:34 -0300
Subject: [PATCH 2/2] dev: Remove v3.34 changelog notes

---
 CHANGELOG.md | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f249a3413..be661dd41a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,24 +11,10 @@ For details about compatibility between different releases, see the **Commitment
 
 ### Added
 
-- Add recvTime field to the decodeUplink input in payload formatters
-- Add the latest battery percentage of the end device in the `ApplicationUplink` message.
-- Add live data split view tutorial to the Console.
-- Add end device attributes to ApplicationUp messages.
-  - Add the locations, version_ids, network_ids fields to the following ApplicationUp messages:
-    - ApplicationJoinAccept
-    - ApplicationDownlink
-    - ApplicationDownlinkFailed
-    - ApplicationInvalidatedDownlinks
-    - ApplicationServiceData
-  - Add Timeout and Cache fields in the EndDeviceMetadataStorageConfig of the AS.
-
 ### Changed
 
 ### Deprecated
 
-- Deprecate the Location field (and its subfields) in the EndDeviceMetadataStorageConfig of AS.
-
 ### Removed
 
 ### Fixed