kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename thermodynamic attributes. (#1161) 

* Rename thermodynamic attributes.

* A missing attribute name.
This commit is contained in:
彭勇升 pengys 2018-05-04 13:09:23 +08:00 committed by GitHub
parent ed487bc25c
commit 5f3022889b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 32 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/std/ResponseTimeDistributionSpanListener.java
View File

@ -73,11 +73,11 @@ public class ResponseTimeDistributionSpanListener implements FirstSpanListener {
}
int getStep(int duration) {
int responseTimeMaxStep = configService.getResponseTimeStep() * configService.getResponseTimeMaxStep();
int countOfResponseTimeSteps = configService.getResponseTimeStep() * configService.getCountOfResponseTimeSteps();
int responseTimeStep = configService.getResponseTimeStep();
if (duration > responseTimeMaxStep) {
return responseTimeMaxStep / responseTimeStep;
if (duration > countOfResponseTimeSteps) {
return countOfResponseTimeSteps / responseTimeStep;
} else if (duration <= responseTimeStep) {
return 0;
} else {

2
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/test/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/std/ResponseTimeDistributionSpanListenerTestCase.java
View File

@ -42,7 +42,7 @@ public class ResponseTimeDistributionSpanListenerTestCase {
IResponseTimeDistributionConfigService service = Mockito.mock(IResponseTimeDistributionConfigService.class);
Mockito.when(service.getResponseTimeStep()).thenReturn(50);
Mockito.when(service.getResponseTimeMaxStep()).thenReturn(40);
Mockito.when(service.getCountOfResponseTimeSteps()).thenReturn(40);
Module module = Mockito.mock(Module.class);
Whitebox.setInternalState(module, "loadedProviders", loadedProviders);

6
apm-collector/apm-collector-boot/src/main/resources/application.yml
View File

@ -75,10 +75,14 @@ storage:
configuration:
default:
# namespace: xxxxx
# alarm threshold
applicationApdexThreshold: 2000
serviceErrorRateThreshold: 10.00
serviceAverageResponseTimeThreshold: 2000
instanceErrorRateThreshold: 10.00
instanceAverageResponseTimeThreshold: 2000
applicationErrorRateThreshold: 10.00
applicationAverageResponseTimeThreshold: 2000
applicationAverageResponseTimeThreshold: 2000
# thermodynamic
thermodynamicResponseTimeStep: 50
thermodynamicCountOfResponseTimeSteps: 40

2
apm-collector/apm-collector-configuration/collector-configuration-define/src/main/java/org/apache/skywalking/apm/collector/configuration/service/IResponseTimeDistributionConfigService.java
View File

@ -27,5 +27,5 @@ public interface IResponseTimeDistributionConfigService extends Service {
int getResponseTimeStep();
int getResponseTimeMaxStep();
int getCountOfResponseTimeSteps();
}

20
apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/ConfigurationModuleConfig.java
View File

@ -33,8 +33,8 @@ class ConfigurationModuleConfig extends ModuleConfig {
private int instanceAverageResponseTimeThreshold;
private double applicationErrorRateThreshold;
private int applicationAverageResponseTimeThreshold;
private int responseTimeDistributionDuration;
private int responseTimeDistributionMaxDurationns;
private int thermodynamicResponseTimeStep;
private int thermodynamicCountOfResponseTimeSteps;
public String getNamespace() {
return namespace;
@ -100,19 +100,19 @@ class ConfigurationModuleConfig extends ModuleConfig {
this.applicationAverageResponseTimeThreshold = applicationAverageResponseTimeThreshold;
}
public int getResponseTimeDistributionDuration() {
return responseTimeDistributionDuration;
public int getThermodynamicResponseTimeStep() {
return thermodynamicResponseTimeStep;
}
public void setResponseTimeDistributionDuration(int responseTimeDistributionDuration) {
this.responseTimeDistributionDuration = responseTimeDistributionDuration;
public void setThermodynamicResponseTimeStep(int thermodynamicResponseTimeStep) {
this.thermodynamicResponseTimeStep = thermodynamicResponseTimeStep;
}
public int getResponseTimeDistributionMaxDurationns() {
return responseTimeDistributionMaxDurationns;
public int getThermodynamicCountOfResponseTimeSteps() {
return thermodynamicCountOfResponseTimeSteps;
}
public void setResponseTimeDistributionMaxDurationns(int responseTimeDistributionMaxDurationns) {
this.responseTimeDistributionMaxDurationns = responseTimeDistributionMaxDurationns;
public void setThermodynamicCountOfResponseTimeSteps(int thermodynamicCountOfResponseTimeSteps) {
this.thermodynamicCountOfResponseTimeSteps = thermodynamicCountOfResponseTimeSteps;
}
}

35
apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/ConfigurationModuleProvider.java
View File

@ -18,32 +18,9 @@
package org.apache.skywalking.apm.collector.configuration;
import org.apache.skywalking.apm.collector.configuration.service.ApdexThresholdService;
import org.apache.skywalking.apm.collector.configuration.service.ApplicationAlarmRuleConfig;
import org.apache.skywalking.apm.collector.configuration.service.ApplicationReferenceAlarmRuleConfig;
import org.apache.skywalking.apm.collector.configuration.service.CollectorConfigService;
import org.apache.skywalking.apm.collector.configuration.service.ComponentLibraryCatalogService;
import org.apache.skywalking.apm.collector.configuration.service.IApdexThresholdService;
import org.apache.skywalking.apm.collector.configuration.service.IApplicationAlarmRuleConfig;
import org.apache.skywalking.apm.collector.configuration.service.IApplicationReferenceAlarmRuleConfig;
import org.apache.skywalking.apm.collector.configuration.service.ICollectorConfig;
import org.apache.skywalking.apm.collector.configuration.service.IComponentLibraryCatalogService;
import org.apache.skywalking.apm.collector.configuration.service.IInstanceAlarmRuleConfig;
import org.apache.skywalking.apm.collector.configuration.service.IInstanceReferenceAlarmRuleConfig;
import org.apache.skywalking.apm.collector.configuration.service.IResponseTimeDistributionConfigService;
import org.apache.skywalking.apm.collector.configuration.service.IServiceAlarmRuleConfig;
import org.apache.skywalking.apm.collector.configuration.service.IServiceReferenceAlarmRuleConfig;
import org.apache.skywalking.apm.collector.configuration.service.InstanceAlarmRuleConfig;
import org.apache.skywalking.apm.collector.configuration.service.InstanceReferenceAlarmRuleConfig;
import org.apache.skywalking.apm.collector.configuration.service.ResponseTimeDistributionConfigService;
import org.apache.skywalking.apm.collector.configuration.service.ServiceAlarmRuleConfig;
import org.apache.skywalking.apm.collector.configuration.service.ServiceReferenceAlarmRuleConfig;
import org.apache.skywalking.apm.collector.core.module.Module;
import org.apache.skywalking.apm.collector.core.module.ModuleConfig;
import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
import org.apache.skywalking.apm.collector.core.util.Const;
import org.apache.skywalking.apm.collector.core.util.StringUtils;
import org.apache.skywalking.apm.collector.configuration.service.*;
import org.apache.skywalking.apm.collector.core.module.*;
import org.apache.skywalking.apm.collector.core.util.*;
/**
* @author peng-yongsheng
@ -79,8 +56,8 @@ public class ConfigurationModuleProvider extends ModuleProvider {
double applicationErrorRateThreshold = config.getApplicationErrorRateThreshold() == 0 ? 10.00 : config.getApplicationErrorRateThreshold();
int applicationAverageResponseTimeThreshold = config.getApplicationAverageResponseTimeThreshold() == 0 ? 2000 : config.getApplicationAverageResponseTimeThreshold();
int responseTimeDistributionDuration = config.getResponseTimeDistributionDuration() == 0 ? 50 : config.getResponseTimeDistributionDuration();
int responseTimeDistributionMaxDurations = config.getResponseTimeDistributionMaxDurationns() == 0 ? 40 : config.getResponseTimeDistributionMaxDurationns();
int thermodynamicResponseTimeStep = config.getThermodynamicResponseTimeStep() == 0 ? 50 : config.getThermodynamicResponseTimeStep();
int thermodynamicCountOfResponseTimeSteps = config.getThermodynamicCountOfResponseTimeSteps() == 0 ? 40 : config.getThermodynamicCountOfResponseTimeSteps();
this.registerServiceImplementation(ICollectorConfig.class, new CollectorConfigService(namespace));
this.registerServiceImplementation(IComponentLibraryCatalogService.class, new ComponentLibraryCatalogService());
@ -91,7 +68,7 @@ public class ConfigurationModuleProvider extends ModuleProvider {
this.registerServiceImplementation(IServiceReferenceAlarmRuleConfig.class, new ServiceReferenceAlarmRuleConfig(serviceErrorRateThreshold, serviceAverageResponseTimeThreshold));
this.registerServiceImplementation(IInstanceReferenceAlarmRuleConfig.class, new InstanceReferenceAlarmRuleConfig(instanceErrorRateThreshold, instanceAverageResponseTimeThreshold));
this.registerServiceImplementation(IApplicationReferenceAlarmRuleConfig.class, new ApplicationReferenceAlarmRuleConfig(applicationErrorRateThreshold, applicationAverageResponseTimeThreshold));
this.registerServiceImplementation(IResponseTimeDistributionConfigService.class, new ResponseTimeDistributionConfigService(responseTimeDistributionDuration, responseTimeDistributionMaxDurations));
this.registerServiceImplementation(IResponseTimeDistributionConfigService.class, new ResponseTimeDistributionConfigService(thermodynamicResponseTimeStep, thermodynamicCountOfResponseTimeSteps));
}
@Override public void start() {

10
apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ResponseTimeDistributionConfigService.java
View File

@ -24,18 +24,18 @@ package org.apache.skywalking.apm.collector.configuration.service;
public class ResponseTimeDistributionConfigService implements IResponseTimeDistributionConfigService {
private final int responseTimeStep;
private final int responseTimeMaxStep;
private final int countOfResponseTimeSteps;
public ResponseTimeDistributionConfigService(int responseTimeStep, int responseTimeMaxStep) {
public ResponseTimeDistributionConfigService(int responseTimeStep, int countOfResponseTimeSteps) {
this.responseTimeStep = responseTimeStep;
this.responseTimeMaxStep = responseTimeMaxStep + 1;
this.countOfResponseTimeSteps = countOfResponseTimeSteps + 1;
}
@Override public int getResponseTimeStep() {
return responseTimeStep;
}
@Override public int getResponseTimeMaxStep() {
return responseTimeMaxStep;
@Override public int getCountOfResponseTimeSteps() {
return countOfResponseTimeSteps;
}
}

2
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ResponseTimeDistributionService.java
View File

@ -51,7 +51,7 @@ public class ResponseTimeDistributionService {
List<IResponseTimeDistributionUIDAO.ResponseTimeStep> responseTimeSteps = new LinkedList<>();
for (int i = 0; i < durationPoints.size(); i++) {
for (int j = 0; j < responseTimeDistributionConfigService.getResponseTimeMaxStep(); j++) {
for (int j = 0; j < responseTimeDistributionConfigService.getCountOfResponseTimeSteps(); j++) {
responseTimeSteps.add(new IResponseTimeDistributionUIDAO.ResponseTimeStep(durationPoints.get(i).getPoint(), i, j));
}
}