Custom image pyroscope perf

.drone/drone.yml

@@ -916,6 +916,7 @@ trigger:
   ref:
   - refs/heads/main
   - refs/tags/v*
+  - refs/heads/custom-image-*
 type: docker
 volumes:
 - host:
@@ -960,6 +961,7 @@ trigger:
   ref:
   - refs/heads/main
   - refs/tags/v*
+  - refs/heads/custom-image-*
 type: docker
 volumes:
 - host:
@@ -1004,6 +1006,7 @@ trigger:
   ref:
   - refs/heads/main
   - refs/tags/v*
+  - refs/heads/custom-image-*
 type: docker
 volumes:
 - host:
@@ -1048,6 +1051,7 @@ trigger:
   ref:
   - refs/heads/main
   - refs/tags/v*
+  - refs/heads/custom-image-*
 type: docker
 volumes:
 - host:
@@ -1092,6 +1096,7 @@ trigger:
   ref:
   - refs/heads/main
   - refs/tags/v*
+  - refs/heads/custom-image-*
 type: docker
 volumes:
 - host:
@@ -1136,6 +1141,7 @@ trigger:
   ref:
   - refs/heads/main
   - refs/tags/v*
+  - refs/heads/custom-image-*
 type: docker
 volumes:
 - host:
@@ -1427,6 +1433,6 @@ kind: secret
 name: updater_private_key
 ---
 kind: signature
-hmac: 47d018f95267288b13edfd1bdabbab3bc60daa2674fda3ebeb713fac569586cb
+hmac: 37081b0d18b8076fcb5d1a7b4a1849bd38febbcaf40b4692c1892e44e69594d8
 
 ...

.drone/pipelines/publish.jsonnet

@@ -13,6 +13,7 @@ local linux_containers_jobs = std.map(function(container) (
       ref: [
         'refs/heads/main',
         'refs/tags/v*',
+        'refs/heads/custom-image-*', // use branch naming convention to build test images from PRs
       ],
     },
     steps: [{

component/pyroscope/scrape/scrape.go

@@ -102,7 +102,7 @@ type ProfilingConfig struct {
 // AllTargets returns the set of all standard and custom profiling targets,
 // regardless of whether they're enabled. The key in the map indicates the name
 // of the target.
-func (cfg ProfilingConfig) AllTargets() map[string]ProfilingTarget {
+func (cfg *ProfilingConfig) AllTargets() map[string]ProfilingTarget {
 	targets := map[string]ProfilingTarget{
 		pprofMemory:            cfg.Memory,
 		pprofBlock:             cfg.Block,
@@ -376,7 +376,7 @@ func (c *Component) DebugInfo() interface{} {
 			if st != nil {
 				res = append(res, scrape.TargetStatus{
 					JobName:            job,
-					URL:                st.URL().String(),
+					URL:                st.URL(),
 					Health:             string(st.Health()),
 					Labels:             st.discoveredLabels.Map(),
 					LastError:          lastError,

component/pyroscope/scrape/scrape_loop.go

@@ -56,12 +56,12 @@ func newScrapePool(cfg Arguments, appendable pyroscope.Appendable, logger log.Lo
 func (tg *scrapePool) sync(groups []*targetgroup.Group) {
 	tg.mtx.Lock()
 	defer tg.mtx.Unlock()
-
+	allTarget := tg.config.ProfilingConfig.AllTargets()
 	level.Info(tg.logger).Log("msg", "syncing target groups", "job", tg.config.JobName)
 	var actives []*Target
-	tg.droppedTargets = []*Target{}
+	tg.droppedTargets = tg.droppedTargets[:0]
 	for _, group := range groups {
-		targets, dropped, err := targetsFromGroup(group, tg.config)
+		targets, dropped, err := targetsFromGroup(group, tg.config, allTarget)
 		if err != nil {
 			level.Error(tg.logger).Log("msg", "creating targets failed", "err", err)
 			continue
@@ -75,20 +75,20 @@ func (tg *scrapePool) sync(groups []*targetgroup.Group) {
 	}
 
 	for _, t := range actives {
-		if _, ok := tg.activeTargets[t.hash()]; !ok {
+		if _, ok := tg.activeTargets[t.Hash()]; !ok {
 			loop := newScrapeLoop(t, tg.scrapeClient, tg.appendable, tg.config.ScrapeInterval, tg.config.ScrapeTimeout, tg.logger)
-			tg.activeTargets[t.hash()] = loop
+			tg.activeTargets[t.Hash()] = loop
 			loop.start()
 		} else {
-			tg.activeTargets[t.hash()].SetDiscoveredLabels(t.DiscoveredLabels())
+			tg.activeTargets[t.Hash()].SetDiscoveredLabels(t.DiscoveredLabels())
 		}
 	}
 
 	// Removes inactive targets.
 Outer:
 	for h, t := range tg.activeTargets {
 		for _, at := range actives {
-			if h == at.hash() {
+			if h == at.Hash() {
 				continue Outer
 			}
 		}
@@ -179,7 +179,7 @@ func newScrapeLoop(t *Target, scrapeClient *http.Client, appendable pyroscope.Ap
 		Target:       t,
 		logger:       logger,
 		scrapeClient: scrapeClient,
-		appender:     NewDeltaAppender(appendable.Appender(), t.labels),
+		appender:     NewDeltaAppender(appendable.Appender(), t.privateLabels),
 		interval:     interval,
 		timeout:      timeout,
 	}
@@ -222,7 +222,7 @@ func (t *scrapeLoop) scrape() {
 	)
 	defer cancel()
 
-	for _, l := range t.labels {
+	for _, l := range t.privateLabels {
 		if l.Name == ProfileName {
 			profileType = l.Value
 			break
@@ -238,7 +238,7 @@ func (t *scrapeLoop) scrape() {
 	if len(b) > 0 {
 		t.lastScrapeSize = len(b)
 	}
-	if err := t.appender.Append(context.Background(), t.labels, []*pyroscope.RawSample{{RawProfile: b}}); err != nil {
+	if err := t.appender.Append(context.Background(), t.privateLabels, []*pyroscope.RawSample{{RawProfile: b}}); err != nil {
 		level.Error(t.logger).Log("msg", "push failed", "labels", t.Labels().String(), "err", err)
 		t.updateTargetStatus(start, err)
 		return
@@ -262,7 +262,7 @@ func (t *scrapeLoop) updateTargetStatus(start time.Time, err error) {
 
 func (t *scrapeLoop) fetchProfile(ctx context.Context, profileType string, buf io.Writer) error {
 	if t.req == nil {
-		req, err := http.NewRequest("GET", t.URL().String(), nil)
+		req, err := http.NewRequest("GET", t.URL(), nil)
 		if err != nil {
 			return err
 		}

component/pyroscope/scrape/scrape_loop_test.go

@@ -10,6 +10,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-kit/log"
 	"github.com/grafana/agent/component/discovery"
 	"github.com/grafana/agent/component/pyroscope"
 	"github.com/grafana/agent/pkg/util"
@@ -202,3 +203,49 @@ func TestScrapeLoop(t *testing.T) {
 	require.WithinDuration(t, time.Now(), loop.LastScrape(), 1*time.Second)
 	require.NotEmpty(t, loop.LastScrapeDuration())
 }
+
+func BenchmarkSync(b *testing.B) {
+	args := NewDefaultArguments()
+	args.Targets = []discovery.Target{}
+
+	p, err := newScrapePool(args, pyroscope.AppendableFunc(
+		func(ctx context.Context, labels labels.Labels, samples []*pyroscope.RawSample) error {
+			return nil
+		}),
+		log.NewNopLogger())
+	require.NoError(b, err)
+	groups1 := []*targetgroup.Group{
+		{
+			Targets: []model.LabelSet{
+				{model.AddressLabel: "localhost:9090", serviceNameLabel: "s"},
+				{model.AddressLabel: "localhost:9091", serviceNameLabel: "s"},
+				{model.AddressLabel: "localhost:9092", serviceNameLabel: "s"},
+			},
+			Labels: model.LabelSet{"foo": "bar"},
+		},
+	}
+	groups2 := []*targetgroup.Group{
+		{
+			Targets: []model.LabelSet{
+				{model.AddressLabel: "localhost:9090", serviceNameLabel: "s"},
+				{model.AddressLabel: "localhost:9091", serviceNameLabel: "s"},
+				{model.AddressLabel: "localhost:9092", serviceNameLabel: "s"},
+				{model.AddressLabel: "localhost:9093", serviceNameLabel: "s"},
+				{model.AddressLabel: "localhost:9094", serviceNameLabel: "s"},
+				{model.AddressLabel: "localhost:9095", serviceNameLabel: "s"},
+			},
+			Labels: model.LabelSet{"foo": "bar"},
+		},
+	}
+
+	defer p.stop()
+
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	for n := 0; n < b.N; n++ {
+		p.sync(groups1)
+		p.sync(groups2)
+		p.sync([]*targetgroup.Group{})
+	}
+}

component/pyroscope/scrape/target.go

@@ -45,10 +45,13 @@ const (
 type Target struct {
 	// Labels before any processing.
 	discoveredLabels labels.Labels
-	// Any labels that are added to this target and its metrics.
-	labels labels.Labels
+	// Any privateLabels that are added to this target and its metrics.
+	privateLabels labels.Labels
+	labels        labels.Labels
 	// Additional URL parameters that are part of the target URL.
 	params url.Values
+	hash   uint64
+	url    string
 
 	mtx                sync.RWMutex
 	lastError          error
@@ -58,25 +61,65 @@ type Target struct {
 }
 
 // NewTarget creates a reasonably configured target for querying.
-func NewTarget(labels, discoveredLabels labels.Labels, params url.Values) *Target {
+func NewTarget(lbls, discoveredLabels labels.Labels, params url.Values) *Target {
+	publicLabels := make(labels.Labels, 0, len(lbls))
+	for _, l := range lbls {
+		if !strings.HasPrefix(l.Name, model.ReservedLabelPrefix) {
+			publicLabels = append(publicLabels, l)
+		}
+	}
+	url := URLFromTarget(lbls, params)
+
+	h := fnv.New64a()
+	_, _ = h.Write([]byte(fmt.Sprintf("%016d", publicLabels.Hash())))
+	_, _ = h.Write([]byte(url))
+
 	return &Target{
-		labels:           labels,
+		privateLabels:    lbls,
+		url:              url,
+		hash:             h.Sum64(),
+		labels:           publicLabels,
 		discoveredLabels: discoveredLabels,
 		params:           params,
 		health:           HealthUnknown,
 	}
 }
 
+func URLFromTarget(lbls labels.Labels, params url.Values) string {
+	newParams := url.Values{}
+
+	for k, v := range params {
+		newParams[k] = make([]string, len(v))
+		copy(newParams[k], v)
+	}
+	for _, l := range lbls {
+		if !strings.HasPrefix(l.Name, model.ParamLabelPrefix) {
+			continue
+		}
+		ks := l.Name[len(model.ParamLabelPrefix):]
+
+		if len(newParams[ks]) > 0 {
+			newParams[ks][0] = l.Value
+		} else {
+			newParams[ks] = []string{l.Value}
+		}
+	}
+
+	return (&url.URL{
+		Scheme:   lbls.Get(model.SchemeLabel),
+		Host:     lbls.Get(model.AddressLabel),
+		Path:     lbls.Get(ProfilePath),
+		RawQuery: newParams.Encode(),
+	}).String()
+}
+
 func (t *Target) String() string {
-	return t.URL().String()
+	return t.URL()
 }
 
 // hash returns an identifying hash for the target.
-func (t *Target) hash() uint64 {
-	h := fnv.New64a()
-	_, _ = h.Write([]byte(fmt.Sprintf("%016d", t.Labels().Hash())))
-	_, _ = h.Write([]byte(t.URL().String()))
-	return h.Sum64()
+func (t *Target) Hash() uint64 {
+	return t.hash
 }
 
 // offset returns the time until the next scrape cycle for the target.
@@ -85,7 +128,7 @@ func (t *Target) offset(interval time.Duration) time.Duration {
 
 	var (
 		base   = now % int64(interval)
-		offset = t.hash() % uint64(interval)
+		offset = t.hash % uint64(interval)
 		next   = base + int64(offset)
 	)
 
@@ -107,13 +150,7 @@ func (t *Target) Params() url.Values {
 
 // Labels returns a copy of the set of all public labels of the target.
 func (t *Target) Labels() labels.Labels {
-	lset := make(labels.Labels, 0, len(t.labels))
-	for _, l := range t.labels {
-		if !strings.HasPrefix(l.Name, model.ReservedLabelPrefix) {
-			lset = append(lset, l)
-		}
-	}
-	return lset
+	return t.labels
 }
 
 // DiscoveredLabels returns a copy of the target's labels before any processing.
@@ -142,32 +179,8 @@ func (t *Target) SetDiscoveredLabels(l labels.Labels) {
 }
 
 // URL returns a copy of the target's URL.
-func (t *Target) URL() *url.URL {
-	params := url.Values{}
-
-	for k, v := range t.params {
-		params[k] = make([]string, len(v))
-		copy(params[k], v)
-	}
-	for _, l := range t.labels {
-		if !strings.HasPrefix(l.Name, model.ParamLabelPrefix) {
-			continue
-		}
-		ks := l.Name[len(model.ParamLabelPrefix):]
-
-		if len(params[ks]) > 0 {
-			params[ks][0] = l.Value
-		} else {
-			params[ks] = []string{l.Value}
-		}
-	}
-
-	return &url.URL{
-		Scheme:   t.labels.Get(model.SchemeLabel),
-		Host:     t.labels.Get(model.AddressLabel),
-		Path:     t.labels.Get(ProfilePath),
-		RawQuery: params.Encode(),
-	}
+func (t *Target) URL() string {
+	return t.url
 }
 
 // LastError returns the error encountered during the last scrape.
@@ -226,7 +239,7 @@ func LabelsByProfiles(lset labels.Labels, c *ProfilingConfig) []labels.Labels {
 type Targets []*Target
 
 func (ts Targets) Len() int           { return len(ts) }
-func (ts Targets) Less(i, j int) bool { return ts[i].URL().String() < ts[j].URL().String() }
+func (ts Targets) Less(i, j int) bool { return ts[i].URL() < ts[j].URL() }
 func (ts Targets) Swap(i, j int)      { ts[i], ts[j] = ts[j], ts[i] }
 
 const (
@@ -334,7 +347,7 @@ func populateLabels(lset labels.Labels, cfg Arguments) (res, orig labels.Labels,
 }
 
 // targetsFromGroup builds targets based on the given TargetGroup and config.
-func targetsFromGroup(group *targetgroup.Group, cfg Arguments) ([]*Target, []*Target, error) {
+func targetsFromGroup(group *targetgroup.Group, cfg Arguments, targetTypes map[string]ProfilingTarget) ([]*Target, []*Target, error) {
 	var (
 		targets        = make([]*Target, 0, len(group.Targets))
 		droppedTargets = make([]*Target, 0, len(group.Targets))
@@ -391,7 +404,7 @@ func targetsFromGroup(group *targetgroup.Group, cfg Arguments) ([]*Target, []*Ta
 					params = url.Values{}
 				}
 
-				if pcfg, found := cfg.ProfilingConfig.AllTargets()[profType]; found && pcfg.Delta {
+				if pcfg, found := targetTypes[profType]; found && pcfg.Delta {
 					params.Add("seconds", strconv.Itoa(int((cfg.ScrapeInterval)/time.Second)-1))
 				}
 				targets = append(targets, NewTarget(lbls, origLabels, params))