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.

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

[chore] Updates to scrape duration #23030

Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
51 changes: 51 additions & 0 deletions .chloggen/msg_add-scrape-interval-changelog.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Use this changelog template to create an entry for release notes.
# If your change doesn't affect end users, such as a test fix or a tooling change,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: 'enhancement'

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: receivers

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Adding `initial_delay` to receivers to control when scraping interval starts

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [23030]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: |
The updated receivers are:
- `active_directory_ds`
- `aerospike`
- `apache`
- `apachespark`
- `azuremonitor`
- `couchdb`
- `docker_stats`
- `elasticsearch`
- `filestats`
- `flinkmetrics`
- `googlecloudspanner`
- `haproxy`
- `httpcheck`
- `iis`
- `memcached`
- `mongodb`
- `mysql`
- `nginx`
- `oracledb`
- `podman_stats`
- `postgresql`
- `rabbitmq`
- `riak`
- `snowflake`
- `sqlquery`
- `sqlserver`
- `sshcheck`
- `vcenter`
- `windowsperfcounters`
- `zookeeper`
20 changes: 20 additions & 0 deletions .chloggen/msg_revert-default-apache-receiver.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Use this changelog template to create an entry for release notes.
# If your change doesn't affect end users, such as a test fix or a tooling change,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: apache receiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: reverted default collection time back to 10s from 1m

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [23030]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps useful to add that the change was mistakenly added in v0.78.0?

5 changes: 4 additions & 1 deletion receiver/apachereceiver/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,11 @@ func NewFactory() receiver.Factory {
}

func createDefaultConfig() component.Config {
cfg := scraperhelper.NewDefaultScraperControllerSettings(metadata.Type)
cfg.CollectionInterval = 10 * time.Second

return &Config{
ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type),
ScraperControllerSettings: cfg,
HTTPClientSettings: confighttp.HTTPClientSettings{
Endpoint: defaultEndpoint,
Timeout: 10 * time.Second,
Expand Down