feat: adding length method to attribute list and updating http.url attribute in net/http instrumentation

instrumentation/opentelemetry/span.go

@@ -39,6 +39,10 @@ func (l *AttributeList) Iterate(yield func(key string, value interface{}) bool)
 	}
 }
 
+func (l *AttributeList) Len() int {
+	return len(l.attrs)
+}
+
 var _ sdk.Span = (*Span)(nil)
 
 type Span struct {

instrumentation/opentelemetry/span_test.go

@@ -133,3 +133,17 @@ func TestIterate(t *testing.T) {
 	// service.instance.id is added implicitly in StartSpan so 3 attributes will be present.
 	assert.Equal(t, 3, numAttrs)
 }
+
+func TestLen(t *testing.T) {
+	sampler := sdktrace.AlwaysSample()
+	tp := sdktrace.NewTracerProvider(
+		sdktrace.WithSampler(sampler),
+	)
+	otel.SetTracerProvider(tp)
+	_, s, _ := StartSpan(context.Background(), "test_span", &sdk.SpanOptions{})
+	s.SetAttribute("k1", "v1")
+	s.SetAttribute("k2", 200)
+
+	// service.instance.id is added implicitly in StartSpan so 3 attributes will be present.
+	assert.Equal(t, 3, s.GetAttributes().Len())
+}

sdk/instrumentation/net/http/handler.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"io"
 	"net/http"
+	"strings"
 
 	config "github.com/hypertrace/agent-config/gen/go/v1"
 	"github.com/hypertrace/goagent/sdk"
@@ -65,7 +66,11 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	url := r.URL.String()
-	span.SetAttribute("http.url", url)
+	if strings.Contains(url, "://") {
+		span.SetAttribute("http.url", url)
+	} else {
+		span.SetAttribute("http.target", url)
+	}
 
 	host := r.Host
 	span.SetAttribute("http.request.header.host", host)

sdk/instrumentation/net/http/handler_test.go

@@ -516,3 +516,36 @@ func TestProcessingBodyIsTrimmed(t *testing.T) {
 
 	ih.ServeHTTP(w, r)
 }
+
+func TestUrlAttribute(t *testing.T) {
+	defer internalconfig.ResetConfig()
+
+	h := http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+		rw.Header().Add("request_id", "abc123xyz")
+		rw.WriteHeader(202)
+		rw.Write([]byte("test_res"))
+		rw.Write([]byte("ponse_body"))
+	})
+
+	wh, _ := WrapHandler(h, mock.SpanFromContext, &Options{}, map[string]string{}, &metricsHandler{}).(*handler)
+	wh.dataCaptureConfig = emptyTestConfig
+	ih := &mockHandler{baseHandler: wh}
+
+	// http.url
+	r, _ := http.NewRequest("GET", "http://traceable.ai/foo?user_id=1", strings.NewReader("test_request_body"))
+	w := httptest.NewRecorder()
+	ih.ServeHTTP(w, r)
+	span := ih.spans[0]
+
+	assert.Equal(t, "http://traceable.ai/foo?user_id=1", span.ReadAttribute("http.url").(string))
+	assert.Nil(t, span.ReadAttribute("http.target"))
+
+	// http.target
+	r, _ = http.NewRequest("GET", "/foo?user_id=1", strings.NewReader("test_request_body"))
+	w = httptest.NewRecorder()
+	ih.ServeHTTP(w, r)
+	span = ih.spans[1]
+	assert.Equal(t, "/foo?user_id=1", span.ReadAttribute("http.target").(string))
+	assert.Nil(t, span.ReadAttribute("http.url"))
+
+}

sdk/internal/mock/span.go

@@ -37,6 +37,10 @@ func (l *AttributeList) Iterate(yield func(key string, value interface{}) bool)
 	}
 }
 
+func (l *AttributeList) Len() int {
+	return len(l.attrs)
+}
+
 var _ sdk.Span = &Span{}
 
 type Span struct {

sdk/span.go

@@ -11,6 +11,8 @@ type AttributeList interface {
 	// Iterate loops through the attributes list and applies the yield function on each attribute.
 	// If the yield function returns false, we exit the loop.
 	Iterate(yield func(key string, value interface{}) bool)
+
+	Len() int
 }
 
 // Span is an interface that accepts attributes and can be