[#9893] Change filename log4j2.xml→log4j2-agent.xml

agent/src/main/resources/pinpoint-root.config

@@ -6,7 +6,7 @@
 #  - Modify `pinpoint.profiler.profiles.active=release` in $PINPOINT_AGENT_DIR/pinpoint-root.config
 # Custom Profile
 #  - 1. Create a custom profile in $PINPOINT_HOME/profiles/MyProfile
-#    - Add pinpoint.config & log4j2.xml
+#    - Add pinpoint.config
 #  - 2. -Dpinpoint.profiler.profiles.active=MyProfile
 # Support external property
 #  - -Dpinpoint.config=$MY_CONFIG_PATH/pinpoint.config

agent/src/main/resources/profiles/local/pinpoint.config

@@ -6,7 +6,7 @@
 #  - Modify `pinpoint.profiler.profiles.active=release` in $PINPOINT_AGENT_DIR/pinpoint-root.config
 # Custom Profile
 #  - 1. Create a custom profile in $PINPOINT_HOME/profiles/MyProfile
-#    - Add pinpoint.config & log4j2.xml
+#    - Add pinpoint.config
 #  - 2. -Dpinpoint.profiler.profiles.active=MyProfile
 # Support external property
 #  - -Dpinpoint.config=$MY_CONFIG_PATH/pinpoint.config

agent/src/main/resources/profiles/release/pinpoint.config

@@ -6,7 +6,7 @@
 #  - Modify `pinpoint.profiler.profiles.active=release` in $PINPOINT_AGENT_DIR/pinpoint-root.config
 # Custom Profile
 #  - 1. Create a custom profile in $PINPOINT_HOME/profiles/MyProfile
-#    - Add pinpoint.config & log4j2.xml
+#    - Add pinpoint.config
 #  - 2. -Dpinpoint.profiler.profiles.active=MyProfile
 # Support external property
 #  - -Dpinpoint.config=$MY_CONFIG_PATH/pinpoint.config

bootstraps/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/config/ProfilePropertyLoader.java

@@ -122,7 +122,7 @@ private void saveAgentRootPath(Path agentRootPath, Properties properties) {
     private void saveLogConfigLocation(String activeProfile, Properties properties) {
         String log4jLocation = properties.getProperty(Profiles.LOG_CONFIG_LOCATION_KEY);
         if (StringUtils.isEmpty(log4jLocation)) {
-            LogConfigResolver logConfigResolver = new ProfileLogConfigResolver(profilesPath, activeProfile);
+            LogConfigResolver logConfigResolver = new SimpleLogConfigResolver(agentRootPath);
             log4jLocation = logConfigResolver.getLogPath().toString();
 
             properties.put(Profiles.LOG_CONFIG_LOCATION_KEY, log4jLocation);

bootstraps/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/config/ProfileLogConfigResolver.java → bootstraps/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/config/SimpleLogConfigResolver.java

@@ -5,15 +5,14 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.navercorp.pinpoint.bootstrap.config;
 
 import java.nio.file.Path;
@@ -22,17 +21,16 @@
 /**
  * @author Woonduk Kang(emeroad)
  */
-public class ProfileLogConfigResolver implements LogConfigResolver {
-    private final Path profilesPath;
-    private final String activeProfile;
+public class SimpleLogConfigResolver implements LogConfigResolver{
+
+    private final Path agentDirPath;
 
-    public ProfileLogConfigResolver(Path profilesPath, String activeProfile) {
-        this.profilesPath = Objects.requireNonNull(profilesPath, "profilesPath");
-        this.activeProfile = Objects.requireNonNull(activeProfile, "activeProfile");
+    public SimpleLogConfigResolver(Path agentDirPath) {
+        this.agentDirPath = Objects.requireNonNull(agentDirPath, "agentDirPath");
     }
 
     @Override
     public Path getLogPath() {
-        return this.profilesPath.resolve(activeProfile);
+        return this.agentDirPath;
     }
 }

bootstraps/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/config/SimplePropertyLoader.java

@@ -73,7 +73,7 @@ private void saveLogConfigLocation(Properties properties) {
             throw new RuntimeException("Failed to read " + Profiles.ACTIVE_PROFILE_KEY + " from systemProperty");
         }
 
-        LogConfigResolver logConfigResolver = new ProfileLogConfigResolver(profilesPath, activeProfile);
+        LogConfigResolver logConfigResolver = new SimpleLogConfigResolver(agentRootPath);
         final Path log4jLocation = logConfigResolver.getLogPath();
 
         properties.put(Profiles.LOG_CONFIG_LOCATION_KEY, log4jLocation.toString());

profiler-logging/src/main/java/com/navercorp/pinpoint/profiler/logging/Log4j2LoggingSystem.java

@@ -23,7 +23,7 @@ public class Log4j2LoggingSystem implements LoggingSystem {
     public static final String FACTORY_PROPERTY_NAME = "log4j2.loggerContextFactory";
     public static final String NOLOOKUPS = "log4j2.formatMsgNoLookups";
 
-    private static final String[] LOOKUP = {"log4j2-test.xml", "log4j2.xml", "log4j2.properties", "../../log4j2.xml"};
+    private static final String[] LOOKUP = {"log4j2-test.xml", "log4j2-agent.xml", "log4j2.properties"};
 
     private LoggerContext loggerContext;
     private final Path profilePath;
@@ -132,7 +132,7 @@ public void stop() {
             this.binder.shutdown();
             if (loggerContext instanceof LifeCycle) {
                 logger.info("{} loggerContext stop", this.getClass().getSimpleName());
-                ((LifeCycle)loggerContext).stop();
+                ((LifeCycle) loggerContext).stop();
             }
         }