Commit d56ad5ec authored by 彭勇升 pengys's avatar 彭勇升 pengys Committed by 吴晟
Browse files

#1232 (#1333) 

RemoteDataMappingIdNotFoundException caused by remote entity did not registered.
Some remote entities in alarm module did not registered into remote module.
parent c2a425f5

apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/AnalysisAlarmModuleProvider.java

+6 −0
Original line number Diff line number Diff line
@@ -85,9 +85,15 @@ public class AnalysisAlarmModuleProvider extends ModuleProvider { 
        RemoteDataRegisterService remoteDataRegisterService = getManager().find(RemoteModule.NAME).getService(RemoteDataRegisterService.class);

        remoteDataRegisterService.register(ApplicationAlarm.class, new ApplicationAlarm.InstanceCreator());

        remoteDataRegisterService.register(ApplicationAlarmList.class, new ApplicationAlarmList.InstanceCreator());

        remoteDataRegisterService.register(ApplicationReferenceAlarm.class, new ApplicationReferenceAlarm.InstanceCreator());

        remoteDataRegisterService.register(ApplicationReferenceAlarmList.class, new ApplicationReferenceAlarmList.InstanceCreator());

        remoteDataRegisterService.register(InstanceAlarm.class, new InstanceAlarm.InstanceCreator());

        remoteDataRegisterService.register(InstanceAlarmList.class, new InstanceAlarmList.InstanceCreator());

        remoteDataRegisterService.register(InstanceReferenceAlarm.class, new InstanceReferenceAlarm.InstanceCreator());

        remoteDataRegisterService.register(InstanceReferenceAlarmList.class, new InstanceReferenceAlarmList.InstanceCreator());

        remoteDataRegisterService.register(ServiceAlarm.class, new ServiceAlarm.InstanceCreator());

        remoteDataRegisterService.register(ServiceAlarmList.class, new ServiceAlarmList.InstanceCreator());

        remoteDataRegisterService.register(ServiceReferenceAlarm.class, new ServiceReferenceAlarm.InstanceCreator());

        remoteDataRegisterService.register(ServiceReferenceAlarmList.class, new ServiceReferenceAlarmList.InstanceCreator());

    }

}

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/ApplicationReferenceAlarm.java

+9 −4
Original line number Diff line number Diff line
@@ -18,10 +18,9 @@ 


package org.apache.skywalking.apm.collector.storage.table.alarm;



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.CoverMergeOperation;

import org.apache.skywalking.apm.collector.core.data.operator.NonMergeOperation;

import org.apache.skywalking.apm.collector.core.data.*;

import org.apache.skywalking.apm.collector.core.data.operator.*;

import org.apache.skywalking.apm.collector.remote.service.RemoteDataRegisterService;



/**

 * @author peng-yongsheng
@@ -123,4 +122,10 @@ public class ApplicationReferenceAlarm extends StreamData implements Alarm { 
    public void setAlarmContent(String alarmContent) {

        setDataString(1, alarmContent);

    }



    public static class InstanceCreator implements RemoteDataRegisterService.RemoteDataInstanceCreator {

        @Override public RemoteData createInstance() {

            return new ApplicationReferenceAlarm();

        }

    }

}

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/ApplicationReferenceAlarmList.java

+9 −4
Original line number Diff line number Diff line
@@ -18,10 +18,9 @@ 


package org.apache.skywalking.apm.collector.storage.table.alarm;



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.CoverMergeOperation;

import org.apache.skywalking.apm.collector.core.data.operator.NonMergeOperation;

import org.apache.skywalking.apm.collector.core.data.*;

import org.apache.skywalking.apm.collector.core.data.operator.*;

import org.apache.skywalking.apm.collector.remote.service.RemoteDataRegisterService;



/**

 * @author peng-yongsheng
@@ -115,4 +114,10 @@ public class ApplicationReferenceAlarmList extends StreamData { 
    public void setAlarmContent(String alarmContent) {

        setDataString(1, alarmContent);

    }



    public static class InstanceCreator implements RemoteDataRegisterService.RemoteDataInstanceCreator {

        @Override public RemoteData createInstance() {

            return new ApplicationReferenceAlarmList();

        }

    }

}

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/InstanceReferenceAlarm.java

+9 −4
Original line number Diff line number Diff line
@@ -18,10 +18,9 @@ 


package org.apache.skywalking.apm.collector.storage.table.alarm;



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.CoverMergeOperation;

import org.apache.skywalking.apm.collector.core.data.operator.NonMergeOperation;

import org.apache.skywalking.apm.collector.core.data.*;

import org.apache.skywalking.apm.collector.core.data.operator.*;

import org.apache.skywalking.apm.collector.remote.service.RemoteDataRegisterService;



/**

 * @author peng-yongsheng
@@ -141,4 +140,10 @@ public class InstanceReferenceAlarm extends StreamData implements Alarm { 
    public void setAlarmContent(String alarmContent) {

        setDataString(1, alarmContent);

    }



    public static class InstanceCreator implements RemoteDataRegisterService.RemoteDataInstanceCreator {

        @Override public RemoteData createInstance() {

            return new InstanceReferenceAlarm();

        }

    }

}

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/InstanceReferenceAlarmList.java

+9 −4
Original line number Diff line number Diff line
@@ -18,10 +18,9 @@ 


package org.apache.skywalking.apm.collector.storage.table.alarm;



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.CoverMergeOperation;

import org.apache.skywalking.apm.collector.core.data.operator.NonMergeOperation;

import org.apache.skywalking.apm.collector.core.data.*;

import org.apache.skywalking.apm.collector.core.data.operator.*;

import org.apache.skywalking.apm.collector.remote.service.RemoteDataRegisterService;



/**

 * @author peng-yongsheng
@@ -133,4 +132,10 @@ public class InstanceReferenceAlarmList extends StreamData { 
    public void setAlarmContent(String alarmContent) {

        setDataString(1, alarmContent);

    }



    public static class InstanceCreator implements RemoteDataRegisterService.RemoteDataInstanceCreator {

        @Override public RemoteData createInstance() {

            return new InstanceReferenceAlarmList();

        }

    }

}