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

Register and segment.

This commit is contained in:
peng-yongsheng 2018-01-07 22:54:06 +08:00
parent 8e2e5f4e75
commit 6a3e2f9207
13 changed files with 121 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/GlobalTraceSpanListener.java
View File

@ -71,7 +71,8 @@ public class GlobalTraceSpanListener implements FirstSpanListener, GlobalTraceId
Graph<GlobalTrace> graph = GraphManager.INSTANCE.findGraph(MetricGraphIdDefine.GLOBAL_TRACE_GRAPH_ID, GlobalTrace.class);
for (String globalTraceId : globalTraceIds) {
GlobalTrace globalTrace = new GlobalTrace(segmentId + Const.ID_SPLIT + globalTraceId);
GlobalTrace globalTrace = new GlobalTrace();
globalTrace.setId(segmentId + Const.ID_SPLIT + globalTraceId);
globalTrace.setGlobalTraceId(globalTraceId);
globalTrace.setSegmentId(segmentId);
globalTrace.setTimeBucket(timeBucket);

3
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/SegmentCostSpanListener.java
View File

@ -33,7 +33,6 @@ import org.apache.skywalking.apm.collector.cache.service.ServiceNameCacheService
import org.apache.skywalking.apm.collector.core.graph.Graph;
import org.apache.skywalking.apm.collector.core.graph.GraphManager;
import org.apache.skywalking.apm.collector.core.module.ModuleManager;
import org.apache.skywalking.apm.collector.core.util.Const;
import org.apache.skywalking.apm.collector.core.util.TimeBucketUtils;
import org.apache.skywalking.apm.collector.storage.table.segment.SegmentCost;
import org.slf4j.Logger;
@ -61,7 +60,7 @@ public class SegmentCostSpanListener implements EntrySpanListener, ExitSpanListe
String segmentId) {
timeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime());
SegmentCost segmentCost = new SegmentCost(Const.EMPTY_STRING);
SegmentCost segmentCost = new SegmentCost();
segmentCost.setSegmentId(segmentId);
segmentCost.setApplicationId(applicationId);
segmentCost.setCost(spanDecorator.getEndTime() - spanDecorator.getStartTime());

9
apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ApplicationRegisterSerialWorker.java
View File

@ -60,14 +60,16 @@ public class ApplicationRegisterSerialWorker extends AbstractLocalAsyncWorker<Ap
Application newApplication;
int min = applicationRegisterDAO.getMinApplicationId();
if (min == 0) {
Application userApplication = new Application(String.valueOf(Const.NONE_APPLICATION_ID));
Application userApplication = new Application();
userApplication.setId(String.valueOf(Const.NONE_APPLICATION_ID));
userApplication.setApplicationCode(Const.USER_CODE);
userApplication.setApplicationId(Const.NONE_APPLICATION_ID);
userApplication.setAddressId(Const.NONE);
userApplication.setIsAddress(false);
applicationRegisterDAO.save(userApplication);
newApplication = new Application("-1");
newApplication = new Application();
newApplication.setId("-1");
newApplication.setApplicationId(-1);
newApplication.setApplicationCode(application.getApplicationCode());
newApplication.setAddressId(application.getAddressId());
@ -76,7 +78,8 @@ public class ApplicationRegisterSerialWorker extends AbstractLocalAsyncWorker<Ap
int max = applicationRegisterDAO.getMaxApplicationId();
applicationId = IdAutoIncrement.INSTANCE.increment(min, max);
newApplication = new Application(String.valueOf(applicationId));
newApplication = new Application();
newApplication.setId(String.valueOf(applicationId));
newApplication.setApplicationId(applicationId);
newApplication.setApplicationCode(application.getApplicationCode());
newApplication.setAddressId(application.getAddressId());

1
apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/IdAutoIncrement.java
View File

@ -16,7 +16,6 @@
*
*/
package org.apache.skywalking.apm.collector.analysis.register.provider.register;
/**

9
apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/InstanceRegisterSerialWorker.java
View File

@ -61,7 +61,8 @@ public class InstanceRegisterSerialWorker extends AbstractLocalAsyncWorker<Insta
int min = instanceRegisterDAO.getMinInstanceId();
int max = instanceRegisterDAO.getMaxInstanceId();
if (min == 0 && max == 0) {
Instance userInstance = new Instance(String.valueOf(Const.NONE_INSTANCE_ID));
Instance userInstance = new Instance();
userInstance.setId(String.valueOf(Const.NONE_INSTANCE_ID));
userInstance.setInstanceId(Const.NONE_INSTANCE_ID);
userInstance.setApplicationId(Const.NONE_APPLICATION_ID);
userInstance.setAgentUUID(Const.USER_CODE);
@ -72,7 +73,8 @@ public class InstanceRegisterSerialWorker extends AbstractLocalAsyncWorker<Insta
userInstance.setIsAddress(false);
instanceRegisterDAO.save(userInstance);
newInstance = new Instance("2");
newInstance = new Instance();
newInstance.setId("2");
newInstance.setInstanceId(2);
newInstance.setApplicationId(instance.getApplicationId());
newInstance.setAgentUUID(instance.getAgentUUID());
@ -82,7 +84,8 @@ public class InstanceRegisterSerialWorker extends AbstractLocalAsyncWorker<Insta
newInstance.setAddressId(instance.getAddressId());
newInstance.setIsAddress(instance.getIsAddress());
} else {
newInstance = new Instance(String.valueOf(max + 1));
newInstance = new Instance();
newInstance.setId(String.valueOf(max + 1));
newInstance.setInstanceId(max + 1);
newInstance.setApplicationId(instance.getApplicationId());
newInstance.setAgentUUID(instance.getAgentUUID());

6
apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/NetworkAddressRegisterSerialWorker.java
View File

@ -59,14 +59,16 @@ public class NetworkAddressRegisterSerialWorker extends AbstractLocalAsyncWorker
NetworkAddress newNetworkAddress;
int min = networkAddressRegisterDAO.getMinNetworkAddressId();
if (min == 0) {
newNetworkAddress = new NetworkAddress("-1");
newNetworkAddress = new NetworkAddress();
newNetworkAddress.setId("-1");
newNetworkAddress.setAddressId(-1);
newNetworkAddress.setNetworkAddress(networkAddress.getNetworkAddress());
} else {
int max = networkAddressRegisterDAO.getMaxNetworkAddressId();
addressId = IdAutoIncrement.INSTANCE.increment(min, max);
newNetworkAddress = new NetworkAddress(String.valueOf(addressId));
newNetworkAddress = new NetworkAddress();
newNetworkAddress.setId(String.valueOf(addressId));
newNetworkAddress.setAddressId(addressId);
newNetworkAddress.setNetworkAddress(networkAddress.getNetworkAddress());
}

25
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/global/GlobalTrace.java
View File

@ -16,18 +16,17 @@
*
*/
package org.apache.skywalking.apm.collector.storage.table.global;
import org.apache.skywalking.apm.collector.core.data.Column;
import org.apache.skywalking.apm.collector.core.data.AbstractData;
import org.apache.skywalking.apm.collector.core.data.StreamData;
import org.apache.skywalking.apm.collector.core.data.operator.CoverOperation;
import org.apache.skywalking.apm.collector.core.data.operator.NonOperation;
/**
* @author peng-yongsheng
*/
public class GlobalTrace extends AbstractData {
public class GlobalTrace extends StreamData {
private static final Column[] STRING_COLUMNS = {
new Column(GlobalTraceTable.COLUMN_ID, new NonOperation()),
@ -45,8 +44,24 @@ public class GlobalTrace extends AbstractData {
private static final Column[] BOOLEAN_COLUMNS = {};
private static final Column[] BYTE_COLUMNS = {};
public GlobalTrace(String id) {
super(id, STRING_COLUMNS, LONG_COLUMNS, DOUBLE_COLUMNS, INTEGER_COLUMNS, BOOLEAN_COLUMNS, BYTE_COLUMNS);
public GlobalTrace() {
super(STRING_COLUMNS, LONG_COLUMNS, DOUBLE_COLUMNS, INTEGER_COLUMNS, BOOLEAN_COLUMNS, BYTE_COLUMNS);
}
@Override public String getId() {
return getDataString(0);
}
@Override public void setId(String id) {
setDataString(0, id);
}
@Override public String getMetricId() {
return getId();
}
@Override public void setMetricId(String metricId) {
setId(metricId);
}
public String getSegmentId() {

16
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/Application.java
View File

@ -19,14 +19,14 @@
package org.apache.skywalking.apm.collector.storage.table.register;
import org.apache.skywalking.apm.collector.core.data.Column;
import org.apache.skywalking.apm.collector.core.data.AbstractData;
import org.apache.skywalking.apm.collector.core.data.RegisterData;
import org.apache.skywalking.apm.collector.core.data.operator.CoverOperation;
import org.apache.skywalking.apm.collector.core.data.operator.NonOperation;
/**
* @author peng-yongsheng
*/
public class Application extends AbstractData {
public class Application extends RegisterData {
private static final Column[] STRING_COLUMNS = {
new Column(ApplicationTable.COLUMN_ID, new NonOperation()),
@ -48,8 +48,16 @@ public class Application extends AbstractData {
private static final Column[] BYTE_COLUMNS = {};
public Application(String id) {
super(id, STRING_COLUMNS, LONG_COLUMNS, DOUBLE_COLUMNS, INTEGER_COLUMNS, BOOLEAN_COLUMNS, BYTE_COLUMNS);
public Application() {
super(STRING_COLUMNS, LONG_COLUMNS, DOUBLE_COLUMNS, INTEGER_COLUMNS, BOOLEAN_COLUMNS, BYTE_COLUMNS);
}
@Override public String getId() {
return getDataString(0);
}
@Override public void setId(String id) {
setDataString(0, id);
}
public String getApplicationCode() {

14
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/Instance.java
View File

@ -19,14 +19,14 @@
package org.apache.skywalking.apm.collector.storage.table.register;
import org.apache.skywalking.apm.collector.core.data.Column;
import org.apache.skywalking.apm.collector.core.data.AbstractData;
import org.apache.skywalking.apm.collector.core.data.RegisterData;
import org.apache.skywalking.apm.collector.core.data.operator.CoverOperation;
import org.apache.skywalking.apm.collector.core.data.operator.NonOperation;
/**
* @author peng-yongsheng
*/
public class Instance extends AbstractData {
public class Instance extends RegisterData {
private static final Column[] STRING_COLUMNS = {
new Column(InstanceTable.COLUMN_ID, new NonOperation()),
@ -53,14 +53,18 @@ public class Instance extends AbstractData {
private static final Column[] BYTE_COLUMNS = {};
public Instance(String id) {
super(id, STRING_COLUMNS, LONG_COLUMNS, DOUBLE_COLUMNS, INTEGER_COLUMNS, BOOLEAN_COLUMNS, BYTE_COLUMNS);
public Instance() {
super(STRING_COLUMNS, LONG_COLUMNS, DOUBLE_COLUMNS, INTEGER_COLUMNS, BOOLEAN_COLUMNS, BYTE_COLUMNS);
}
public String getId() {
@Override public String getId() {
return getDataString(0);
}
@Override public void setId(String id) {
setDataString(0, id);
}
public int getApplicationId() {
return getDataInteger(0);
}

14
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/NetworkAddress.java
View File

@ -19,13 +19,13 @@
package org.apache.skywalking.apm.collector.storage.table.register;
import org.apache.skywalking.apm.collector.core.data.Column;
import org.apache.skywalking.apm.collector.core.data.AbstractData;
import org.apache.skywalking.apm.collector.core.data.RegisterData;
import org.apache.skywalking.apm.collector.core.data.operator.NonOperation;
/**
* @author peng-yongsheng
*/
public class NetworkAddress extends AbstractData {
public class NetworkAddress extends RegisterData {
private static final Column[] STRING_COLUMNS = {
new Column(NetworkAddressTable.COLUMN_ID, new NonOperation()),
@ -45,14 +45,18 @@ public class NetworkAddress extends AbstractData {
private static final Column[] BYTE_COLUMNS = {};
public NetworkAddress(String id) {
super(id, STRING_COLUMNS, LONG_COLUMNS, DOUBLE_COLUMNS, INTEGER_COLUMNS, BOOLEAN_COLUMNS, BYTE_COLUMNS);
public NetworkAddress() {
super(STRING_COLUMNS, LONG_COLUMNS, DOUBLE_COLUMNS, INTEGER_COLUMNS, BOOLEAN_COLUMNS, BYTE_COLUMNS);
}
public String getId() {
@Override public String getId() {
return getDataString(0);
}
@Override public void setId(String id) {
setDataString(0, id);
}
public String getNetworkAddress() {
return getDataString(1);
}

17
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/ServiceName.java
View File

@ -16,18 +16,17 @@
*
*/
package org.apache.skywalking.apm.collector.storage.table.register;
import org.apache.skywalking.apm.collector.core.data.Column;
import org.apache.skywalking.apm.collector.core.data.AbstractData;
import org.apache.skywalking.apm.collector.core.data.RegisterData;
import org.apache.skywalking.apm.collector.core.data.operator.CoverOperation;
import org.apache.skywalking.apm.collector.core.data.operator.NonOperation;
/**
* @author peng-yongsheng
*/
public class ServiceName extends AbstractData {
public class ServiceName extends RegisterData {
private static final Column[] STRING_COLUMNS = {
new Column(ServiceNameTable.COLUMN_ID, new NonOperation()),
@ -44,8 +43,16 @@ public class ServiceName extends AbstractData {
private static final Column[] BOOLEAN_COLUMNS = {};
private static final Column[] BYTE_COLUMNS = {};
public ServiceName(String id) {
super(id, STRING_COLUMNS, LONG_COLUMNS, DOUBLE_COLUMNS, INTEGER_COLUMNS, BOOLEAN_COLUMNS, BYTE_COLUMNS);
public ServiceName() {
super(STRING_COLUMNS, LONG_COLUMNS, DOUBLE_COLUMNS, INTEGER_COLUMNS, BOOLEAN_COLUMNS, BYTE_COLUMNS);
}
@Override public String getId() {
return getDataString(0);
}
@Override public void setId(String id) {
setDataString(0, id);
}
public String getServiceName() {

25
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/segment/Segment.java
View File

@ -16,18 +16,17 @@
*
*/
package org.apache.skywalking.apm.collector.storage.table.segment;
import org.apache.skywalking.apm.collector.core.data.AbstractData;
import org.apache.skywalking.apm.collector.core.data.Column;
import org.apache.skywalking.apm.collector.core.data.StreamData;
import org.apache.skywalking.apm.collector.core.data.operator.CoverOperation;
import org.apache.skywalking.apm.collector.core.data.operator.NonOperation;
/**
* @author peng-yongsheng
*/
public class Segment extends AbstractData {
public class Segment extends StreamData {
private static final Column[] STRING_COLUMNS = {
new Column(SegmentTable.COLUMN_ID, new NonOperation()),
@ -45,8 +44,24 @@ public class Segment extends AbstractData {
new Column(SegmentTable.COLUMN_DATA_BINARY, new CoverOperation()),
};
public Segment(String id) {
super(id, STRING_COLUMNS, LONG_COLUMNS, DOUBLE_COLUMNS, INTEGER_COLUMNS, BOOLEAN_COLUMNS, BYTE_COLUMNS);
public Segment() {
super(STRING_COLUMNS, LONG_COLUMNS, DOUBLE_COLUMNS, INTEGER_COLUMNS, BOOLEAN_COLUMNS, BYTE_COLUMNS);
}
@Override public String getId() {
return getDataString(0);
}
@Override public void setId(String id) {
setDataString(0, id);
}
@Override public String getMetricId() {
return getId();
}
@Override public void setMetricId(String metricId) {
setId(metricId);
}
public byte[] getDataBinary() {

25
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/segment/SegmentCost.java
View File

@ -16,18 +16,17 @@
*
*/
package org.apache.skywalking.apm.collector.storage.table.segment;
import org.apache.skywalking.apm.collector.core.data.Column;
import org.apache.skywalking.apm.collector.core.data.AbstractData;
import org.apache.skywalking.apm.collector.core.data.StreamData;
import org.apache.skywalking.apm.collector.core.data.operator.CoverOperation;
import org.apache.skywalking.apm.collector.core.data.operator.NonOperation;
/**
* @author peng-yongsheng
*/
public class SegmentCost extends AbstractData {
public class SegmentCost extends StreamData {
private static final Column[] STRING_COLUMNS = {
new Column(SegmentCostTable.COLUMN_ID, new NonOperation()),
@ -51,8 +50,24 @@ public class SegmentCost extends AbstractData {
};
private static final Column[] BYTE_COLUMNS = {};
public SegmentCost(String id) {
super(id, STRING_COLUMNS, LONG_COLUMNS, DOUBLE_COLUMNS, INTEGER_COLUMNS, BOOLEAN_COLUMNS, BYTE_COLUMNS);
public SegmentCost() {
super(STRING_COLUMNS, LONG_COLUMNS, DOUBLE_COLUMNS, INTEGER_COLUMNS, BOOLEAN_COLUMNS, BYTE_COLUMNS);
}
@Override public String getId() {
return getDataString(0);
}
@Override public void setId(String id) {
setDataString(0, id);
}
@Override public String getMetricId() {
return getId();
}
@Override public void setMetricId(String metricId) {
setId(metricId);
}
public String getSegmentId() {