Skip to content

Commit

Permalink
version 1.3 change method name ELK with ELASTIC and extract udv file …
Browse files Browse the repository at this point in the history 
…name
  • Loading branch information
DABURON Vincent committed Feb 1, 2024
1 parent 1322b71 commit 3d98b1a
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 16 deletions.
4 changes: 3 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,12 @@ import io.github.vdaburon.jmeter.elasticapmxml.ElasticApmJMeterManager;
String sRegexTc = ".*";
String sFileIn = "script1.jmx";
String sFileOut = "script1_add.jmx";
ElasticApmJMeterManager.modifyAddSamplerForelasticApm(sFileIn, sFileOut, ElasticApmJMeterManager.ACTION_ADD, sRegexTc, ElasticApmJMeterManager.EXTRACT_START_JSR223, ElasticApmJMeterManager.EXTRACT_END_JSR223, ElasticApmJMeterManager.EXTRACT_UDV_elastic);
ElasticApmJMeterManager.modifyAddSamplerForElasticApm(sFileIn, sFileOut, ElasticApmJMeterManager.ACTION_ADD, sRegexTc, ElasticApmJMeterManager.EXTRACT_START_JSR223, ElasticApmJMeterManager.EXTRACT_END_JSR223, ElasticApmJMeterManager.EXTRACT_UDV_ELASTIC);
</pre>

## Version
Version 1.3 change method name ELK to ELASTIC et file name tp extract_udv_elastic_under_testplan.jmx

Version 1.2 change globally ELK to ELASTIC

Version 1.1 correct the class name in the uber jar and correct REMOVE result
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>io.github.vdaburon</groupId>
<artifactId>jmeter-elastic-apm</artifactId>
<version>1.2</version>
<version>1.3</version>
<packaging>jar</packaging>
<name>Manage ELASTIC APM integration for Apache JMeter</name>
<description>ADD/REMOVE ELASTIC APM library api call around Transaction Controller, you will see timeline and sub calls for the Transaction Controller (Page) in Kibana</description>
Expand Down
28 changes: 14 additions & 14 deletions src/main/java/io/github/vdaburon/jmeter/elasticapmxml/ElasticApmJMeterManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public class ElasticApmJMeterManager {
// this files are in the jar
public static final String EXTRACT_START_JSR223 = "extract_start_transaction_ignore_jsr223.xml";
public static final String EXTRACT_END_JSR223 = "extract_end_transaction_ignore_jsr223.xml";
public static final String EXTRACT_UDV_ELK = "extract_udv_elk_under_testplan.xml";
public static final String EXTRACT_UDV_ELASTIC = "extract_udv_elastic_under_testplan.xml";

public static void main(String[] args) {
long startTime = System.currentTimeMillis();
Expand Down Expand Up @@ -114,7 +114,7 @@ public static void main(String[] args) {
// XML extract to add jsr223 in the new file
String sExtractAddStartJsr = EXTRACT_START_JSR223;
String sExtractAddEndJsr = EXTRACT_END_JSR223;
String sExtractUdvUnderTp = EXTRACT_UDV_ELK;
String sExtractUdvUnderTp = EXTRACT_UDV_ELASTIC;

sTmp = (String) parseProperties.get(K_EXTRACT_START_OPT);
if (sTmp != null) {
Expand All @@ -134,15 +134,15 @@ public static void main(String[] args) {
LOGGER.info(K_EXTRACT_UDV_OPT + "=" + sExtractUdvUnderTp);
}

modifyAddSamplerForElkApm(sJMeterXmlFileScript, sJMeterXmlFileScriptOutModif, action, regex, sExtractAddStartJsr, sExtractAddEndJsr, sExtractUdvUnderTp);
modifyAddSamplerForElasticApm(sJMeterXmlFileScript, sJMeterXmlFileScriptOutModif, action, regex, sExtractAddStartJsr, sExtractAddEndJsr, sExtractUdvUnderTp);

long durationMs = System.currentTimeMillis() - startTime;
LOGGER.info("Duration milli seconds=" + durationMs);
LOGGER.info("main end (exit 0)");
System.exit(0);
}

public static void modifyAddSamplerForElkApm(String jmeterXmlScript, String sJMeterXmlFileScriptModif, String action, String sRegexTcLabel, String sExtractAddStartJsr, String sExtractAddEndJsr, String sExtractUdvUnderTp) {
public static void modifyAddSamplerForElasticApm(String jmeterXmlScript, String sJMeterXmlFileScriptModif, String action, String sRegexTcLabel, String sExtractAddStartJsr, String sExtractAddEndJsr, String sExtractUdvUnderTp) {
LinkedList<String> lkFileJMeterOrig = readFileToLinkedList(jmeterXmlScript, READ_DIRECT_FILE);

int readMode = READ_FROM_JAR;
Expand All @@ -162,7 +162,7 @@ public static void modifyAddSamplerForElkApm(String jmeterXmlScript, String sJMe
}
LinkedList<String> lkEnd = readFileToLinkedList(sExtractAddEndJsr, readMode);

if (EXTRACT_UDV_ELK.equals(sExtractUdvUnderTp)) {
if (EXTRACT_UDV_ELASTIC.equals(sExtractUdvUnderTp)) {
readMode = READ_FROM_JAR;
}
else {
Expand All @@ -172,16 +172,16 @@ public static void modifyAddSamplerForElkApm(String jmeterXmlScript, String sJMe

LinkedList<String> fileModified = null;
if (ACTION_ADD.equals(action)) {
fileModified = addSamplerForElkApm(lkFileJMeterOrig, sRegexTcLabel, lkStart, lkEnd, lkUdvUnderTp);
fileModified = addSamplerForElasticApm(lkFileJMeterOrig, sRegexTcLabel, lkStart, lkEnd, lkUdvUnderTp);
}
if (ACTION_REMOVE.equals(action)) {
fileModified = removeSamplerForElkApm(lkFileJMeterOrig, sRegexTcLabel, lkStart, lkEnd, lkUdvUnderTp);
fileModified = removeSamplerForElasticApm(lkFileJMeterOrig, sRegexTcLabel, lkStart, lkEnd, lkUdvUnderTp);
}
writeXml(fileModified, sJMeterXmlFileScriptModif);
}


private static LinkedList<String> addSamplerForElkApm(LinkedList<String> lkfileJMeterOrig, String regexTc, LinkedList<String> lkStart, LinkedList<String> lkEnd, LinkedList<String> lkUdvUnderTp) {
private static LinkedList<String> addSamplerForElasticApm(LinkedList<String> lkfileJMeterOrig, String regexTc, LinkedList<String> lkStart, LinkedList<String> lkEnd, LinkedList<String> lkUdvUnderTp) {
LinkedList<String> lkReturn = new LinkedList<String>();

Pattern patternStartEltTc = Pattern.compile(".*?<TransactionController guiclass=\"TransactionControllerGui\" testclass=\"TransactionController\" testname=\"(.*?)\" enabled=\"true\">");
Expand Down Expand Up @@ -275,14 +275,14 @@ private static LinkedList<String> addSamplerForElkApm(LinkedList<String> lkfileJ
return lkReturn;
}

private static LinkedList<String> removeSamplerForElkApm(LinkedList<String> lkfileJMeterOrig, String regexTc, LinkedList<String> lkStart, LinkedList<String> lkEnd, LinkedList<String> lkUdvUnderTp) {
private static LinkedList<String> removeSamplerForElasticApm(LinkedList<String> lkfileJMeterOrig, String regexTc, LinkedList<String> lkStart, LinkedList<String> lkEnd, LinkedList<String> lkUdvUnderTp) {
LinkedList<String> lkReturn = new LinkedList<String>();

Pattern patternCommentStartEltTc = Pattern.compile(".*?<stringProp name=\"TestPlan.comments\">" + COMMENT_BEGIN_ELASTIC_APM + "</stringProp>"); // JSR223 for begin transaction
Pattern patternStartEltJsr223 = Pattern.compile(".*?<JSR223Sampler guiclass=\"TestBeanGUI\" testclass=\"JSR223Sampler\".*");

Pattern patternCommentEndEltTc = Pattern.compile(".*?<stringProp name=\"TestPlan.comments\">" + COMMENT_END_ELASTIC_APM + "</stringProp>"); // JSR223 for end transaction
Pattern patternCommentEltArgument = Pattern.compile(".*?<stringProp name=\"TestPlan.comments\">" + COMMENT_APM_UDV + "</stringProp>"); // UDV with ELK_APM_UDV
Pattern patternCommentEltArgument = Pattern.compile(".*?<stringProp name=\"TestPlan.comments\">" + COMMENT_APM_UDV + "</stringProp>"); // UDV with ELASTIC_APM_UDV
Pattern patternStartEltArguments = Pattern.compile(".*?<Arguments guiclass=\"ArgumentsPanel\" testclass=\"Arguments\".*");

boolean bAlreadyAdd = false;
Expand All @@ -297,8 +297,8 @@ private static LinkedList<String> removeSamplerForElkApm(LinkedList<String> lkfi
Matcher matcherCommentEndEltTc = patternCommentEndEltTc.matcher(currentLine);
boolean isCommentEndEltTc = matcherCommentEndEltTc.matches(); //

if (isCommentStartEltTc || isCommentEndEltTc) { // @@ELK_APM_BEGIN or @@ELK_APM_END
// remove lines in the lkReturn from comment @@ELK_APM_BEGIN to <JSR223Sampler
if (isCommentStartEltTc || isCommentEndEltTc) { // @@ELASTIC_APM_BEGIN or @@ELASTIC_APM_END
// remove lines in the lkReturn from comment @@ELASTIC_APM_BEGIN to <JSR223Sampler
boolean bNeedRemove = true;
while (bNeedRemove) {
String lastLine = lkReturn.removeLast();
Expand All @@ -315,11 +315,11 @@ private static LinkedList<String> removeSamplerForElkApm(LinkedList<String> lkfi
bAlreadyAdd = true;
}

// @@ELK_APM_UDV
// @@ELASTIC_APM_UDV
Matcher matcherCommentEltArgument = patternCommentEltArgument.matcher(currentLine);
boolean isCommentEltArgument = matcherCommentEltArgument.matches();
if (isCommentEltArgument) {
// remove lines in the lkReturn from comment @@ELK_APM_UDV to <Arguments
// remove lines in the lkReturn from comment @@ELASTIC_APM_UDV to <Arguments
boolean bNeedRemove = true;
while (bNeedRemove) {
String lastLine = lkReturn.removeLast();
Expand Down
0 ...ources/extract_udv_elk_under_testplan.xml → ...es/extract_udv_elastic_under_testplan.xml
View file
File renamed without changes.

0 comments on commit 3d98b1a

Please sign in to comment.