Skip to content

Commit ea960a4

Browse files
author
DABURON Vincent
committed
version 1.2 change globally ELK with ELASTIC
1 parent 2b64052 commit ea960a4

11 files changed

+79
-77
lines changed

‎README.md

Lines changed: 56 additions & 54 deletions
Large diffs are not rendered by default.

‎doc/images/architecture_jmeter_tomcat_elastic_apm.png

118 KB
Loading

‎doc/images/architecture_jmeter_tomcat_elk.png

-58 KB
Binary file not shown.

‎doc/images/script_add.png

790 Bytes
Loading

‎doc/images/udv_elastic_properties.png

7.5 KB
Loading

‎doc/images/udv_elkp_properties.png

-5.72 KB
Binary file not shown.

‎pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<groupId>io.github.vdaburon</groupId>
8-
<artifactId>jmeter-elk-apm</artifactId>
9-
<version>1.1</version>
8+
<artifactId>jmeter-elastic-apm</artifactId>
9+
<version>1.2</version>
1010
<packaging>jar</packaging>
11-
<name>Manage ELK APM integration for Apache JMeter</name>
12-
<description>ADD/REMOVE ELK APM library api call around Transaction Controller, you will see timeline and sub calls for the Transaction Controller (Page) in Kibana</description>
11+
<name>Manage ELASTIC APM integration for Apache JMeter</name>
12+
<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>
1313
<url>https://github.com/vdaburon/jmeter-elk-apm</url>
1414
<inceptionYear>2024</inceptionYear>
1515

@@ -39,9 +39,9 @@
3939
</issueManagement>
4040

4141
<scm>
42-
<connection>https://github.com/vdaburon/jmeter-elk-apm.git</connection>
43-
<developerConnection>https://github.com/vdaburon/jmeter-elk-apm.git</developerConnection>
44-
<url>https://github.com/vdaburon/jmeter-elk-apm</url>
42+
<connection>https://github.com/vdaburon/jmeter-elastic-apm.git</connection>
43+
<developerConnection>https://github.com/vdaburon/jmeter-elasitc-apm.git</developerConnection>
44+
<url>https://github.com/vdaburon/jmeter-elastic-apm</url>
4545
<tag>HEAD</tag>
4646
</scm>
4747

@@ -131,7 +131,7 @@
131131
<archive>
132132
<manifest>
133133
<mainClass>
134-
io.github.vdaburon.jmeter.elkapmxml.ElkApmJMeterManager
134+
io.github.vdaburon.jmeter.elasticapmxml.ElasticApmJMeterManager
135135
</mainClass>
136136
</manifest>
137137
</archive>

‎src/main/java/io/github/vdaburon/jmeter/elkapmxml/ElkApmJMeterManager.java renamed to ‎src/main/java/io/github/vdaburon/jmeter/elasticapmxml/ElasticApmJMeterManager.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.vdaburon.jmeter.elkapmxml;
1+
package io.github.vdaburon.jmeter.elasticapmxml;
22

33
import java.io.BufferedReader;
44
import java.io.BufferedWriter;
@@ -27,13 +27,13 @@
2727
import org.apache.commons.cli.Options;
2828
import org.apache.commons.cli.ParseException;
2929

30-
public class ElkApmJMeterManager {
31-
private static final Logger LOGGER = LoggerFactory.getLogger(ElkApmJMeterManager.class);
30+
public class ElasticApmJMeterManager {
31+
private static final Logger LOGGER = LoggerFactory.getLogger(ElasticApmJMeterManager.class);
3232
// fixed string to find in the jmeter script or in the extracted xml files
3333
private static final String PARAM_TC_NAME = "@@TC_NAME";
34-
private static final String COMMENT_BEGIN_ELK_APM = "@@ELK_APM_BEGIN";
35-
private static final String COMMENT_END_ELK_APM = "@@ELK_APM_END";
36-
private static final String COMMENT_APM_UDV = "@@ELK_APM_UDV";
34+
private static final String COMMENT_BEGIN_ELASTIC_APM = "@@ELASTIC_APM_BEGIN";
35+
private static final String COMMENT_END_ELASTIC_APM = "@@ELASTIC_APM_END";
36+
private static final String COMMENT_APM_UDV = "@@ELASTIC_APM_UDV";
3737

3838
// CLI OPTIONS
3939
public static final String K_JMETER_FILE_IN_OPT = "file_in";
@@ -278,10 +278,10 @@ private static LinkedList<String> addSamplerForElkApm(LinkedList<String> lkfileJ
278278
private static LinkedList<String> removeSamplerForElkApm(LinkedList<String> lkfileJMeterOrig, String regexTc, LinkedList<String> lkStart, LinkedList<String> lkEnd, LinkedList<String> lkUdvUnderTp) {
279279
LinkedList<String> lkReturn = new LinkedList<String>();
280280

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

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

@@ -514,14 +514,14 @@ private static Properties parseOption(Options optionsP, String args[])
514514

515515
private static void helpUsage(Options options) {
516516
HelpFormatter formatter = new HelpFormatter();
517-
String footer = "E.g : java -jar jmeter-elk-apm-<version>-jar-with-dependencies.jar -" + K_JMETER_FILE_IN_OPT + " script1.jmx -"
517+
String footer = "E.g : java -jar jmeter-elastic-apm-<version>-jar-with-dependencies.jar -" + K_JMETER_FILE_IN_OPT + " script1.jmx -"
518518
+ K_JMETER_FILE_OUT_OPT + " script1_add.jmx -" + K_ACTION_OPT + " ADD -"
519519
+ K_REGEX_OPT + " SC.*\n";
520-
footer+="E.g : java -jar jmeter-elk-apm-<version>-jar-with-dependencies.jar -" + K_JMETER_FILE_IN_OPT + " script1_add.jmx -"
520+
footer+="E.g : java -jar jmeter-elastic-apm-<version>-jar-with-dependencies.jar -" + K_JMETER_FILE_IN_OPT + " script1_add.jmx -"
521521
+ K_JMETER_FILE_OUT_OPT + " script1_remove.jmx -" + K_ACTION_OPT + " REMOVE -"
522522
+ K_REGEX_OPT + " .*";
523-
formatter.printHelp(120, ElkApmJMeterManager.class.getName(),
524-
ElkApmJMeterManager.class.getName(), options, footer, true);
523+
formatter.printHelp(120, ElasticApmJMeterManager.class.getName(),
524+
ElasticApmJMeterManager.class.getName(), options, footer, true);
525525
}
526526
}
527527

‎src/main/resources/extract_end_transaction_ignore_jsr223.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ if (sAPM_ACTIVE == null || &quot;TRUE&quot;.equalsIgnoreCase(sAPM_ACTIVE)) {
1313
vars.putObject(&quot;V_APM_TRANSACTION_TC&quot;, null);
1414
}
1515
}</stringProp>
16-
<stringProp name="TestPlan.comments">@@ELK_APM_END</stringProp>
16+
<stringProp name="TestPlan.comments">@@ELASTIC_APM_END</stringProp>
1717
</JSR223Sampler>
1818
<hashTree/>

‎src/main/resources/extract_start_transaction_ignore_jsr223.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ if (sAPM_ACTIVE == null || &quot;TRUE&quot;.equalsIgnoreCase(sAPM_ACTIVE)) {
2828
log.error(&quot;Exception ex = &quot; + ex.toString());
2929
}
3030
}</stringProp>
31-
<stringProp name="TestPlan.comments">@@ELK_APM_BEGIN</stringProp>
31+
<stringProp name="TestPlan.comments">@@ELASTIC_APM_BEGIN</stringProp>
3232
</JSR223Sampler>
3333
<hashTree/>

‎src/main/resources/extract_udv_elk_under_testplan.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
<stringProp name="Argument.metadata">=</stringProp>
1414
</elementProp>
1515
</collectionProp>
16-
<stringProp name="TestPlan.comments">@@ELK_APM_UDV</stringProp>
16+
<stringProp name="TestPlan.comments">@@ELASTIC_APM_UDV</stringProp>
1717
</Arguments>
1818
<hashTree/>

0 commit comments

Comments
 (0)