Pyroscope: Remove "phlare" from variable, types, strings etc (grafana#75140)

Author: aocenas

.github/commands.json

@@ -149,7 +149,7 @@
   },
   {
     "type":"label",
-    "name":"datasource/Phlare",
+    "name":"datasource/grafana-pyroscope",
     "action":"addToProject",
     "addToProject":{
       "url":"https://github.com/orgs/grafana/projects/221"

packages/grafana-schema/src/raw/composable/grafanapyroscope/dataquery/x/GrafanaPyroscopeDataQuery_types.gen.ts

@@ -13,9 +13,9 @@ import * as common from '@grafana/schema';
 
 export const pluginVersion = "10.2.0-pre";
 
-export type PhlareQueryType = ('metrics' | 'profile' | 'both');
+export type PyroscopeQueryType = ('metrics' | 'profile' | 'both');
 
-export const defaultPhlareQueryType: PhlareQueryType = 'both';
+export const defaultPyroscopeQueryType: PyroscopeQueryType = 'both';
 
 export interface GrafanaPyroscopeDataQuery extends common.DataQuery {
   /**

pkg/services/pluginsintegration/plugins_integration_test.go

@@ -95,9 +95,9 @@ func TestIntegrationPluginManager(t *testing.T) {
 	ms := mssql.ProvideService(cfg)
 	sv2 := searchV2.ProvideService(cfg, db.InitTestDB(t), nil, nil, tracer, features, nil, nil, nil)
 	graf := grafanads.ProvideService(sv2, nil)
-	phlare := pyroscope.ProvideService(hcp, acimpl.ProvideAccessControl(cfg))
+	pyroscope := pyroscope.ProvideService(hcp, acimpl.ProvideAccessControl(cfg))
 	parca := parca.ProvideService(hcp)
-	coreRegistry := coreplugin.ProvideCoreRegistry(am, cw, cm, es, grap, idb, lk, otsdb, pr, tmpo, td, pg, my, ms, graf, phlare, parca)
+	coreRegistry := coreplugin.ProvideCoreRegistry(am, cw, cm, es, grap, idb, lk, otsdb, pr, tmpo, td, pg, my, ms, graf, pyroscope, parca)
 
 	testCtx := CreateIntegrationTestCtx(t, cfg, coreRegistry)
 

pkg/tsdb/grafana-pyroscope-datasource/instance.go

@@ -1,4 +1,4 @@
-package phlare
+package pyroscope
 
 import (
 	"context"
@@ -16,10 +16,10 @@ import (
 )
 
 var (
-	_ backend.QueryDataHandler    = (*PhlareDatasource)(nil)
-	_ backend.CallResourceHandler = (*PhlareDatasource)(nil)
-	_ backend.CheckHealthHandler  = (*PhlareDatasource)(nil)
-	_ backend.StreamHandler       = (*PhlareDatasource)(nil)
+	_ backend.QueryDataHandler    = (*PyroscopeDatasource)(nil)
+	_ backend.CallResourceHandler = (*PyroscopeDatasource)(nil)
+	_ backend.CheckHealthHandler  = (*PyroscopeDatasource)(nil)
+	_ backend.StreamHandler       = (*PyroscopeDatasource)(nil)
 )
 
 type ProfilingClient interface {
@@ -30,16 +30,16 @@ type ProfilingClient interface {
 	GetProfile(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, maxNodes *int64) (*ProfileResponse, error)
 }
 
-// PhlareDatasource is a datasource for querying application performance profiles.
-type PhlareDatasource struct {
+// PyroscopeDatasource is a datasource for querying application performance profiles.
+type PyroscopeDatasource struct {
 	httpClient *http.Client
 	client     ProfilingClient
 	settings   backend.DataSourceInstanceSettings
 	ac         accesscontrol.AccessControl
 }
 
-// NewPhlareDatasource creates a new datasource instance.
-func NewPhlareDatasource(httpClientProvider httpclient.Provider, settings backend.DataSourceInstanceSettings, ac accesscontrol.AccessControl) (instancemgmt.Instance, error) {
+// NewPyroscopeDatasource creates a new datasource instance.
+func NewPyroscopeDatasource(httpClientProvider httpclient.Provider, settings backend.DataSourceInstanceSettings, ac accesscontrol.AccessControl) (instancemgmt.Instance, error) {
 	opt, err := settings.HTTPClientOptions()
 	if err != nil {
 		return nil, err
@@ -49,15 +49,15 @@ func NewPhlareDatasource(httpClientProvider httpclient.Provider, settings backen
 		return nil, err
 	}
 
-	return &PhlareDatasource{
+	return &PyroscopeDatasource{
 		httpClient: httpClient,
-		client:     NewPhlareClient(httpClient, settings.URL),
+		client:     NewPyroscopeClient(httpClient, settings.URL),
 		settings:   settings,
 		ac:         ac,
 	}, nil
 }
 
-func (d *PhlareDatasource) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+func (d *PyroscopeDatasource) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
 	logger.Debug("CallResource", "Path", req.Path, "Method", req.Method, "Body", req.Body)
 	if req.Path == "profileTypes" {
 		return d.profileTypes(ctx, req, sender)
@@ -73,7 +73,7 @@ func (d *PhlareDatasource) CallResource(ctx context.Context, req *backend.CallRe
 	})
 }
 
-func (d *PhlareDatasource) profileTypes(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+func (d *PyroscopeDatasource) profileTypes(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
 	types, err := d.client.ProfileTypes(ctx)
 	if err != nil {
 		return err
@@ -89,7 +89,7 @@ func (d *PhlareDatasource) profileTypes(ctx context.Context, req *backend.CallRe
 	return nil
 }
 
-func (d *PhlareDatasource) labelNames(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+func (d *PyroscopeDatasource) labelNames(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
 	res, err := d.client.LabelNames(ctx)
 	if err != nil {
 		return fmt.Errorf("error calling LabelNames: %v", err)
@@ -112,7 +112,7 @@ type LabelValuesPayload struct {
 	End   int64
 }
 
-func (d *PhlareDatasource) labelValues(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
+func (d *PyroscopeDatasource) labelValues(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
 	u, err := url.Parse(req.URL)
 	if err != nil {
 		return err
@@ -138,7 +138,7 @@ func (d *PhlareDatasource) labelValues(ctx context.Context, req *backend.CallRes
 // req contains the queries []DataQuery (where each query contains RefID as a unique identifier).
 // The QueryDataResponse contains a map of RefID to the response for each query, and each response
 // contains Frames ([]*Frame).
-func (d *PhlareDatasource) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+func (d *PyroscopeDatasource) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
 	logger.Debug("QueryData called", "Queries", req.Queries)
 
 	// create response struct
@@ -160,7 +160,7 @@ func (d *PhlareDatasource) QueryData(ctx context.Context, req *backend.QueryData
 // The main use case for these health checks is the test button on the
 // datasource configuration page which allows users to verify that
 // a datasource is working as expected.
-func (d *PhlareDatasource) CheckHealth(ctx context.Context, _ *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
+func (d *PyroscopeDatasource) CheckHealth(ctx context.Context, _ *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
 	logger.Debug("CheckHealth called")
 
 	status := backend.HealthStatusOk
@@ -179,7 +179,7 @@ func (d *PhlareDatasource) CheckHealth(ctx context.Context, _ *backend.CheckHeal
 
 // SubscribeStream is called when a client wants to connect to a stream. This callback
 // allows sending the first message.
-func (d *PhlareDatasource) SubscribeStream(_ context.Context, req *backend.SubscribeStreamRequest) (*backend.SubscribeStreamResponse, error) {
+func (d *PyroscopeDatasource) SubscribeStream(_ context.Context, req *backend.SubscribeStreamRequest) (*backend.SubscribeStreamResponse, error) {
 	logger.Debug("SubscribeStream called")
 
 	status := backend.SubscribeStreamStatusPermissionDenied
@@ -194,7 +194,7 @@ func (d *PhlareDatasource) SubscribeStream(_ context.Context, req *backend.Subsc
 
 // RunStream is called once for any open channel.  Results are shared with everyone
 // subscribed to the same channel.
-func (d *PhlareDatasource) RunStream(ctx context.Context, req *backend.RunStreamRequest, sender *backend.StreamSender) error {
+func (d *PyroscopeDatasource) RunStream(ctx context.Context, req *backend.RunStreamRequest, sender *backend.StreamSender) error {
 	logger.Debug("RunStream called")
 
 	// Create the same data frame as for query data.
@@ -231,7 +231,7 @@ func (d *PhlareDatasource) RunStream(ctx context.Context, req *backend.RunStream
 }
 
 // PublishStream is called when a client sends a message to the stream.
-func (d *PhlareDatasource) PublishStream(_ context.Context, _ *backend.PublishStreamRequest) (*backend.PublishStreamResponse, error) {
+func (d *PyroscopeDatasource) PublishStream(_ context.Context, _ *backend.PublishStreamRequest) (*backend.PublishStreamResponse, error) {
 	logger.Debug("PublishStream called")
 
 	// Do not allow publishing at all.

pkg/tsdb/grafana-pyroscope-datasource/instance_test.go

@@ -1,4 +1,4 @@
-package phlare
+package pyroscope
 
 import (
 	"context"
@@ -10,7 +10,7 @@ import (
 
 // This is where the tests for the datasource backend live.
 func Test_QueryData(t *testing.T) {
-	ds := PhlareDatasource{}
+	ds := PyroscopeDatasource{}
 
 	resp, err := ds.QueryData(
 		context.Background(),
@@ -30,7 +30,7 @@ func Test_QueryData(t *testing.T) {
 }
 
 func Test_CallResource(t *testing.T) {
-	ds := &PhlareDatasource{
+	ds := &PyroscopeDatasource{
 		client: &FakeClient{},
 	}
 

pkg/tsdb/grafana-pyroscope-datasource/kinds/dataquery/types_dataquery_gen.go

@@ -1,4 +1,4 @@
-package phlare
+package pyroscope
 
 import (
 	"context"
@@ -54,17 +54,17 @@ type SeriesResponse struct {
 	Label  string
 }
 
-type PhlareClient struct {
+type PyroscopeClient struct {
 	connectClient querierv1connect.QuerierServiceClient
 }
 
-func NewPhlareClient(httpClient *http.Client, url string) *PhlareClient {
-	return &PhlareClient{
+func NewPyroscopeClient(httpClient *http.Client, url string) *PyroscopeClient {
+	return &PyroscopeClient{
 		connectClient: querierv1connect.NewQuerierServiceClient(httpClient, url),
 	}
 }
 
-func (c *PhlareClient) ProfileTypes(ctx context.Context) ([]*ProfileType, error) {
+func (c *PyroscopeClient) ProfileTypes(ctx context.Context) ([]*ProfileType, error) {
 	res, err := c.connectClient.ProfileTypes(ctx, connect.NewRequest(&querierv1.ProfileTypesRequest{}))
 	if err != nil {
 		return nil, err
@@ -84,7 +84,7 @@ func (c *PhlareClient) ProfileTypes(ctx context.Context) ([]*ProfileType, error)
 	}
 }
 
-func (c *PhlareClient) GetSeries(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, groupBy []string, step float64) (*SeriesResponse, error) {
+func (c *PyroscopeClient) GetSeries(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, groupBy []string, step float64) (*SeriesResponse, error) {
 	req := connect.NewRequest(&querierv1.SelectSeriesRequest{
 		ProfileTypeID: profileTypeID,
 		LabelSelector: labelSelector,
@@ -133,7 +133,7 @@ func (c *PhlareClient) GetSeries(ctx context.Context, profileTypeID string, labe
 	}, nil
 }
 
-func (c *PhlareClient) GetProfile(ctx context.Context, profileTypeID, labelSelector string, start, end int64, maxNodes *int64) (*ProfileResponse, error) {
+func (c *PyroscopeClient) GetProfile(ctx context.Context, profileTypeID, labelSelector string, start, end int64, maxNodes *int64) (*ProfileResponse, error) {
 	req := &connect.Request[querierv1.SelectMergeStacktracesRequest]{
 		Msg: &querierv1.SelectMergeStacktracesRequest{
 			ProfileTypeID: profileTypeID,
@@ -179,7 +179,7 @@ func getUnits(profileTypeID string) string {
 	return unit
 }
 
-func (c *PhlareClient) LabelNames(ctx context.Context) ([]string, error) {
+func (c *PyroscopeClient) LabelNames(ctx context.Context) ([]string, error) {
 	resp, err := c.connectClient.LabelNames(ctx, connect.NewRequest(&querierv1.LabelNamesRequest{}))
 	if err != nil {
 		return nil, fmt.Errorf("error seding LabelNames request %v", err)
@@ -195,7 +195,7 @@ func (c *PhlareClient) LabelNames(ctx context.Context) ([]string, error) {
 	return filtered, nil
 }
 
-func (c *PhlareClient) LabelValues(ctx context.Context, label string) ([]string, error) {
+func (c *PyroscopeClient) LabelValues(ctx context.Context, label string) ([]string, error) {
 	resp, err := c.connectClient.LabelValues(ctx, connect.NewRequest(&querierv1.LabelValuesRequest{Name: label}))
 	if err != nil {
 		return nil, err

pkg/tsdb/grafana-pyroscope-datasource/phlareClient.go pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient.go

@@ -1,4 +1,4 @@
-package phlare
+package pyroscope
 
 import (
 	"context"
@@ -11,9 +11,9 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func Test_PhlareClient(t *testing.T) {
-	connectClient := &FakePhlareConnectClient{}
-	client := &PhlareClient{
+func Test_PyroscopeClient(t *testing.T) {
+	connectClient := &FakePyroscopeConnectClient{}
+	client := &PyroscopeClient{
 		connectClient: connectClient,
 	}
 
@@ -53,27 +53,27 @@ func Test_PhlareClient(t *testing.T) {
 	})
 }
 
-type FakePhlareConnectClient struct {
+type FakePyroscopeConnectClient struct {
 	Req any
 }
 
-func (f *FakePhlareConnectClient) ProfileTypes(ctx context.Context, c *connect.Request[querierv1.ProfileTypesRequest]) (*connect.Response[querierv1.ProfileTypesResponse], error) {
+func (f *FakePyroscopeConnectClient) ProfileTypes(ctx context.Context, c *connect.Request[querierv1.ProfileTypesRequest]) (*connect.Response[querierv1.ProfileTypesResponse], error) {
 	panic("implement me")
 }
 
-func (f *FakePhlareConnectClient) LabelValues(ctx context.Context, c *connect.Request[querierv1.LabelValuesRequest]) (*connect.Response[querierv1.LabelValuesResponse], error) {
+func (f *FakePyroscopeConnectClient) LabelValues(ctx context.Context, c *connect.Request[querierv1.LabelValuesRequest]) (*connect.Response[querierv1.LabelValuesResponse], error) {
 	panic("implement me")
 }
 
-func (f *FakePhlareConnectClient) LabelNames(context.Context, *connect.Request[querierv1.LabelNamesRequest]) (*connect.Response[querierv1.LabelNamesResponse], error) {
+func (f *FakePyroscopeConnectClient) LabelNames(context.Context, *connect.Request[querierv1.LabelNamesRequest]) (*connect.Response[querierv1.LabelNamesResponse], error) {
 	panic("implement me")
 }
 
-func (f *FakePhlareConnectClient) Series(ctx context.Context, c *connect.Request[querierv1.SeriesRequest]) (*connect.Response[querierv1.SeriesResponse], error) {
+func (f *FakePyroscopeConnectClient) Series(ctx context.Context, c *connect.Request[querierv1.SeriesRequest]) (*connect.Response[querierv1.SeriesResponse], error) {
 	panic("implement me")
 }
 
-func (f *FakePhlareConnectClient) SelectMergeStacktraces(ctx context.Context, c *connect.Request[querierv1.SelectMergeStacktracesRequest]) (*connect.Response[querierv1.SelectMergeStacktracesResponse], error) {
+func (f *FakePyroscopeConnectClient) SelectMergeStacktraces(ctx context.Context, c *connect.Request[querierv1.SelectMergeStacktracesRequest]) (*connect.Response[querierv1.SelectMergeStacktracesResponse], error) {
 	f.Req = c
 	return &connect.Response[querierv1.SelectMergeStacktracesResponse]{
 		Msg: &querierv1.SelectMergeStacktracesResponse{
@@ -91,7 +91,7 @@ func (f *FakePhlareConnectClient) SelectMergeStacktraces(ctx context.Context, c
 	}, nil
 }
 
-func (f *FakePhlareConnectClient) SelectSeries(ctx context.Context, req *connect.Request[querierv1.SelectSeriesRequest]) (*connect.Response[querierv1.SelectSeriesResponse], error) {
+func (f *FakePyroscopeConnectClient) SelectSeries(ctx context.Context, req *connect.Request[querierv1.SelectSeriesRequest]) (*connect.Response[querierv1.SelectSeriesResponse], error) {
 	f.Req = req
 	return &connect.Response[querierv1.SelectSeriesResponse]{
 		Msg: &querierv1.SelectSeriesResponse{
@@ -105,6 +105,6 @@ func (f *FakePhlareConnectClient) SelectSeries(ctx context.Context, req *connect
 	}, nil
 }
 
-func (f *FakePhlareConnectClient) SelectMergeProfile(ctx context.Context, c *connect.Request[querierv1.SelectMergeProfileRequest]) (*connect.Response[googlev1.Profile], error) {
+func (f *FakePyroscopeConnectClient) SelectMergeProfile(ctx context.Context, c *connect.Request[querierv1.SelectMergeProfileRequest]) (*connect.Response[googlev1.Profile], error) {
 	panic("implement me")
 }

pkg/tsdb/grafana-pyroscope-datasource/phlareClient_test.go pkg/tsdb/grafana-pyroscope-datasource/pyroscopeClient_test.go

@@ -1,4 +1,4 @@
-package phlare
+package pyroscope
 
 import (
 	"context"
@@ -27,13 +27,13 @@ type dsJsonModel struct {
 }
 
 const (
-	queryTypeProfile = string(dataquery.PhlareQueryTypeProfile)
-	queryTypeMetrics = string(dataquery.PhlareQueryTypeMetrics)
-	queryTypeBoth    = string(dataquery.PhlareQueryTypeBoth)
+	queryTypeProfile = string(dataquery.PyroscopeQueryTypeProfile)
+	queryTypeMetrics = string(dataquery.PyroscopeQueryTypeMetrics)
+	queryTypeBoth    = string(dataquery.PyroscopeQueryTypeBoth)
 )
 
-// query processes single Phlare query transforming the response to data.Frame packaged in DataResponse
-func (d *PhlareDatasource) query(ctx context.Context, pCtx backend.PluginContext, query backend.DataQuery) backend.DataResponse {
+// query processes single Pyroscope query transforming the response to data.Frame packaged in DataResponse
+func (d *PyroscopeDatasource) query(ctx context.Context, pCtx backend.PluginContext, query backend.DataQuery) backend.DataResponse {
 	var qm queryModel
 	response := backend.DataResponse{}
 
@@ -118,7 +118,7 @@ func (d *PhlareDatasource) query(ctx context.Context, pCtx backend.PluginContext
 	return response
 }
 
-// responseToDataFrames turns Phlare response to data.Frame. We encode the data into a nested set format where we have
+// responseToDataFrames turns Pyroscope response to data.Frame. We encode the data into a nested set format where we have
 // [level, value, label] columns and by ordering the items in a depth first traversal order we can recreate the whole
 // tree back.
 func responseToDataFrames(resp *ProfileResponse) *data.Frame {
@@ -151,7 +151,7 @@ type ProfileTree struct {
 }
 
 // levelsToTree converts flamebearer format into a tree. This is needed to then convert it into nested set format
-// dataframe. This should be temporary, and ideally we should get some sort of tree struct directly from Phlare API.
+// dataframe. This should be temporary, and ideally we should get some sort of tree struct directly from Pyroscope API.
 func levelsToTree(levels []*Level, names []string) *ProfileTree {
 	if len(levels) == 0 {
 		return nil