Changes the condition from the first payload to until a successful pa…

…yload has been delivered

agent/recorder.go

@@ -30,14 +30,13 @@ type (
 		sync.RWMutex
 		t tomb.Tomb
 
-		agentId      string
-		apiKey       string
-		apiEndpoint  string
-		version      string
-		userAgent    string
-		debugMode    bool
-		metadata     map[string]interface{}
-		metadataOnce sync.Once
+		agentId     string
+		apiKey      string
+		apiEndpoint string
+		version     string
+		userAgent   string
+		debugMode   bool
+		metadata    map[string]interface{}
 
 		spans []tracer.RawSpan
 
@@ -349,10 +348,11 @@ func (r *SpanRecorder) getPayload(rawSpans []tracer.RawSpan) map[string]interfac
 		"events":     events,
 		tags.AgentID: r.agentId,
 	}
-	// We send the metadata only in the first payload
-	r.metadataOnce.Do(func() {
+	// We send the metadata only if not spans are sent successfully
+	if atomic.LoadInt64(&r.stats.sendSpansOk) == 0 {
+		r.logger.Println("adding payload metadata")
 		payload["metadata"] = r.metadata
-	})
+	}
 	return payload
 }