From 58333a70b1106f9335752d9207757fcafe5fe760 Mon Sep 17 00:00:00 2001
From: emeroad <emeroad@gmail.com>
Date: Fri, 12 Nov 2021 18:13:04 +0900
Subject: [PATCH] [#8402] Add ServletFilter based ErrorHandler

---
 .../java/com/navercorp/pinpoint/web/WebServerConfig.java   | 6 ++++++
 web/src/main/resources/application.yml                     | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/web/src/main/java/com/navercorp/pinpoint/web/WebServerConfig.java b/web/src/main/java/com/navercorp/pinpoint/web/WebServerConfig.java
index 85bd193b639e..47a07cb3ee25 100644
--- a/web/src/main/java/com/navercorp/pinpoint/web/WebServerConfig.java
+++ b/web/src/main/java/com/navercorp/pinpoint/web/WebServerConfig.java
@@ -1,6 +1,7 @@
 package com.navercorp.pinpoint.web;
 
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.boot.web.servlet.support.ErrorPageFilter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.filter.ShallowEtagHeaderFilter;
@@ -18,4 +19,9 @@ public FilterRegistrationBean etagFilterBean() {
         filterBean.setUrlPatterns(Collections.singletonList("*"));
         return filterBean;
     }
+
+    @Bean
+    public Filter errorPageFilter() {
+        return new ErrorPageFilter();
+    }
 }
diff --git a/web/src/main/resources/application.yml b/web/src/main/resources/application.yml
index 38bca356952d..44b92eac1521 100644
--- a/web/src/main/resources/application.yml
+++ b/web/src/main/resources/application.yml
@@ -6,3 +6,10 @@ spring:
 
 server:
   port: 8080
+  error:
+    include-exception: true
+    include-message: always
+    include-binding-errors: always
+    include-stacktrace: always
+    whitelabel:
+      enabled: true
\ No newline at end of file