Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport 2.x] Add collector update Stat calls #423

Merged
merged 1 commit into from
Apr 18, 2023
Merged

[Backport 2.x] Add collector update Stat calls #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 42 additions & 16 deletions src/main/java/org/opensearch/performanceanalyzer/collectors/CircuitBreakerCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,26 @@


import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.opensearch.indices.breaker.CircuitBreakerStats;
import org.opensearch.performanceanalyzer.OpenSearchResources;
import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
import org.opensearch.performanceanalyzer.metrics.AllMetrics.CircuitBreakerDimension;
import org.opensearch.performanceanalyzer.metrics.AllMetrics.CircuitBreakerValue;
import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
import org.opensearch.performanceanalyzer.metrics.MetricsProcessor;
import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
import org.opensearch.performanceanalyzer.rca.framework.metrics.ExceptionsAndErrors;
import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics;

public class CircuitBreakerCollector extends PerformanceAnalyzerMetricsCollector
implements MetricsProcessor {
public static final int SAMPLING_TIME_INTERVAL =
MetricsConfiguration.CONFIG_MAP.get(CircuitBreakerCollector.class).samplingInterval;

private static final Logger LOG =
LogManager.getLogger(CircuitBreakerCollector.class);
private static final int KEYS_PATH_LENGTH = 0;
private StringBuilder value;

Expand All @@ -33,24 +41,42 @@ public void collectMetrics(long startTime) {
return;
}

CircuitBreakerStats[] allCircuitBreakerStats =
OpenSearchResources.INSTANCE.getCircuitBreakerService().stats().getAllStats();
// - Reusing the same StringBuilder across exectuions; so clearing before using
value.setLength(0);
value.append(PerformanceAnalyzerMetrics.getJsonCurrentMilliSeconds());

for (CircuitBreakerStats stats : allCircuitBreakerStats) {
value.append(PerformanceAnalyzerMetrics.sMetricNewLineDelimitor)
.append(
new CircuitBreakerStatus(
stats.getName(),
stats.getEstimated(),
stats.getTrippedCount(),
stats.getLimit())
.serialize());
try {
long mCurrT = System.currentTimeMillis();

CircuitBreakerStats[] allCircuitBreakerStats =
OpenSearchResources.INSTANCE.getCircuitBreakerService().stats().getAllStats();
// - Reusing the same StringBuilder across exectuions; so clearing before using
value.setLength(0);
value.append(PerformanceAnalyzerMetrics.getJsonCurrentMilliSeconds());

for (CircuitBreakerStats stats : allCircuitBreakerStats) {
value.append(PerformanceAnalyzerMetrics.sMetricNewLineDelimitor)
.append(
new CircuitBreakerStatus(
stats.getName(),
stats.getEstimated(),
stats.getTrippedCount(),
stats.getLimit())
.serialize());
}

saveMetricValues(value.toString(), startTime);

PerformanceAnalyzerApp.WRITER_METRICS_AGGREGATOR.updateStat(
WriterMetrics.CIRCUIT_BREAKER_COLLECTOR_EXECUTION_TIME,
"",
System.currentTimeMillis() - mCurrT);

} catch (Exception ex) {
PerformanceAnalyzerApp.ERRORS_AND_EXCEPTIONS_AGGREGATOR.updateStat(
ExceptionsAndErrors.CIRCUIT_BREAKER_COLLECTOR_ERROR, "", 1);
LOG.debug(
"Exception in Collecting CircuitBreaker Metrics: {} for startTime {}",
() -> ex.toString(),
() -> startTime);
}

saveMetricValues(value.toString(), startTime);
}

@Override
Expand Down
4 changes: 4 additions & 0 deletions ...main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@
import org.apache.logging.log4j.Logger;
import org.opensearch.cluster.service.PendingClusterTask;
import org.opensearch.performanceanalyzer.OpenSearchResources;
import org.opensearch.performanceanalyzer.PerformanceAnalyzerApp;
import org.opensearch.performanceanalyzer.metrics.AllMetrics.ClusterManagerPendingTaskDimension;
import org.opensearch.performanceanalyzer.metrics.AllMetrics.ClusterManagerPendingValue;
import org.opensearch.performanceanalyzer.metrics.MetricsConfiguration;
import org.opensearch.performanceanalyzer.metrics.MetricsProcessor;
import org.opensearch.performanceanalyzer.metrics.PerformanceAnalyzerMetrics;
import org.opensearch.performanceanalyzer.rca.framework.metrics.WriterMetrics;

@SuppressWarnings("unchecked")
public class ClusterManagerServiceMetrics extends PerformanceAnalyzerMetricsCollector
Expand Down Expand Up @@ -97,6 +99,8 @@ public void collectMetrics(long startTime) {
PerformanceAnalyzerMetrics.CLUSTER_MANAGER_CURRENT,
PerformanceAnalyzerMetrics.CLUSTER_MANAGER_META_DATA);
} catch (Exception ex) {
PerformanceAnalyzerApp.WRITER_METRICS_AGGREGATOR.updateStat(
WriterMetrics.CLUSTER_MANAGER_METRICS_ERROR, "", 1);
LOG.debug(
"Exception in Collecting ClusterManager Metrics: {} for startTime {}",
() -> ex.toString(),
Expand Down