diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index ccc9aa2a..26c8ce5d 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -40,7 +40,7 @@ jobs: run: | ./gradlew build -Dperformance-analyzer-rca.build=true \ -Dperformance-analyzer-rca.repo="https://github.com/opensearch-project/performance-analyzer-rca.git" \ - -Dperformance-analyzer-rca.branch=main + -Dperformance-analyzer-rca.branch="feature/rename-folder" - name: Assemble PA jar for BWC tests working-directory: ./tmp/performance-analyzer run: | diff --git a/.gitignore b/.gitignore index aa622ac0..dbd5b524 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /.idea/ /build/ *.iml +/src/test/resources/org/opensearch/performanceanalyzer/bwc/1.13.0.0/*.zip \ No newline at end of file diff --git a/pa_bin/performance-analyzer-agent b/bin/performance-analyzer-agent similarity index 96% rename from pa_bin/performance-analyzer-agent rename to bin/performance-analyzer-agent index 53232766..0d37c437 100755 --- a/pa_bin/performance-analyzer-agent +++ b/bin/performance-analyzer-agent @@ -34,11 +34,11 @@ export JAVA_HOME=$JAVA_HOME # We need to change this file: https://github.com/opensearch-project/opensearch-build/blob/main/release/docker/config/opensearch/opensearch-docker-entrypoint.sh if ! echo $* | grep -E '(^-d |-d$| -d |--daemonize$|--daemonize )' >/dev/null; then - export JAVA_OPTS=-Dopensearch.path.home=$OPENSEARCH_HOME\ -Dlog4j.configurationFile=$OPENSEARCH_HOME/performance-analyzer-rca-1.3.0-SNAPSHOT/pa_config/log4j2.xml + export JAVA_OPTS=-Dopensearch.path.home=$OPENSEARCH_HOME\ -Dlog4j.configurationFile=$OPENSEARCH_HOME/performance-analyzer-rca-1.3.0-SNAPSHOT/config/log4j2.xml exec $OPENSEARCH_HOME/performance-analyzer-rca-1.3.0-SNAPSHOT/bin/performance-analyzer-rca else echo 'Starting deamon' - export JAVA_OPTS=-Dopensearch.path.home=$OPENSEARCH_HOME\ -Dlog4j.configurationFile=$OPENSEARCH_HOME/performance-analyzer-rca-1.3.0-SNAPSHOT/pa_config/log4j2.xml + export JAVA_OPTS=-Dopensearch.path.home=$OPENSEARCH_HOME\ -Dlog4j.configurationFile=$OPENSEARCH_HOME/performance-analyzer-rca-1.3.0-SNAPSHOT/config/log4j2.xml exec $OPENSEARCH_HOME/performance-analyzer-rca-1.3.0-SNAPSHOT/bin/performance-analyzer-rca & pid=$! diff --git a/build.gradle b/build.gradle index d276ea92..3f15d838 100644 --- a/build.gradle +++ b/build.gradle @@ -427,15 +427,11 @@ tasks.withType(Test) { bundlePlugin { dependsOn 'unpackRca' - from("$rcaArtifactsDir/pa_config") { - into "pa_config" - } - from("$rcaArtifactsDir/pa_bin") { - into "pa_bin" - include "performance-analyzer-agent" + from("$rcaArtifactsDir/config") { + into "config" } - from("$rcaArtifactsDir/pa_bin") { - into "extensions" + from("$rcaArtifactsDir/bin") { + into "bin" include "performance-analyzer-agent" } from("$rcaArtifactsDir") { @@ -541,6 +537,8 @@ task integTestRemote(type: RestIntegTestTask) { String bwcVersion = "1.13.0.0" String baseName = "paBwcCluster" String bwcFilePath = "src/test/resources/org/opensearch/performanceanalyzer/bwc/" +String bwcRemoteFile = "https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/performance-analyzer/opendistro-performance-analyzer-1.13.0.0.zip" +String bwcOpenDistroPlugin = "opendistro-performance-analyzer-1.13.0.0.zip" 2.times {i -> testClusters { @@ -554,6 +552,14 @@ String bwcFilePath = "src/test/resources/org/opensearch/performanceanalyzer/bwc/ return new RegularFile() { @Override File getAsFile() { + File dir = new File(bwcFilePath + bwcVersion) + if (!dir.exists()) { + dir.mkdirs() + } + File f = new File(bwcOpenDistroPlugin, dir) + if (!f.exists()) { + new URL(bwcRemoteFile).withInputStream{ ins -> f.withOutputStream{ it << ins }} + } return fileTree(bwcFilePath + bwcVersion).getSingleFile() } } diff --git a/pa_config/agent-stats-metadata b/config/agent-stats-metadata similarity index 100% rename from pa_config/agent-stats-metadata rename to config/agent-stats-metadata diff --git a/pa_config/log4j2.xml b/config/log4j2.xml similarity index 100% rename from pa_config/log4j2.xml rename to config/log4j2.xml diff --git a/pa_config/opensearch_security.policy b/config/opensearch_security.policy similarity index 77% rename from pa_config/opensearch_security.policy rename to config/opensearch_security.policy index cf88b034..d765de36 100644 --- a/pa_config/opensearch_security.policy +++ b/config/opensearch_security.policy @@ -10,3 +10,6 @@ grant codeBase "jrt:/jdk.internal.jvmstat" { permission java.security.AllPermission; }; +grant { + permission java.lang.management.ManagementPermission "control"; +}; diff --git a/pa_config/performance-analyzer.properties b/config/performance-analyzer.properties similarity index 100% rename from pa_config/performance-analyzer.properties rename to config/performance-analyzer.properties diff --git a/pa_config/plugin-stats-metadata b/config/plugin-stats-metadata similarity index 100% rename from pa_config/plugin-stats-metadata rename to config/plugin-stats-metadata diff --git a/pa_config/supervisord.conf b/config/supervisord.conf similarity index 95% rename from pa_config/supervisord.conf rename to config/supervisord.conf index 9a632596..82d6c761 100644 --- a/pa_config/supervisord.conf +++ b/config/supervisord.conf @@ -28,5 +28,5 @@ serverurl=/usr/share/supervisord.sock files = /etc/supervisor/conf.d/*.conf [program:performance_analyzer] -command=/usr/share/opensearch/plugins/opensearch-performance-analyzer/pa_bin/performance-analyzer-agent /usr/share/opensearch +command=/usr/share/opensearch/plugins/opensearch-performance-analyzer/bin/performance-analyzer-agent /usr/share/opensearch user=1000 diff --git a/licenses/commons-lang3-3.12.0.jar.sha1 b/licenses/commons-lang3-3.12.0.jar.sha1 new file mode 100644 index 00000000..9273d8c0 --- /dev/null +++ b/licenses/commons-lang3-3.12.0.jar.sha1 @@ -0,0 +1 @@ +c6842c86792ff03b9f1d1fe2aab8dc23aa6c6f0e \ No newline at end of file diff --git a/licenses/commons-lang3-3.9.jar.sha1 b/licenses/commons-lang3-3.9.jar.sha1 deleted file mode 100644 index 2adcfd37..00000000 --- a/licenses/commons-lang3-3.9.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0122c7cee69b53ed4a7681c03d4ee4c0e2765da5 \ No newline at end of file diff --git a/licenses/paranamer-2.8.jar.sha1 b/licenses/paranamer-2.8.jar.sha1 deleted file mode 100644 index 70340a7b..00000000 --- a/licenses/paranamer-2.8.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -619eba74c19ccf1da8ebec97a2d7f8ba05773dd6 \ No newline at end of file diff --git a/licenses/performanceanalyzer-rca-2.0.0.0-alpha1-SNAPSHOT.jar.sha1 b/licenses/performanceanalyzer-rca-2.0.0.0-alpha1-SNAPSHOT.jar.sha1 index d13875e7..6186435a 100644 --- a/licenses/performanceanalyzer-rca-2.0.0.0-alpha1-SNAPSHOT.jar.sha1 +++ b/licenses/performanceanalyzer-rca-2.0.0.0-alpha1-SNAPSHOT.jar.sha1 @@ -1 +1 @@ -7461afd1624f81989227c761f45d07ded9d7a326 \ No newline at end of file +8c91b98548b421d60af43b4a6277614b0fb7000d \ No newline at end of file diff --git a/packaging/deb/postinst b/packaging/deb/postinst index fee9b787..12a8f86f 100644 --- a/packaging/deb/postinst +++ b/packaging/deb/postinst @@ -29,7 +29,7 @@ if ! grep -q '## OpenSearch Performance Analyzer' /etc/opensearch/jvm.options; t echo '## OpenSearch Performance Analyzer' >> /etc/opensearch/jvm.options echo "-Dclk.tck=$CLK_TCK" >> /etc/opensearch/jvm.options echo "-Djdk.attach.allowAttachSelf=true" >> /etc/opensearch/jvm.options - echo "-Djava.security.policy=file:///usr/share/opensearch/plugins/opensearch-performance-analyzer/pa_config/opensearch_security.policy" >> /etc/opensearch/jvm.options + echo "-Djava.security.policy=file:///usr/share/opensearch/plugins/opensearch-performance-analyzer/config/opensearch_security.policy" >> /etc/opensearch/jvm.options fi IS_UPGRADE=false @@ -53,7 +53,7 @@ if [ "x$IS_UPGRADE" != "xtrue" ]; then elif command -v chkconfig >/dev/null; then echo "### Non systemd distro. Please start and stop performance analyzer manually using the command: " - echo "sh /usr/share/opensearch/plugins/opensearch-performance-analyzer/pa_bin/performance-analyzer-agent /usr/share/opensearch -d" + echo "sh /usr/share/opensearch/plugins/opensearch-performance-analyzer/bin/performance-analyzer-agent /usr/share/opensearch -d" fi fi diff --git a/packaging/performance-analyzer-agent-cli b/packaging/performance-analyzer-agent-cli index 014b5b35..09ebadb4 100644 --- a/packaging/performance-analyzer-agent-cli +++ b/packaging/performance-analyzer-agent-cli @@ -1,6 +1,6 @@ #!/bin/sh -PA_AGENT_JAVA_OPTS="-Dlog4j.configurationFile=$OPENSEARCH_HOME/plugins/opensearch-performance-analyzer/pa_config/log4j2.xml \ +PA_AGENT_JAVA_OPTS="-Dlog4j.configurationFile=$OPENSEARCH_HOME/plugins/opensearch-performance-analyzer/config/log4j2.xml \ -Xms64M -Xmx64M -XX:+UseSerialGC -XX:CICompilerCount=1 -XX:-TieredCompilation -XX:InitialCodeCacheSize=4096 \ -XX:MaxRAM=400m" diff --git a/packaging/rpm/postinst b/packaging/rpm/postinst index 2a933759..3fa6c1ab 100644 --- a/packaging/rpm/postinst +++ b/packaging/rpm/postinst @@ -35,7 +35,7 @@ if ! grep -q '## OpenSearch Performance Analyzer' /etc/opensearch/jvm.options; t echo '## OpenSearch Performance Analyzer' >> /etc/opensearch/jvm.options echo "-Dclk.tck=$CLK_TCK" >> /etc/opensearch/jvm.options echo "-Djdk.attach.allowAttachSelf=true" >> /etc/opensearch/jvm.options - echo "-Djava.security.policy=file:///usr/share/opensearch/plugins/opensearch-performance-analyzer/pa_config/opensearch_security.policy" >> /etc/opensearch/jvm.options + echo "-Djava.security.policy=file:///usr/share/opensearch/plugins/opensearch-performance-analyzer/config/opensearch_security.policy" >> /etc/opensearch/jvm.options fi IS_UPGRADE=false @@ -63,6 +63,6 @@ if [ "x$IS_UPGRADE" != "xtrue" ]; then elif command -v chkconfig >/dev/null; then echo "### Non systemd distro. Please start and stop performance analyzer manually using the command: " - echo "sh /usr/share/opensearch/plugins/opensearch-performance-analyzer/pa_bin/performance-analyzer-agent /usr/share/opensearch -d" + echo "sh /usr/share/opensearch/plugins/opensearch-performance-analyzer/bin/performance-analyzer-agent /usr/share/opensearch -d" fi fi diff --git a/src/main/java/org/opensearch/performanceanalyzer/config/PerformanceAnalyzerController.java b/src/main/java/org/opensearch/performanceanalyzer/config/PerformanceAnalyzerController.java index 7d87d3fd..e9150137 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/config/PerformanceAnalyzerController.java +++ b/src/main/java/org/opensearch/performanceanalyzer/config/PerformanceAnalyzerController.java @@ -31,7 +31,8 @@ public class PerformanceAnalyzerController { // This file should contain "true" or "false", indicating whether batch metrics is currently // enabled or not. private static final String BATCH_METRICS_ENABLED_CONF = "batch_metrics_enabled.conf"; - private static final String THREAD_CONTENTION_MONITORING_ENABLED_CONF = "thread_contention_monitoring_enabled.conf"; + private static final String THREAD_CONTENTION_MONITORING_ENABLED_CONF = + "thread_contention_monitoring_enabled.conf"; private static final Logger LOG = LogManager.getLogger(PerformanceAnalyzerController.class); public static final int DEFAULT_NUM_OF_SHARDS_PER_COLLECTION = 0; @@ -177,8 +178,8 @@ public void updateBatchMetricsState(final boolean shouldEnable) { /** * Updates the state of the thread contention monitoring api. * - * @param shouldEnable The desired state of the thread contention monitoring api. False to disable, and true to - * enable. + * @param shouldEnable The desired state of the thread contention monitoring api. False to + * disable, and true to enable. */ public void updateThreadContentionMonitoringState(final boolean shouldEnable) { if (shouldEnable && !isPerformanceAnalyzerEnabled()) { @@ -186,9 +187,11 @@ public void updateThreadContentionMonitoringState(final boolean shouldEnable) { } this.threadContentionMonitoringEnabled = shouldEnable; if (scheduledMetricCollectorsExecutor != null) { - scheduledMetricCollectorsExecutor.setThreadContentionMonitoringEnabled(threadContentionMonitoringEnabled); + scheduledMetricCollectorsExecutor.setThreadContentionMonitoringEnabled( + threadContentionMonitoringEnabled); } - saveStateToConf(this.threadContentionMonitoringEnabled, THREAD_CONTENTION_MONITORING_ENABLED_CONF); + saveStateToConf( + this.threadContentionMonitoringEnabled, THREAD_CONTENTION_MONITORING_ENABLED_CONF); } private void initPerformanceAnalyzerStateFromConf() { @@ -284,16 +287,23 @@ private void initThreadContentionMonitoringStateFromConf() { } catch (NoSuchFileException e) { LOG.debug("Error reading Performance Analyzer state from Conf file", e); saveStateToConf( - threadContentionMonitoringEnabledDefaultValue, THREAD_CONTENTION_MONITORING_ENABLED_CONF); - threadContentionMonitoringEnabledFromConf = threadContentionMonitoringEnabledDefaultValue; + threadContentionMonitoringEnabledDefaultValue, + THREAD_CONTENTION_MONITORING_ENABLED_CONF); + threadContentionMonitoringEnabledFromConf = + threadContentionMonitoringEnabledDefaultValue; } catch (Exception e) { - LOG.debug("Error reading thread contention monitoring state from Conf file", e); - threadContentionMonitoringEnabledFromConf = threadContentionMonitoringEnabledDefaultValue; + LOG.debug( + "Error reading thread contention monitoring state from Conf file", + e); + threadContentionMonitoringEnabledFromConf = + threadContentionMonitoringEnabledDefaultValue; } - // For thread contention monitoring to be enabled, both PA and thread contention monitoring + // For thread contention monitoring to be enabled, both PA and thread contention + // monitoring // need to enabled. - updateThreadContentionMonitoringState(paEnabled && threadContentionMonitoringEnabledFromConf); + updateThreadContentionMonitoringState( + paEnabled && threadContentionMonitoringEnabledFromConf); }); } diff --git a/src/main/java/org/opensearch/performanceanalyzer/config/setting/handler/PerformanceAnalyzerClusterSettingHandler.java b/src/main/java/org/opensearch/performanceanalyzer/config/setting/handler/PerformanceAnalyzerClusterSettingHandler.java index 52769954..4e000406 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/config/setting/handler/PerformanceAnalyzerClusterSettingHandler.java +++ b/src/main/java/org/opensearch/performanceanalyzer/config/setting/handler/PerformanceAnalyzerClusterSettingHandler.java @@ -30,7 +30,8 @@ public class PerformanceAnalyzerClusterSettingHandler implements ClusterSettingL PerformanceAnalyzerClusterSettings.PerformanceAnalyzerFeatureBits.BATCH_METRICS_BIT .ordinal(); private static final int THREAD_CONTENTION_MONITORING_ENABLED_BIT_POS = - PerformanceAnalyzerClusterSettings.PerformanceAnalyzerFeatureBits.THREAD_CONTENTION_MONITORING_BIT + PerformanceAnalyzerClusterSettings.PerformanceAnalyzerFeatureBits + .THREAD_CONTENTION_MONITORING_BIT .ordinal(); private final PerformanceAnalyzerController controller; @@ -121,7 +122,8 @@ public void onSettingUpdate(final Integer newSettingValue) { controller.updateRcaState(getRcaStateFromSetting(newSettingValue)); controller.updateLoggingState(getLoggingStateFromSetting(newSettingValue)); controller.updateBatchMetricsState(getBatchMetricsStateFromSetting(newSettingValue)); - controller.updateThreadContentionMonitoringState(getThreadContentionMonitoringStateFromSetting(newSettingValue)); + controller.updateThreadContentionMonitoringState( + getThreadContentionMonitoringStateFromSetting(newSettingValue)); } } @@ -182,10 +184,12 @@ private boolean getPAStateFromSetting(final int settingValue) { /** * Converts the boolean PA state to composite cluster setting. If Performance Analyzer is being - * turned off, it will also turn off RCA, logging, batch metrics and thread contention monitoring. + * turned off, it will also turn off RCA, logging, batch metrics and thread contention + * monitoring. * * @param state the state of performance analyzer. Will enable performance analyzer if true, - * disables performance analyzer, RCA, logging, batch metrics and thread contention monitoring. + * disables performance analyzer, RCA, logging, batch metrics and thread contention + * monitoring. * @return composite cluster setting as an integer. */ private Integer getPASettingValueFromState(final boolean state) { @@ -243,7 +247,8 @@ private boolean getBatchMetricsStateFromSetting(final int settingValue) { * @return true if the THREAD_CONTENTION_MONITORING bit is set, false otherwise. */ private boolean getThreadContentionMonitoringStateFromSetting(final int settingValue) { - return ((settingValue >> THREAD_CONTENTION_MONITORING_ENABLED_BIT_POS) & BIT_ONE) == ENABLED_VALUE; + return ((settingValue >> THREAD_CONTENTION_MONITORING_ENABLED_BIT_POS) & BIT_ONE) + == ENABLED_VALUE; } /** @@ -306,11 +311,12 @@ private Integer getBatchMetricsSettingValueFromState(final boolean shouldEnable) } /** - * Converts the boolean thread contention monitoring state to composite cluster setting. Enables thread contention - * monitoring only if performance analyzer is also set. Otherwise, results in a no-op. + * Converts the boolean thread contention monitoring state to composite cluster setting. Enables + * thread contention monitoring only if performance analyzer is also set. Otherwise, results in + * a no-op. * - * @param shouldEnable the state of thread contention monitoring. Will try to enable if true, disables thread - * contention monitoring if false. + * @param shouldEnable the state of thread contention monitoring. Will try to enable if true, + * disables thread contention monitoring if false. * @return composite cluster setting as an integer. */ private Integer getThreadContentionMonitoringSettingValueFromState(final boolean shouldEnable) { diff --git a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java index 2efc826b..01bbeadf 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java +++ b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java @@ -9,7 +9,6 @@ import static java.util.Collections.unmodifiableList; import java.io.IOException; -import java.util.Collections; import java.util.List; import java.util.Map; import org.apache.logging.log4j.LogManager; @@ -69,8 +68,7 @@ public class PerformanceAnalyzerClusterConfigAction extends BaseRestHandler { THREAD_CONTENTION_MONITORING_CLUSTER_CONFIG_PATH), new Route( RestRequest.Method.POST, - THREAD_CONTENTION_MONITORING_CLUSTER_CONFIG_PATH) - )); + THREAD_CONTENTION_MONITORING_CLUSTER_CONFIG_PATH))); private static final List REPLACED_ROUTES = unmodifiableList( asList( @@ -181,7 +179,8 @@ protected RestChannelConsumer prepareRequest(final RestRequest request, final No } else if (request.path().contains(BATCH_METRICS_CLUSTER_CONFIG_PATH) || request.path().contains(LEGACY_BATCH_METRICS_CLUSTER_CONFIG_PATH)) { clusterSettingHandler.updateBatchMetricsSetting((Boolean) value); - } else if (request.path().contains(THREAD_CONTENTION_MONITORING_CLUSTER_CONFIG_PATH)) { + } else if (request.path() + .contains(THREAD_CONTENTION_MONITORING_CLUSTER_CONFIG_PATH)) { clusterSettingHandler.updateThreadContentionMonitoringSetting((Boolean) value); } else { clusterSettingHandler.updatePerformanceAnalyzerSetting((Boolean) value); diff --git a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigAction.java b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigAction.java index 6343387f..0e17283c 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigAction.java +++ b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigAction.java @@ -9,7 +9,6 @@ import static java.util.Collections.unmodifiableList; import java.io.IOException; -import java.util.Collections; import java.util.List; import java.util.Map; import org.apache.logging.log4j.LogManager; @@ -39,7 +38,8 @@ public class PerformanceAnalyzerConfigAction extends BaseRestHandler { public static final String RCA_ENABLED = "rcaEnabled"; public static final String PA_LOGGING_ENABLED = "loggingEnabled"; public static final String BATCH_METRICS_ENABLED = "batchMetricsEnabled"; - public static final String THREAD_CONTENTION_MONITORING_ENABLED = "threadContentionMonitoringEnabled"; + public static final String THREAD_CONTENTION_MONITORING_ENABLED = + "threadContentionMonitoringEnabled"; public static final String BATCH_METRICS_RETENTION_PERIOD_MINUTES = "batchMetricsRetentionPeriodMinutes"; public static final String PERFORMANCE_ANALYZER_CONFIG_ACTION = @@ -67,8 +67,7 @@ public class PerformanceAnalyzerConfigAction extends BaseRestHandler { THREAD_CONTENTION_MONITORING_CONFIG_PATH), new Route( RestRequest.Method.POST, - THREAD_CONTENTION_MONITORING_CONFIG_PATH) - )); + THREAD_CONTENTION_MONITORING_CONFIG_PATH))); private static final List REPLACED_ROUTES = unmodifiableList( asList( @@ -190,7 +189,8 @@ protected RestChannelConsumer prepareRequest(final RestRequest request, final No return getChannelConsumerWithError( "Error: PA not enabled. Enable PA before turning thread contention monitoring on"); } - performanceAnalyzerController.updateThreadContentionMonitoringState(shouldEnable); + performanceAnalyzerController.updateThreadContentionMonitoringState( + shouldEnable); } else { // Disabling Performance Analyzer should disable the RCA framework as well. if (!shouldEnable) { diff --git a/src/test/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollectorTests.java b/src/test/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollectorTests.java index 7e42df16..5f6d0c5d 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollectorTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollectorTests.java @@ -10,7 +10,6 @@ import com.fasterxml.jackson.module.paranamer.ParanamerModule; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.junit.After; import org.junit.Before; diff --git a/src/test/java/org/opensearch/performanceanalyzer/config/setting/handler/PerformanceAnalyzerClusterSettingHandlerTests.java b/src/test/java/org/opensearch/performanceanalyzer/config/setting/handler/PerformanceAnalyzerClusterSettingHandlerTests.java index a4396024..78196017 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/config/setting/handler/PerformanceAnalyzerClusterSettingHandlerTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/config/setting/handler/PerformanceAnalyzerClusterSettingHandlerTests.java @@ -31,7 +31,8 @@ public void setup() { @Test public void disabledClusterStateTest() { - setControllerValues(DISABLED_STATE, DISABLED_STATE, DISABLED_STATE, DISABLED_STATE, DISABLED_STATE); + setControllerValues( + DISABLED_STATE, DISABLED_STATE, DISABLED_STATE, DISABLED_STATE, DISABLED_STATE); clusterSettingHandler = new PerformanceAnalyzerClusterSettingHandler( mockPerformanceAnalyzerController, mockClusterSettingsManager); @@ -40,7 +41,8 @@ public void disabledClusterStateTest() { @Test public void enabledClusterStateTest() { - setControllerValues(ENABLED_STATE, ENABLED_STATE, ENABLED_STATE, ENABLED_STATE, ENABLED_STATE); + setControllerValues( + ENABLED_STATE, ENABLED_STATE, ENABLED_STATE, ENABLED_STATE, ENABLED_STATE); clusterSettingHandler = new PerformanceAnalyzerClusterSettingHandler( mockPerformanceAnalyzerController, mockClusterSettingsManager); @@ -49,7 +51,8 @@ public void enabledClusterStateTest() { @Test public void paDisabledClusterStateTest() { - setControllerValues(DISABLED_STATE, ENABLED_STATE, ENABLED_STATE, ENABLED_STATE, ENABLED_STATE); + setControllerValues( + DISABLED_STATE, ENABLED_STATE, ENABLED_STATE, ENABLED_STATE, ENABLED_STATE); clusterSettingHandler = new PerformanceAnalyzerClusterSettingHandler( mockPerformanceAnalyzerController, mockClusterSettingsManager); @@ -58,7 +61,8 @@ public void paDisabledClusterStateTest() { @Test public void updateClusterStateTest() { - setControllerValues(ENABLED_STATE, ENABLED_STATE, DISABLED_STATE, DISABLED_STATE, DISABLED_STATE); + setControllerValues( + ENABLED_STATE, ENABLED_STATE, DISABLED_STATE, DISABLED_STATE, DISABLED_STATE); clusterSettingHandler = new PerformanceAnalyzerClusterSettingHandler( mockPerformanceAnalyzerController, mockClusterSettingsManager); diff --git a/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigActionTests.java b/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigActionTests.java index 50690260..0cd2f597 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigActionTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigActionTests.java @@ -147,7 +147,8 @@ public void testLegacyUpdatePerformanceAnalyzerSetting() throws IOException { @Test public void testUpdateThreadContentionMonitoringSetting() throws IOException { testWithRequestPath( - PerformanceAnalyzerClusterConfigAction.THREAD_CONTENTION_MONITORING_CLUSTER_CONFIG_PATH); + PerformanceAnalyzerClusterConfigAction + .THREAD_CONTENTION_MONITORING_CLUSTER_CONFIG_PATH); } private void testWithRequestPath(String requestPath) throws IOException { diff --git a/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigActionTests.java b/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigActionTests.java index ede4a898..7b21ef87 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigActionTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigActionTests.java @@ -245,22 +245,29 @@ public void testLegacyUpdatePerformanceAnalyzerState_ShouldDisable_paDisabled() } @Test - public void testUpdateThreadContentionMonitoringState_ShouldEnable_paEnabled() throws IOException { + public void testUpdateThreadContentionMonitoringState_ShouldEnable_paEnabled() + throws IOException { test(PerformanceAnalyzerConfigAction.THREAD_CONTENTION_MONITORING_CONFIG_PATH, true, true); } @Test - public void testUpdateThreadContentionMonitoringState_ShouldEnable_paDisabled() throws IOException { + public void testUpdateThreadContentionMonitoringState_ShouldEnable_paDisabled() + throws IOException { test(PerformanceAnalyzerConfigAction.THREAD_CONTENTION_MONITORING_CONFIG_PATH, true, false); } @Test - public void testUpdateThreadContentionMonitoringState_ShouldDisable_paDisabled() throws IOException { - test(PerformanceAnalyzerConfigAction.THREAD_CONTENTION_MONITORING_CONFIG_PATH, false, false); + public void testUpdateThreadContentionMonitoringState_ShouldDisable_paDisabled() + throws IOException { + test( + PerformanceAnalyzerConfigAction.THREAD_CONTENTION_MONITORING_CONFIG_PATH, + false, + false); } @Test - public void testUpdateThreadContentionMonitoringState_ShouldDisable_paEnabled() throws IOException { + public void testUpdateThreadContentionMonitoringState_ShouldDisable_paEnabled() + throws IOException { test(PerformanceAnalyzerConfigAction.THREAD_CONTENTION_MONITORING_CONFIG_PATH, false, true); } @@ -281,7 +288,9 @@ private void test(String requestPath, boolean shouldEnable, boolean paEnabled) assertTrue(responseStr.contains(PerformanceAnalyzerConfigAction.PA_LOGGING_ENABLED)); assertTrue(responseStr.contains(PerformanceAnalyzerConfigAction.SHARDS_PER_COLLECTION)); assertTrue(responseStr.contains(PerformanceAnalyzerConfigAction.BATCH_METRICS_ENABLED)); - assertTrue(responseStr.contains(PerformanceAnalyzerConfigAction.THREAD_CONTENTION_MONITORING_ENABLED)); + assertTrue( + responseStr.contains( + PerformanceAnalyzerConfigAction.THREAD_CONTENTION_MONITORING_ENABLED)); assertTrue( responseStr.contains( PerformanceAnalyzerConfigAction diff --git a/src/test/resources/org/opensearch/performanceanalyzer/bwc/1.13.0.0/opendistro-performance-analyzer-1.13.0.0.zip b/src/test/resources/org/opensearch/performanceanalyzer/bwc/1.13.0.0/opendistro-performance-analyzer-1.13.0.0.zip deleted file mode 100644 index f851fdf4..00000000 Binary files a/src/test/resources/org/opensearch/performanceanalyzer/bwc/1.13.0.0/opendistro-performance-analyzer-1.13.0.0.zip and /dev/null differ