Merge pull request #353 from hramazani/B-82948-TK-140465-add_account_…

…id_to_span_attributes_in_atlas-app-toolkit

Add further attributes to span in tracing package

tracing/cogs/cogs.go

@@ -0,0 +1,8 @@
+package cogs
+
+// const values used in setting span attributes for COGS: Cost Of Goods Sold.
+const (
+	CostOfGoodsKey       = "cogs"
+	CostOfGoodsMethodKey = "cogs.method"
+	CostOfGoodsAccountID = "cogs.accountID"
+)

tracing/http.go

@@ -11,6 +11,7 @@ import (
 	"go.opencensus.io/trace"
 
 	"github.com/infobloxopen/atlas-app-toolkit/auth"
+	"github.com/infobloxopen/atlas-app-toolkit/tracing/cogs"
 )
 
 const (
@@ -137,6 +138,10 @@ type Handler struct {
 func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	span := trace.FromContext(r.Context())
 
+	// Add accountID to span attributes
+	accountID, _ := auth.GetAccountID(r.Context(), nil)
+	span.AddAttributes(trace.StringAttribute(cogs.CostOfGoodsAccountID, accountID))
+
 	withHeaders := h.options.spanWithHeaders != nil && h.options.spanWithHeaders(r)
 	withPayload := h.options.spanWithPayload != nil && h.options.spanWithPayload(r)
 

tracing/http_test.go

@@ -177,7 +177,7 @@ func TestHandler_ServeHTTP(t *testing.T) {
 	// Test that Span attributes were populated with Headers
 	reflectAttrMap := reflect.ValueOf(trace.FromContext(result.request.Context())).Elem().Field(3).Elem().Field(0)
 	reflectKeys := reflectAttrMap.MapKeys()
-	assert.Len(t, reflectKeys, 8)
+	assert.Len(t, reflectKeys, 9)
 
 	resultHeadersMap := make(map[string]string)
 	for _, k := range reflectKeys {