Unverified Commit 405ccacc authored by Lemon's avatar Lemon Committed by GitHub

Check ApplicationId before register Application Instance (#53)

* Check ApplicationId before register applicationInstance

* update version.props
parent 0b9ceec6
<Project>
<PropertyGroup>
<VersionMajor>0</VersionMajor>
<VersionMinor>2</VersionMinor>
<VersionMinor>3</VersionMinor>
<VersionPatch>0</VersionPatch>
<VersionQuality></VersionQuality>
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
......
......@@ -108,7 +108,7 @@ namespace SkyWalking.Remote
private async Task RegisterApplicationInstance(GrpcConnection availableConnection, CancellationToken token)
{
if (DictionaryUtil.IsNull(RemoteDownstreamConfig.Agent.ApplicationInstanceId))
if (!DictionaryUtil.IsNull(RemoteDownstreamConfig.Agent.ApplicationId) && DictionaryUtil.IsNull(RemoteDownstreamConfig.Agent.ApplicationInstanceId))
{
var instanceDiscoveryService =
new InstanceDiscoveryService.InstanceDiscoveryServiceClient(availableConnection.GrpcChannel);
......@@ -139,12 +139,13 @@ namespace SkyWalking.Remote
var applicationInstanceId = 0;
while (retry++ < 5 && DictionaryUtil.IsNull(applicationInstanceId))
{
var applicationInstanceMapping =await instanceDiscoveryService.registerInstanceAsync(applicationInstance);
var applicationInstanceMapping = await instanceDiscoveryService.registerInstanceAsync(applicationInstance);
applicationInstanceId = applicationInstanceMapping.ApplicationInstanceId;
if (!DictionaryUtil.IsNull(applicationInstanceId))
{
break;
}
await Task.Delay(500, token);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment