From 188ec1a0031c6240cae5bad650a74906481277bc Mon Sep 17 00:00:00 2001
From: Pierre Massat <pierre.massat@sentry.io>
Date: Mon, 12 Sep 2022 11:06:19 -0700
Subject: [PATCH 1/3] fix(profiling): Forward the profile from a PoP to a
 processing node

---
 relay-server/src/actors/processor.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/relay-server/src/actors/processor.rs b/relay-server/src/actors/processor.rs
index 3d3977aebb..cf1f9807c3 100644
--- a/relay-server/src/actors/processor.rs
+++ b/relay-server/src/actors/processor.rs
@@ -850,6 +850,10 @@ impl EnvelopeProcessor {
 
     /// Remove profiles if the feature flag is not enabled
     fn process_profiles(&self, state: &mut ProcessEnvelopeState) {
+        if !self.config.processing_enabled() {
+            return;
+        }
+
         let profiling_enabled = state.project_state.has_feature(Feature::Profiling);
         let envelope = &mut state.envelope;
         let context = &state.envelope_context;
@@ -859,10 +863,6 @@ impl EnvelopeProcessor {
                 return;
             }
 
-            if !self.config.processing_enabled() {
-                return;
-            }
-
             match relay_profiling::expand_profile(&item.payload()[..]) {
                 Ok(payloads) => {
                     for payload in payloads.iter() {
@@ -872,7 +872,6 @@ impl EnvelopeProcessor {
                     }
                 }
                 Err(err) => {
-                    println!("{:#?}", err);
                     context.track_outcome(
                         outcome_from_profile_error(err),
                         DataCategory::Profile,

From a5406ee002a75a2e03cf2bf30f326d70462f9efd Mon Sep 17 00:00:00 2001
From: Pierre Massat <pierre.massat@sentry.io>
Date: Mon, 12 Sep 2022 11:20:46 -0700
Subject: [PATCH 2/3] Add a changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3744cf44d3..004c06c0e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
 - Add replay and replay-recording rate limiter. ([#1456](https://github.com/getsentry/relay/pull/1456))
 - Support profiles tagged for many transactions. ([#1444](https://github.com/getsentry/relay/pull/1444))
 - Fix logic reversal typo related to profiling. ([#1463](https://github.com/getsentry/relay/pull/1463))
+- Forward the profile from a PoP to a processing node. ([#1464](https://github.com/getsentry/relay/pull/1464))
 
 **Features**:
 

From 79baa78b2a804e2e7d73cda451fdc955be9f9655 Mon Sep 17 00:00:00 2001
From: Pierre Massat <pierre.massat@sentry.io>
Date: Mon, 12 Sep 2022 11:26:58 -0700
Subject: [PATCH 3/3] Merge change log entries since they are related

---
 CHANGELOG.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 004c06c0e4..ecf706fff3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,9 +24,7 @@
 - Add looser type requirements for the user.id field. ([#1443](https://github.com/getsentry/relay/pull/1443))
 - Add InvalidReplayEvent outcome. ([#1455](https://github.com/getsentry/relay/pull/1455))
 - Add replay and replay-recording rate limiter. ([#1456](https://github.com/getsentry/relay/pull/1456))
-- Support profiles tagged for many transactions. ([#1444](https://github.com/getsentry/relay/pull/1444))
-- Fix logic reversal typo related to profiling. ([#1463](https://github.com/getsentry/relay/pull/1463))
-- Forward the profile from a PoP to a processing node. ([#1464](https://github.com/getsentry/relay/pull/1464))
+- Support profiles tagged for many transactions. ([#1444](https://github.com/getsentry/relay/pull/1444)), ([#1463](https://github.com/getsentry/relay/pull/1463)), ([#1464](https://github.com/getsentry/relay/pull/1464))
 
 **Features**: