@@ -151,24 +151,25 @@ func (reporter *StatsReporter) calculateAndSendMetrics(
151151 }
152152
153153 applicationId := metricsConfig .Guid
154- if len ( metricsConfig .Tags ) > 0 {
155- applicationId = metricsConfig . Tags [ "source_id" ]
154+ if sourceID , ok := metricsConfig .Tags [ "source_id" ]; ok {
155+ applicationId = sourceID
156156 } else {
157157 metricsConfig .Tags ["source_id" ] = applicationId
158158 }
159159
160- if metricsConfig .Tags ["instance_id" ] == "" {
161- metricsConfig .Tags ["instance_id" ] = strconv .Itoa (metricsConfig .Index )
162- }
163-
164- _ , err := strconv .Atoi (metricsConfig .Tags ["instance_id" ])
165- if err != nil {
166- logger .Error ("failed-to-retrieve-instance-id" , err , lager.Data {
167- "metrics_guid" : applicationId ,
168- "metrics_index" : metricsConfig .Index ,
169- "tags" : metricsConfig .Tags ,
170- })
171- metricsConfig .Tags ["instance_id" ] = strconv .Itoa (metricsConfig .Index )
160+ index := strconv .Itoa (metricsConfig .Index )
161+ if _ , ok := metricsConfig .Tags ["instance_id" ]; ! ok {
162+ metricsConfig .Tags ["instance_id" ] = index
163+ } else {
164+ _ , err := strconv .Atoi (metricsConfig .Tags ["instance_id" ]) // Atoi will error on empty string
165+ if err != nil {
166+ logger .Error ("failed-to-retrieve-instance-id" , err , lager.Data {
167+ "metrics_guid" : applicationId ,
168+ "metrics_index" : metricsConfig .Index ,
169+ "tags" : metricsConfig .Tags ,
170+ })
171+ metricsConfig .Tags ["instance_id" ] = index
172+ }
172173 }
173174
174175 if applicationId != "" {
0 commit comments