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

1. Fixed the bug of inventory equals method. (#1814) 

2. Fixed the bug of agent mock register order.
3. Fixed the bug of all heatmap.
This commit is contained in:
彭勇升 pengys 2018-10-25 21:23:20 +08:00 committed by 吴晟 Wu Sheng
parent 6c92fc5484
commit 24e958fec0
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/EndpointInventory.java
View File

@ -72,7 +72,7 @@ public class EndpointInventory extends RegisterSource {
EndpointInventory source = (EndpointInventory)obj;
if (serviceId != source.getServiceId())
return false;
if (name.equals(source.getName()))
if (!name.equals(source.getName()))
return false;
return true;

2
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NetworkAddressInventory.java
View File

@ -65,7 +65,7 @@ public class NetworkAddressInventory extends RegisterSource {
return false;
NetworkAddressInventory source = (NetworkAddressInventory)obj;
if (name.equals(source.getName()))
if (!name.equals(source.getName()))
return false;
return true;

2
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInstanceInventory.java
View File

@ -97,7 +97,7 @@ public class ServiceInstanceInventory extends RegisterSource {
ServiceInstanceInventory source = (ServiceInstanceInventory)obj;
if (serviceId != source.getServiceId())
return false;
if (name.equals(source.getName()))
if (!name.equals(source.getName()))
return false;
if (isAddress != source.getIsAddress())
return false;

2
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
View File

@ -84,7 +84,7 @@ public class ServiceInventory extends RegisterSource {
return false;
ServiceInventory source = (ServiceInventory)obj;
if (name.equals(source.getName()))
if (!name.equals(source.getName()))
return false;
if (isAddress != source.getIsAddress())
return false;

2
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DetectPoint.java
View File

@ -31,7 +31,7 @@ public enum DetectPoint {
case Entry:
return DetectPoint.SERVER;
case Exit:
return DetectPoint.SERVER;
return DetectPoint.CLIENT;
case UNRECOGNIZED:
case Local:
default:

12
oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/AgentDataMock.java
View File

@ -44,20 +44,20 @@ public class AgentDataMock {
ServiceAMock serviceAMock = new ServiceAMock(registerMock);
serviceAMock.register();
UniqueId.Builder serviceASegmentId = UniqueIdBuilder.INSTANCE.create();
serviceAMock.mock(streamObserver, globalTraceId, serviceASegmentId, startTimestamp, true);
// ServiceBMock
ServiceBMock serviceBMock = new ServiceBMock(registerMock);
serviceBMock.register();
UniqueId.Builder serviceBSegmentId = UniqueIdBuilder.INSTANCE.create();
serviceBMock.mock(streamObserver, globalTraceId, serviceBSegmentId, serviceASegmentId, startTimestamp, true);
// ServiceCMock
ServiceCMock serviceCMock = new ServiceCMock(registerMock);
serviceCMock.register();
UniqueId.Builder serviceASegmentId = UniqueIdBuilder.INSTANCE.create();
serviceAMock.mock(streamObserver, globalTraceId, serviceASegmentId, startTimestamp, true);
UniqueId.Builder serviceBSegmentId = UniqueIdBuilder.INSTANCE.create();
serviceBMock.mock(streamObserver, globalTraceId, serviceBSegmentId, serviceASegmentId, startTimestamp, true);
UniqueId.Builder serviceCSegmentId = UniqueIdBuilder.INSTANCE.create();
serviceCMock.mock(streamObserver, globalTraceId, serviceCSegmentId, serviceBSegmentId, startTimestamp, true);

2
oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricQueryEsDAO.java
View File

@ -150,7 +150,7 @@ public class MetricQueryEsDAO extends EsDAO implements IMetricQueryDAO {
}
for (IntKeyLongValue intKeyLongValue : intKeyLongValues) {
axisYValues.set(intKeyLongValue.getKey(), intKeyLongValue.getValue());
axisYValues.set(intKeyLongValue.getKey() - 1, intKeyLongValue.getValue());
}
thermodynamicValueMatrix.add(axisYValues);