From 9da7968a4d73a9949db1f63e8f75f2b328299ec3 Mon Sep 17 00:00:00 2001 From: wusheng Date: Fri, 23 Jun 2017 23:24:29 +0800 Subject: [PATCH] Added instanceId for services. --- apm-network/src/main/proto/AggregatedMetricsService.proto | 2 ++ apm-network/src/main/proto/RegisterService.proto | 3 ++- apm-network/src/main/proto/TraceSegmentService.proto | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apm-network/src/main/proto/AggregatedMetricsService.proto b/apm-network/src/main/proto/AggregatedMetricsService.proto index ed4b9b264..36c522836 100644 --- a/apm-network/src/main/proto/AggregatedMetricsService.proto +++ b/apm-network/src/main/proto/AggregatedMetricsService.proto @@ -12,6 +12,8 @@ service AggregatedMetricsService { message AggregatedMetrics { repeated Metric metrics = 1; + int32 applicationId = 2; + int32 applicationInstanceId = 3; } // In aggregated metric, every operation metric is aggregated in 1 seconds. diff --git a/apm-network/src/main/proto/RegisterService.proto b/apm-network/src/main/proto/RegisterService.proto index 773f224b8..dff94a55d 100644 --- a/apm-network/src/main/proto/RegisterService.proto +++ b/apm-network/src/main/proto/RegisterService.proto @@ -14,7 +14,8 @@ message ApplicationMetaInfo { } message ApplicationRegiseredInfo { - int32 applicationId = 2; + int32 applicationId = 1; + int32 applicationInstanceId = 2; } //register service for ServiceName, Network address diff --git a/apm-network/src/main/proto/TraceSegmentService.proto b/apm-network/src/main/proto/TraceSegmentService.proto index 4382a062b..000ca8a7d 100644 --- a/apm-network/src/main/proto/TraceSegmentService.proto +++ b/apm-network/src/main/proto/TraceSegmentService.proto @@ -15,7 +15,8 @@ message TraceSegmentObject { repeated TraceSegmentReference refs = 2; repeated SpanObject spans = 3; int32 applicationId = 4; - repeated string globalTraceIds = 5; + int32 applicationInstanceId = 5; + repeated string globalTraceIds = 6; } message TraceSegmentReference {