From e61ad18c79e3a05027606933347bd40353e4294c Mon Sep 17 00:00:00 2001
From: Stian Gustavsson <stian.gustavsson@nav.no>
Date: Wed, 24 Apr 2024 09:36:07 +0200
Subject: [PATCH] Bugfix/logback layout rename and fix (#3473)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Endret navn på TestnavLogbackLayout og fikset path for proxyer med reactive-core
* Fikset logback-spring.xml for dollystatus og bruker-service appene
---
 .github/workflows/proxy.arbeidsplassencv-proxy.yml            | 2 +-
 .github/workflows/proxy.inst-proxy.yml                        | 2 +-
 apps/adresse-service/src/main/resources/logback-spring.xml    | 2 +-
 apps/amelding-service/src/main/resources/logback-spring.xml   | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 apps/brreg-stub/src/main/resources/logback-spring.xml         | 2 +-
 apps/bruker-service/src/main/resources/logback-spring.xml     | 4 ++--
 apps/budpro-service/src/main/resources/logback-spring.xml     | 2 +-
 apps/dolly-backend/src/main/resources/logback-spring.xml      | 2 +-
 apps/dolly-frontend/src/main/resources/logback-spring.xml     | 2 +-
 apps/dollystatus/src/main/resources/logback-spring.xml        | 4 +---
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../faste-data-frontend/src/main/resources/logback-spring.xml | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 apps/kodeverk-service/src/main/resources/logback-spring.xml   | 2 +-
 apps/miljoer-service/src/main/resources/logback-spring.xml    | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 4 ++--
 .../src/main/resources/logback-spring.xml                     | 2 +-
 apps/orgnummer-service/src/main/resources/logback-spring.xml  | 2 +-
 apps/oversikt-frontend/src/main/resources/logback-spring.xml  | 2 +-
 apps/pdl-forvalter/src/main/resources/logback-spring.xml      | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 apps/person-service/src/main/resources/logback-spring.xml     | 2 +-
 apps/profil-api/src/main/resources/logback-spring.xml         | 2 +-
 apps/sykemelding-api/src/main/resources/logback-spring.xml    | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 apps/testnav-ident-pool/src/main/resources/logback-spring.xml | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 apps/tilbakemelding-api/src/main/resources/logback-spring.xml | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 apps/udi-stub/src/main/resources/logback-spring.xml           | 2 +-
 apps/varslinger-service/src/main/resources/logback-spring.xml | 4 ++--
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../{DollyLogbackLayout.java => TestnavLogbackLayout.java}    | 4 ++--
 .../{DollyLogbackLayout.java => TestnavLogbackLayout.java}    | 4 ++--
 proxies/aareg-proxy/src/main/resources/logback-spring.xml     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../batch-adeo-proxy/src/main/resources/logback-spring.xml    | 2 +-
 proxies/brregstub-proxy/src/main/resources/logback-spring.xml | 2 +-
 proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml  | 2 +-
 proxies/ereg-proxy/src/main/resources/logback-spring.xml      | 2 +-
 proxies/histark-proxy/src/main/resources/logback-spring.xml   | 2 +-
 .../inntektstub-proxy/src/main/resources/logback-spring.xml   | 4 ++--
 proxies/inst-proxy/src/main/resources/logback-spring.xml      | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 proxies/krrstub-proxy/src/main/resources/logback-spring.xml   | 2 +-
 proxies/medl-proxy/src/main/resources/logback-spring.xml      | 2 +-
 .../modapp-ereg-proxy/src/main/resources/logback-spring.xml   | 2 +-
 proxies/norg2-proxy/src/main/resources/logback-spring.xml     | 2 +-
 proxies/pdl-proxy/src/main/resources/logback-spring.xml       | 4 ++--
 .../src/main/resources/logback-spring.xml                     | 2 +-
 proxies/saf-proxy/src/main/resources/logback-spring.xml       | 2 +-
 .../sigrunstub-proxy/src/main/resources/logback-spring.xml    | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 .../src/main/resources/logback-spring.xml                     | 2 +-
 proxies/udistub-proxy/src/main/resources/logback-spring.xml   | 4 ++--
 80 files changed, 88 insertions(+), 90 deletions(-)
 rename libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/logging/{DollyLogbackLayout.java => TestnavLogbackLayout.java} (92%)
 rename libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/logging/{DollyLogbackLayout.java => TestnavLogbackLayout.java} (92%)

diff --git a/.github/workflows/proxy.arbeidsplassencv-proxy.yml b/.github/workflows/proxy.arbeidsplassencv-proxy.yml
index 8f0f7971e44..e77751fec2b 100644
--- a/.github/workflows/proxy.arbeidsplassencv-proxy.yml
+++ b/.github/workflows/proxy.arbeidsplassencv-proxy.yml
@@ -15,7 +15,7 @@ jobs:
     uses: ./.github/workflows/common.workflow.backend.yml
     with:
       working-directory: "proxies/arbeidsplassencv-proxy"
-      deploy-tag: "#deploy-arbeidsplassencv-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write
diff --git a/.github/workflows/proxy.inst-proxy.yml b/.github/workflows/proxy.inst-proxy.yml
index 9c0ef661478..39cbe07c379 100644
--- a/.github/workflows/proxy.inst-proxy.yml
+++ b/.github/workflows/proxy.inst-proxy.yml
@@ -14,7 +14,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/inst-proxy"
-      deploy-tag: "#deploy-inst-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write
diff --git a/apps/adresse-service/src/main/resources/logback-spring.xml b/apps/adresse-service/src/main/resources/logback-spring.xml
index b5676347c14..ab199264114 100644
--- a/apps/adresse-service/src/main/resources/logback-spring.xml
+++ b/apps/adresse-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/amelding-service/src/main/resources/logback-spring.xml b/apps/amelding-service/src/main/resources/logback-spring.xml
index b674b8f8e84..be1aac763d9 100644
--- a/apps/amelding-service/src/main/resources/logback-spring.xml
+++ b/apps/amelding-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml b/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml
index 803031980fa..c3609245170 100644
--- a/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml
+++ b/apps/app-tilgang-analyse-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml b/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml
index b052f83d230..66437503790 100644
--- a/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml
+++ b/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/batch-bestilling-service/src/main/resources/logback-spring.xml b/apps/batch-bestilling-service/src/main/resources/logback-spring.xml
index 27020c5c331..edd6ddf127d 100644
--- a/apps/batch-bestilling-service/src/main/resources/logback-spring.xml
+++ b/apps/batch-bestilling-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/brreg-stub/src/main/resources/logback-spring.xml b/apps/brreg-stub/src/main/resources/logback-spring.xml
index 86987ef37a2..6fbad19f583 100644
--- a/apps/brreg-stub/src/main/resources/logback-spring.xml
+++ b/apps/brreg-stub/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/bruker-service/src/main/resources/logback-spring.xml b/apps/bruker-service/src/main/resources/logback-spring.xml
index b0e1850eb07..d91dcf28fda 100644
--- a/apps/bruker-service/src/main/resources/logback-spring.xml
+++ b/apps/bruker-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -26,7 +26,7 @@
     <springProfile name="dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/budpro-service/src/main/resources/logback-spring.xml b/apps/budpro-service/src/main/resources/logback-spring.xml
index a92f9af3406..fe32fb984fe 100644
--- a/apps/budpro-service/src/main/resources/logback-spring.xml
+++ b/apps/budpro-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod,dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/dolly-backend/src/main/resources/logback-spring.xml b/apps/dolly-backend/src/main/resources/logback-spring.xml
index 5a6ea947bb8..0ac9fd9264d 100644
--- a/apps/dolly-backend/src/main/resources/logback-spring.xml
+++ b/apps/dolly-backend/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod,dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/dolly-frontend/src/main/resources/logback-spring.xml b/apps/dolly-frontend/src/main/resources/logback-spring.xml
index 57b5465f668..a3942cd251c 100644
--- a/apps/dolly-frontend/src/main/resources/logback-spring.xml
+++ b/apps/dolly-frontend/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod,dev,idporten">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/dollystatus/src/main/resources/logback-spring.xml b/apps/dollystatus/src/main/resources/logback-spring.xml
index aa8d7c84f14..9ebcb909c3d 100644
--- a/apps/dollystatus/src/main/resources/logback-spring.xml
+++ b/apps/dollystatus/src/main/resources/logback-spring.xml
@@ -2,8 +2,7 @@
 <configuration>
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+            <encoder class="net.logstash.logback.encoder.LogstashEncoder">
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -37,5 +36,4 @@
         </root>
     </springProfile>
 
-    <logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger" />
 </configuration>
\ No newline at end of file
diff --git a/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml b/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml
index 4f764105cec..9e331f42ac9 100644
--- a/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml
+++ b/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/endringsmelding-service/src/main/resources/logback-spring.xml b/apps/endringsmelding-service/src/main/resources/logback-spring.xml
index 5bf0e8577fe..0f4f2a2b919 100644
--- a/apps/endringsmelding-service/src/main/resources/logback-spring.xml
+++ b/apps/endringsmelding-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/ereg-batch-status-service/src/main/resources/logback-spring.xml b/apps/ereg-batch-status-service/src/main/resources/logback-spring.xml
index 8cb873abbff..2ab880b62d7 100644
--- a/apps/ereg-batch-status-service/src/main/resources/logback-spring.xml
+++ b/apps/ereg-batch-status-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/faste-data-frontend/src/main/resources/logback-spring.xml b/apps/faste-data-frontend/src/main/resources/logback-spring.xml
index ee4311671c9..ccc4fd23f43 100644
--- a/apps/faste-data-frontend/src/main/resources/logback-spring.xml
+++ b/apps/faste-data-frontend/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml
index cd9958e7178..d763debd20c 100644
--- a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml
+++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/generer-navn-service/src/main/resources/logback-spring.xml b/apps/generer-navn-service/src/main/resources/logback-spring.xml
index 27020c5c331..edd6ddf127d 100644
--- a/apps/generer-navn-service/src/main/resources/logback-spring.xml
+++ b/apps/generer-navn-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml b/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml
index cd9958e7178..d763debd20c 100644
--- a/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml
+++ b/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml b/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml
index 8cb873abbff..2ab880b62d7 100644
--- a/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml
+++ b/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/helsepersonell-service/src/main/resources/logback-spring.xml b/apps/helsepersonell-service/src/main/resources/logback-spring.xml
index a5d35dcff1c..5c64f557653 100644
--- a/apps/helsepersonell-service/src/main/resources/logback-spring.xml
+++ b/apps/helsepersonell-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml b/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml
index cd9958e7178..d763debd20c 100644
--- a/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml
+++ b/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/inntektsmelding-service/src/main/resources/logback-spring.xml b/apps/inntektsmelding-service/src/main/resources/logback-spring.xml
index cd9958e7178..d763debd20c 100644
--- a/apps/inntektsmelding-service/src/main/resources/logback-spring.xml
+++ b/apps/inntektsmelding-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml b/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml
index 00e4f75ed9a..9aa5595725b 100644
--- a/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml
+++ b/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/joark-dokument-service/src/main/resources/logback-spring.xml b/apps/joark-dokument-service/src/main/resources/logback-spring.xml
index 27020c5c331..edd6ddf127d 100644
--- a/apps/joark-dokument-service/src/main/resources/logback-spring.xml
+++ b/apps/joark-dokument-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/kodeverk-service/src/main/resources/logback-spring.xml b/apps/kodeverk-service/src/main/resources/logback-spring.xml
index 8cb873abbff..2ab880b62d7 100644
--- a/apps/kodeverk-service/src/main/resources/logback-spring.xml
+++ b/apps/kodeverk-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/miljoer-service/src/main/resources/logback-spring.xml b/apps/miljoer-service/src/main/resources/logback-spring.xml
index 27020c5c331..edd6ddf127d 100644
--- a/apps/miljoer-service/src/main/resources/logback-spring.xml
+++ b/apps/miljoer-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml b/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml
index 5489f69bcb3..317f7169882 100644
--- a/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml
+++ b/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml b/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml
index 00e4f75ed9a..9aa5595725b 100644
--- a/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml b/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml
index 00e4f75ed9a..9aa5595725b 100644
--- a/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml b/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml
index cd9958e7178..d763debd20c 100644
--- a/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-forvalter/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml b/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml
index b052f83d230..66437503790 100644
--- a/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/organisasjon-service/src/main/resources/logback-spring.xml b/apps/organisasjon-service/src/main/resources/logback-spring.xml
index cd9958e7178..d763debd20c 100644
--- a/apps/organisasjon-service/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml b/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml
index e1e3322d2d5..3b322fd17f2 100644
--- a/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-tilgang-frontend/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -26,7 +26,7 @@
     <springProfile name="dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml b/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml
index 1e309d72767..2a69ad5a185 100644
--- a/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod,dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/orgnummer-service/src/main/resources/logback-spring.xml b/apps/orgnummer-service/src/main/resources/logback-spring.xml
index 8cb873abbff..2ab880b62d7 100644
--- a/apps/orgnummer-service/src/main/resources/logback-spring.xml
+++ b/apps/orgnummer-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/oversikt-frontend/src/main/resources/logback-spring.xml b/apps/oversikt-frontend/src/main/resources/logback-spring.xml
index b674b8f8e84..be1aac763d9 100644
--- a/apps/oversikt-frontend/src/main/resources/logback-spring.xml
+++ b/apps/oversikt-frontend/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/pdl-forvalter/src/main/resources/logback-spring.xml b/apps/pdl-forvalter/src/main/resources/logback-spring.xml
index 67b4a323cb5..69cb57f28ed 100644
--- a/apps/pdl-forvalter/src/main/resources/logback-spring.xml
+++ b/apps/pdl-forvalter/src/main/resources/logback-spring.xml
@@ -4,7 +4,7 @@
     <springProfile name="prod,dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/person-faste-data-service/src/main/resources/logback-spring.xml b/apps/person-faste-data-service/src/main/resources/logback-spring.xml
index ee4311671c9..ccc4fd23f43 100644
--- a/apps/person-faste-data-service/src/main/resources/logback-spring.xml
+++ b/apps/person-faste-data-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml b/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml
index d72fbe3c228..6595d6805a8 100644
--- a/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml
+++ b/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/person-search-service/src/main/resources/logback-spring.xml b/apps/person-search-service/src/main/resources/logback-spring.xml
index b215d575db6..850a2dec259 100644
--- a/apps/person-search-service/src/main/resources/logback-spring.xml
+++ b/apps/person-search-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/person-service/src/main/resources/logback-spring.xml b/apps/person-service/src/main/resources/logback-spring.xml
index aa8d7c84f14..4f1e5f389fd 100644
--- a/apps/person-service/src/main/resources/logback-spring.xml
+++ b/apps/person-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/profil-api/src/main/resources/logback-spring.xml b/apps/profil-api/src/main/resources/logback-spring.xml
index 27020c5c331..edd6ddf127d 100644
--- a/apps/profil-api/src/main/resources/logback-spring.xml
+++ b/apps/profil-api/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/sykemelding-api/src/main/resources/logback-spring.xml b/apps/sykemelding-api/src/main/resources/logback-spring.xml
index 84d7e4ed95b..67ba4ae7fd6 100644
--- a/apps/sykemelding-api/src/main/resources/logback-spring.xml
+++ b/apps/sykemelding-api/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml b/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml
index 27020c5c331..edd6ddf127d 100644
--- a/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml
+++ b/apps/synt-sykemelding-api/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml b/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml
index 9cb1024b42e..ebad5f3dc86 100644
--- a/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml
+++ b/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/tenor-search-service/src/main/resources/logback-spring.xml b/apps/tenor-search-service/src/main/resources/logback-spring.xml
index b8bf9fb69b7..58e27178f53 100644
--- a/apps/tenor-search-service/src/main/resources/logback-spring.xml
+++ b/apps/tenor-search-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/testnav-ident-pool/src/main/resources/logback-spring.xml b/apps/testnav-ident-pool/src/main/resources/logback-spring.xml
index 86987ef37a2..6fbad19f583 100644
--- a/apps/testnav-ident-pool/src/main/resources/logback-spring.xml
+++ b/apps/testnav-ident-pool/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/testnorge-statisk-data-forvalter/src/main/resources/logback-spring.xml b/apps/testnorge-statisk-data-forvalter/src/main/resources/logback-spring.xml
index 86987ef37a2..6fbad19f583 100644
--- a/apps/testnorge-statisk-data-forvalter/src/main/resources/logback-spring.xml
+++ b/apps/testnorge-statisk-data-forvalter/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/tilbakemelding-api/src/main/resources/logback-spring.xml b/apps/tilbakemelding-api/src/main/resources/logback-spring.xml
index 27020c5c331..edd6ddf127d 100644
--- a/apps/tilbakemelding-api/src/main/resources/logback-spring.xml
+++ b/apps/tilbakemelding-api/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/tps-messaging-service/src/main/resources/logback-spring.xml b/apps/tps-messaging-service/src/main/resources/logback-spring.xml
index 86987ef37a2..6fbad19f583 100644
--- a/apps/tps-messaging-service/src/main/resources/logback-spring.xml
+++ b/apps/tps-messaging-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/udi-stub/src/main/resources/logback-spring.xml b/apps/udi-stub/src/main/resources/logback-spring.xml
index af1bd90312f..d8fa230bc40 100644
--- a/apps/udi-stub/src/main/resources/logback-spring.xml
+++ b/apps/udi-stub/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/apps/varslinger-service/src/main/resources/logback-spring.xml b/apps/varslinger-service/src/main/resources/logback-spring.xml
index 08b78c65a79..2e35f55a95a 100644
--- a/apps/varslinger-service/src/main/resources/logback-spring.xml
+++ b/apps/varslinger-service/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -26,7 +26,7 @@
     <springProfile name="dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/examples/reactive-rest-example/src/main/resources/logback-spring.xml b/examples/reactive-rest-example/src/main/resources/logback-spring.xml
index db3ab82bfeb..8bcaee8c3b6 100644
--- a/examples/reactive-rest-example/src/main/resources/logback-spring.xml
+++ b/examples/reactive-rest-example/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/logging/DollyLogbackLayout.java b/libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/logging/TestnavLogbackLayout.java
similarity index 92%
rename from libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/logging/DollyLogbackLayout.java
rename to libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/logging/TestnavLogbackLayout.java
index e49e60d1413..d7399505b23 100644
--- a/libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/logging/DollyLogbackLayout.java
+++ b/libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/logging/TestnavLogbackLayout.java
@@ -6,11 +6,11 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class DollyLogbackLayout extends PatternLayout {
+public class TestnavLogbackLayout extends PatternLayout {
     // matches exactly 11 digits (\\d{11}) that are not immediately preceded ((?<!\\d)) or followed ((?!\\d)) by another digit.
     private final Pattern pattern = Pattern.compile("(?<!\\d)\\d{11}(?!\\d)");
 
-    public DollyLogbackLayout() {
+    public TestnavLogbackLayout() {
         this.setPattern("%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n");
     }
 
diff --git a/libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/logging/DollyLogbackLayout.java b/libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/logging/TestnavLogbackLayout.java
similarity index 92%
rename from libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/logging/DollyLogbackLayout.java
rename to libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/logging/TestnavLogbackLayout.java
index 09ee34b39f4..a502f265411 100644
--- a/libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/logging/DollyLogbackLayout.java
+++ b/libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/logging/TestnavLogbackLayout.java
@@ -6,11 +6,11 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class DollyLogbackLayout extends PatternLayout {
+public class TestnavLogbackLayout extends PatternLayout {
     // matches exactly 11 digits (\\d{11}) that are not immediately preceded ((?<!\\d)) or followed ((?!\\d)) by another digit.
     private final Pattern pattern = Pattern.compile("(?<!\\d)\\d{11}(?!\\d)");
 
-    public DollyLogbackLayout() {
+    public TestnavLogbackLayout() {
         this.setPattern("%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n");
     }
 
diff --git a/proxies/aareg-proxy/src/main/resources/logback-spring.xml b/proxies/aareg-proxy/src/main/resources/logback-spring.xml
index b94eb9388b5..d2ebd887681 100644
--- a/proxies/aareg-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/aareg-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml b/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml
index b674b8f8e84..be1aac763d9 100644
--- a/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml b/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml
index c57325a133c..86df0d95fdd 100644
--- a/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml b/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml
index b674b8f8e84..be1aac763d9 100644
--- a/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml b/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml
index b674b8f8e84..be1aac763d9 100644
--- a/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/brregstub-proxy/src/main/resources/logback-spring.xml b/proxies/brregstub-proxy/src/main/resources/logback-spring.xml
index b674b8f8e84..be1aac763d9 100644
--- a/proxies/brregstub-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/brregstub-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml b/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml
index b674b8f8e84..be1aac763d9 100644
--- a/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/ereg-proxy/src/main/resources/logback-spring.xml b/proxies/ereg-proxy/src/main/resources/logback-spring.xml
index b674b8f8e84..be1aac763d9 100644
--- a/proxies/ereg-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/ereg-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/histark-proxy/src/main/resources/logback-spring.xml b/proxies/histark-proxy/src/main/resources/logback-spring.xml
index aa8d7c84f14..be1aac763d9 100644
--- a/proxies/histark-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/histark-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml b/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml
index aa8d7c84f14..ccc4fd23f43 100644
--- a/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -37,5 +37,5 @@
         </root>
     </springProfile>
 
-    <logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger" />
+    <logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger"/>
 </configuration>
\ No newline at end of file
diff --git a/proxies/inst-proxy/src/main/resources/logback-spring.xml b/proxies/inst-proxy/src/main/resources/logback-spring.xml
index aa8d7c84f14..be1aac763d9 100644
--- a/proxies/inst-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/inst-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml b/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml
index 95094a7d52b..831607f6a95 100644
--- a/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/krrstub-proxy/src/main/resources/logback-spring.xml b/proxies/krrstub-proxy/src/main/resources/logback-spring.xml
index aa8d7c84f14..be1aac763d9 100644
--- a/proxies/krrstub-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/krrstub-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/medl-proxy/src/main/resources/logback-spring.xml b/proxies/medl-proxy/src/main/resources/logback-spring.xml
index aa8d7c84f14..be1aac763d9 100644
--- a/proxies/medl-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/medl-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml b/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml
index aa8d7c84f14..be1aac763d9 100644
--- a/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/modapp-ereg-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/norg2-proxy/src/main/resources/logback-spring.xml b/proxies/norg2-proxy/src/main/resources/logback-spring.xml
index b674b8f8e84..be1aac763d9 100644
--- a/proxies/norg2-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/norg2-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/pdl-proxy/src/main/resources/logback-spring.xml b/proxies/pdl-proxy/src/main/resources/logback-spring.xml
index 27020c5c331..d74b9ab45d2 100644
--- a/proxies/pdl-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/pdl-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -37,5 +37,5 @@
         </root>
     </springProfile>
 
-    <logger level="TRACE" name="no.nav.testnav.libs.servletcore.logging.LogRequestInterceptor" />
+    <logger level="TRACE" name="no.nav.testnav.libs.servletcore.logging.LogRequestInterceptor"/>
 </configuration>
\ No newline at end of file
diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml b/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml
index fd1e65c323e..2d28459cc77 100644
--- a/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/saf-proxy/src/main/resources/logback-spring.xml b/proxies/saf-proxy/src/main/resources/logback-spring.xml
index aa8d7c84f14..be1aac763d9 100644
--- a/proxies/saf-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/saf-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml b/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml
index b674b8f8e84..be1aac763d9 100644
--- a/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml b/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml
index 2b480b75970..233bbeb3c2b 100644
--- a/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/skjermingsregister-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml b/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml
index 5bf0e8577fe..0f4f2a2b919 100644
--- a/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.reactivecore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
diff --git a/proxies/udistub-proxy/src/main/resources/logback-spring.xml b/proxies/udistub-proxy/src/main/resources/logback-spring.xml
index aa8d7c84f14..ccc4fd23f43 100644
--- a/proxies/udistub-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/udistub-proxy/src/main/resources/logback-spring.xml
@@ -3,7 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-                <layout class="no.nav.testnav.libs.servletcore.logging.DollyLogbackLayout"/>
+                <layout class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackLayout"/>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     <maxDepthPerThrowable>256</maxDepthPerThrowable>
@@ -37,5 +37,5 @@
         </root>
     </springProfile>
 
-    <logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger" />
+    <logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger"/>
 </configuration>
\ No newline at end of file