Code split

build.gradle

@@ -21,6 +21,7 @@ buildscript {
     // This isn't applying from repositories.gradle so repeating it here
     repositories {
         mavenCentral()
+        mavenLocal()
     }
 
     dependencies {
@@ -92,6 +93,7 @@ project.afterEvaluate {
 
 repositories {
     mavenCentral()
+    mavenLocal()
 }
 
 
@@ -114,13 +116,11 @@ dependencies {
         all*.exclude group: "org.elasticsearch", module: "securemock"
     }
 
-    compile 'org.jooq:jooq:3.10.8'
-    compile 'org.bouncycastle:bcprov-jdk15on:1.60'
-    compile 'org.bouncycastle:bcpkix-jdk15on:1.60'
-    compile 'org.xerial:sqlite-jdbc:3.8.11.2'
     compile 'com.google.guava:guava:27.0.1-jre'
     compile 'com.fasterxml.jackson.core:jackson-annotations:2.8.11'
     compile 'com.fasterxml.jackson.core:jackson-databind:2.8.11'
+    compile 'com.fasterxml.jackson.core:jackson-databind:2.8.11'
+    compile 'com.amazon.opendistro.elasticsearch:performanceanalyzer:1.0';
 
     // JDK9+ has to run powermock 2+. https://github.com/powermock/powermock/issues/888
     testCompile group: 'org.powermock', name: 'powermock-api-mockito2', version: '2.0.0'

pa_bin/performance-analyzer-agent

@@ -24,18 +24,18 @@ else
 fi
 
 if ! echo $* | grep -E '(^-d |-d$| -d |--daemonize$|--daemonize )' > /dev/null; then
-    exec $JAVA_HOME/bin/java -Des.path.home=$ES_HOME -Dlog4j.configurationFile=$ES_HOME/plugins/opendistro_performance_analyzer/pa_config/log4j2.xml \
+    exec $JAVA_HOME/bin/java -Des.path.home=$ES_HOME -Dlog4j.configurationFile=$ES_HOME/opendistro_performance_analyzer/pa_config/log4j2.xml \
     -DconfigFilePath=$3 \
     -Xms64M -Xmx64M -XX:+UseSerialGC -XX:CICompilerCount=1 -XX:-TieredCompilation -XX:InitialCodeCacheSize=4096 \
     -XX:InitialBootClassLoaderMetaspaceSize=30720 -XX:MaxRAM=400m \
-    -cp $ES_HOME/lib/*:$ES_HOME/plugins/opendistro_performance_analyzer/* com.amazon.opendistro.elasticsearch.performanceanalyzer.PerformanceAnalyzerApp
+    -cp $ES_HOME/lib/*:$ES_HOME/opendistro_performance_analyzer/* com.amazon.opendistro.elasticsearch.performanceanalyzer.PerformanceAnalyzerApp
 else
     echo 'Starting deamon'
-    exec $JAVA_HOME/bin/java -Des.path.home=$ES_HOME -Dlog4j.configurationFile=$ES_HOME/plugins/opendistro_performance_analyzer/pa_config/log4j2.xml \
+    exec $JAVA_HOME/bin/java -Des.path.home=$ES_HOME -Dlog4j.configurationFile=$ES_HOME/opendistro_performance_analyzer/pa_config/log4j2.xml \
         -DconfigFilePath=$3 \
         -Xms64M -Xmx64M -XX:+UseSerialGC -XX:CICompilerCount=1 -XX:-TieredCompilation -XX:InitialCodeCacheSize=4096 \
         -XX:InitialBootClassLoaderMetaspaceSize=30720 -XX:MaxRAM=400m \
-        -cp $ES_HOME/lib/*:$ES_HOME/plugins/opendistro_performance_analyzer/* com.amazon.opendistro.elasticsearch.performanceanalyzer.PerformanceAnalyzerApp &
+        -cp $ES_HOME/lib/*:$ES_HOME/opendistro_performance_analyzer/* com.amazon.opendistro.elasticsearch.performanceanalyzer.PerformanceAnalyzerApp &
 
     pid=$!
     PID_LOC=/tmp/performance-analyzer-agent

release-notes

@@ -1,3 +1,4 @@
+Backporting fixes from master
 ## Version 1.2.0 (Version compatible with elasticsearch 7.2.0)
 ## New Features
 This is the release of the Open Distro Performance Analyzer that will work with elasticsearch 7.2.0
@@ -19,6 +20,7 @@ More Master metrics support: Master_Task_Queue_Time https://github.com/opendistr
 ## Version 0.8.0 (Version compatible with elasticsearch 6.6.2)
 ## New Features
 This is the release of the Open Distro Performance Analyzer that will work with elasticsearch 6.6.2
+>>>>>>> master
 
 ## Improvements
 Better measurement granularity for Master Metrics