Unverified Commit e9d4c52a authored by 吴晟's avatar 吴晟 Committed by GitHub
Browse files

Make sure heartbeat working always. (#1873) 

* Make sure heartbeat working always. cc @liuhaoyang make sure .net agent hasn't this issue.

* FIx CI.
parent 13c417c0

apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AppAndServiceRegisterClient.java

+32 −37
Original line number Diff line number Diff line
@@ -19,34 +19,38 @@ 
package org.apache.skywalking.apm.agent.core.remote;



import io.grpc.Channel;

import java.util.UUID;

import java.util.concurrent.Executors;

import java.util.concurrent.ScheduledFuture;

import java.util.concurrent.TimeUnit;

import org.apache.skywalking.apm.agent.core.boot.BootService;

import org.apache.skywalking.apm.agent.core.boot.DefaultImplementor;

import org.apache.skywalking.apm.agent.core.boot.DefaultNamedThreadFactory;

import org.apache.skywalking.apm.agent.core.boot.ServiceManager;

import org.apache.skywalking.apm.agent.core.conf.Config;

import org.apache.skywalking.apm.agent.core.conf.RemoteDownstreamConfig;

import org.apache.skywalking.apm.agent.core.context.TracingContext;

import org.apache.skywalking.apm.agent.core.context.TracingContextListener;

import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment;

import org.apache.skywalking.apm.agent.core.dictionary.DictionaryUtil;

import org.apache.skywalking.apm.agent.core.dictionary.NetworkAddressDictionary;

import org.apache.skywalking.apm.agent.core.dictionary.OperationNameDictionary;

import org.apache.skywalking.apm.agent.core.logging.api.ILog;

import org.apache.skywalking.apm.agent.core.logging.api.LogManager;

import org.apache.skywalking.apm.agent.core.os.OSUtil;

import org.apache.skywalking.apm.network.language.agent.*;

import org.apache.skywalking.apm.network.language.agent.Application;

import org.apache.skywalking.apm.network.language.agent.ApplicationInstance;

import org.apache.skywalking.apm.network.language.agent.ApplicationInstanceHeartbeat;

import org.apache.skywalking.apm.network.language.agent.ApplicationInstanceMapping;

import org.apache.skywalking.apm.network.language.agent.ApplicationMapping;

import org.apache.skywalking.apm.network.language.agent.ApplicationRegisterServiceGrpc;

import org.apache.skywalking.apm.network.language.agent.InstanceDiscoveryServiceGrpc;

import org.apache.skywalking.apm.network.language.agent.NetworkAddressRegisterServiceGrpc;

import org.apache.skywalking.apm.network.language.agent.ServiceNameDiscoveryServiceGrpc;

import org.apache.skywalking.apm.util.RunnableWithExceptionProtection;



import java.util.UUID;

import java.util.concurrent.Executors;

import java.util.concurrent.ScheduledFuture;

import java.util.concurrent.TimeUnit;



/**

 * @author wusheng

 */

@DefaultImplementor

public class AppAndServiceRegisterClient implements BootService, GRPCChannelListener, Runnable, TracingContextListener {

public class AppAndServiceRegisterClient implements BootService, Runnable, GRPCChannelListener {

    private static final ILog logger = LogManager.getLogger(AppAndServiceRegisterClient.class);

    private static final String PROCESS_UUID = UUID.randomUUID().toString().replaceAll("-", "");
@@ -56,7 +60,6 @@ public class AppAndServiceRegisterClient implements BootService, GRPCChannelList 
    private volatile ServiceNameDiscoveryServiceGrpc.ServiceNameDiscoveryServiceBlockingStub serviceNameDiscoveryServiceBlockingStub;

    private volatile NetworkAddressRegisterServiceGrpc.NetworkAddressRegisterServiceBlockingStub networkAddressRegisterServiceBlockingStub;

    private volatile ScheduledFuture<?> applicationRegisterFuture;

    private volatile long lastSegmentTime = -1;



    @Override

    public void statusChanged(GRPCChannelStatus status) {
@@ -93,7 +96,6 @@ public class AppAndServiceRegisterClient implements BootService, GRPCChannelList 


    @Override

    public void onComplete() throws Throwable {

        TracingContext.ListenerManager.add(this);

    }



    @Override
@@ -132,12 +134,10 @@ public class AppAndServiceRegisterClient implements BootService, GRPCChannelList 
                                    = instanceMapping.getApplicationInstanceId();

                            }

                        } else {

                            if (lastSegmentTime - System.currentTimeMillis() > 60 * 1000) {

                            instanceDiscoveryServiceBlockingStub.heartbeat(ApplicationInstanceHeartbeat.newBuilder()

                                .setApplicationInstanceId(RemoteDownstreamConfig.Agent.APPLICATION_INSTANCE_ID)

                                .setHeartbeatTime(System.currentTimeMillis())

                                .build());

                            }



                            NetworkAddressDictionary.INSTANCE.syncRemoteDictionary(networkAddressRegisterServiceBlockingStub);

                            OperationNameDictionary.INSTANCE.syncRemoteDictionary(serviceNameDiscoveryServiceBlockingStub);
@@ -150,9 +150,4 @@ public class AppAndServiceRegisterClient implements BootService, GRPCChannelList 
            }

        }

    }



    @Override

    public void afterFinished(TraceSegment traceSegment) {

        lastSegmentTime = System.currentTimeMillis();

    }

}

apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/boot/ServiceManagerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public class ServiceManagerTest { 


    private void assertTracingContextListener() throws Exception {

        List<TracingContextListener> listeners = getFieldValue(TracingContext.ListenerManager.class, "LISTENERS");

        assertThat(listeners.size(), is(3));

        assertThat(listeners.size(), is(2));



        assertThat(listeners.contains(ServiceManager.INSTANCE.findService(ContextManager.class)), is(true));

        assertThat(listeners.contains(ServiceManager.INSTANCE.findService(TraceSegmentServiceClient.class)), is(true));