Skip to content

Commit

Permalink
[pinpoint-apm#11290] log4j2-it, add test for full-pattern replacement
Browse files Browse the repository at this point in the history
  • Loading branch information
yjqg6666 committed Nov 4, 2024
1 parent eacdff4 commit 44bf69e
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*
* Copyright 2024 NAVER Corp.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* 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
*
* 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.it.plugin.log4j2;

import com.navercorp.pinpoint.it.plugin.utils.AgentPath;
import com.navercorp.pinpoint.it.plugin.utils.PluginITConstants;
import com.navercorp.pinpoint.test.plugin.*;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

@PluginForkedTest
@PinpointAgent(AgentPath.PATH)
@PinpointConfig("pinpoint-spring-bean-test.config")
@JvmVersion(8)
@Dependency({"org.apache.logging.log4j:log4j-core:[2.17.1,2.20)", PluginITConstants.VERSION})
@JvmArgument({"-DtestLoggerEnable=false", "-Dprofiler.log4j2.logging.pattern.full_replace.with=Log4j2IT TxId:%X{PtxId} %message"})
public class Log4J2PatternFullReplaceTestIT extends Log4j2PatternTestBase {

@Test
public void patternUpdate() {
String log = checkPatternUpdate();
Assertions.assertTrue(log.contains("Log4j2IT"), "contains full-replace string Log4j2IT");
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*
* Copyright 2024 NAVER Corp.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* 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
*
* 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.it.plugin.log4j2;

import com.navercorp.pinpoint.it.plugin.utils.AgentPath;
import com.navercorp.pinpoint.it.plugin.utils.PluginITConstants;
import com.navercorp.pinpoint.test.plugin.*;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

@PluginForkedTest
@PinpointAgent(AgentPath.PATH)
@PinpointConfig("pinpoint-spring-bean-test.config")
@JvmVersion(11)
@Dependency({"org.apache.logging.log4j:log4j-core:[2.20,2.22]", PluginITConstants.VERSION})
@JvmArgument({"-DtestLoggerEnable=false", "-Dprofiler.log4j2.logging.pattern.full_replace.with=Log4j2IT TxId:%X{PtxId} %message"})
public class Log4J2PatternFullReplace_2_20_ITTest extends Log4j2PatternTestBase {

@Test
public void patternUpdate() {
String log = checkPatternUpdate();
Assertions.assertTrue(log.contains("Log4j2IT"), "contains full-replace string Log4j2IT");
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class Log4j2PatternTestBase extends Log4j2TestBase {

private String location;

public void checkPatternUpdate() {
protected String checkPatternUpdate() {
final String msg = "pattern";

StdoutRecorder stdoutRecorder = new StdoutRecorder();
Expand All @@ -46,6 +46,7 @@ public void run() {
System.out.println("Log4j2 jar location:" + location);
final String testVersion = getTestVersion();
Assertions.assertTrue(location.contains("/" + testVersion + "/"), "test version is not " + getTestVersion());
return log;
}

}

0 comments on commit 44bf69e

Please sign in to comment.