Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(pyroscope/scrape): remove unused path_prefix argument #6334

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

feat(pyroscope/scrape): remove unused path_prefix argument #6334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2e73ec4
feat(pyroscope/scrape): remove unused `path_prefix` argument
hainenber Feb 8, 2024
37b58dd
Merge branch 'main' into remove-unused-path-prefix-in-pyroscope-scrape
hainenber Feb 8, 2024
3c6e547
Merge branch 'main' into remove-unused-path-prefix-in-pyroscope-scrape
hainenber Feb 9, 2024
0ea7330
Merge branch 'main' into remove-unused-path-prefix-in-pyroscope-scrape
hainenber Feb 17, 2024
f760da7
chore(doc): remove duplicate CHANGELOG entry
hainenber Feb 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ Main (unreleased)

- `grafana-agent` and `grafana-agent-flow` fallback to default X.509 trusted root certificates
when the `GODEBUG=x509usefallbackroots=1` environment variable is set. (@hainenber)

- Remove unused `path_prefix` argument in `pyroscope.scrape` component. (@hainenber)

v0.39.2 (2024-1-31)
--------------------
Expand Down
2 changes: 0 additions & 2 deletions component/pyroscope/scrape/scrape.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ type ProfilingConfig struct {
GoDeltaProfMutex ProfilingTarget `river:"profile.godeltaprof_mutex,block,optional"`
GoDeltaProfBlock ProfilingTarget `river:"profile.godeltaprof_block,block,optional"`
Custom []CustomProfilingTarget `river:"profile.custom,block,optional"`

PprofPrefix string `river:"path_prefix,attr,optional"`
}

// AllTargets returns the set of all standard and custom profiling targets,
Expand Down
3 changes: 0 additions & 3 deletions component/pyroscope/scrape/scrape_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ func TestUnmarshalConfig(t *testing.T) {
]
forward_to = null
profiling_config {
path_prefix = "v1/"

profile.block {
enabled = false
}
Expand Down Expand Up @@ -138,7 +136,6 @@ func TestUnmarshalConfig(t *testing.T) {
Delta: true,
Name: "something",
})
r.ProfilingConfig.PprofPrefix = "v1/"
return r
},
},
Expand Down
11 changes: 0 additions & 11 deletions docs/sources/flow/reference/components/pyroscope.scrape.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,17 +233,6 @@ the defaults documented in [profile.mutex][] will be used.

{{< docs/shared lookup="flow/reference/components/tls-config-block.md" source="agent" version="<AGENT_VERSION>" >}}

### profiling_config block

The `profiling_config` block configures the profiling settings when scraping
targets.

The following arguments are supported:

Name | Type | Description | Default | Required
---- | ---- | ----------- | ------- | --------
`path_prefix` | `string` | The path prefix to use when scraping targets. | | no

### profile.memory block

The `profile.memory` block collects profiles on memory consumption.
Expand Down
Loading