From 4c24a768dfe334d03db516bf87302d519a0fe24f Mon Sep 17 00:00:00 2001
From: k-fish <kevan.fisher@sentry.io>
Date: Tue, 18 May 2021 15:19:39 -0700
Subject: [PATCH] ref(ember): Fix merging of runtime config with environment
 config.

Runtime config initially was meant to act as an override, but moving forward we want to be able to support it accepting the usual Sentry init config so that passing functions is possible.
---
 packages/ember/addon/index.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/ember/addon/index.ts b/packages/ember/addon/index.ts
index eb9e4a9bed26..70807cbd7787 100644
--- a/packages/ember/addon/index.ts
+++ b/packages/ember/addon/index.ts
@@ -17,7 +17,9 @@ export function InitSentryForEmber(_runtimeConfig: BrowserOptions | undefined) {
   assert('Missing configuration.', config);
   assert('Missing configuration for Sentry.', config.sentry || _runtimeConfig);
 
-  const initConfig = Object.assign({}, config.sentry, _runtimeConfig || {});
+  // Permanently merge options into config, preferring runtime config
+  Object.assign(config.sentry, _runtimeConfig || {});
+  const initConfig = Object.assign({}, config.sentry);
 
   initConfig._metadata = initConfig._metadata || {};
   initConfig._metadata.sdk = {