From 902350e94953e85c751566a1ac705d00154a2174 Mon Sep 17 00:00:00 2001
From: Sean Marciniak <30928402+MovieStoreGuy@users.noreply.github.com>
Date: Fri, 2 Jun 2023 16:54:56 +0930
Subject: [PATCH] Adding updates

---
 .../msg_add-scrape-interval-changelog.yaml    | 51 +++++++++++++++++++
 .../msg_revert-default-apache-receiver.yaml   | 20 ++++++++
 receiver/apachereceiver/factory.go            |  5 +-
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100755 .chloggen/msg_add-scrape-interval-changelog.yaml
 create mode 100755 .chloggen/msg_revert-default-apache-receiver.yaml

diff --git a/.chloggen/msg_add-scrape-interval-changelog.yaml b/.chloggen/msg_add-scrape-interval-changelog.yaml
new file mode 100755
index 000000000000..24a0dcaf5e3d
--- /dev/null
+++ b/.chloggen/msg_add-scrape-interval-changelog.yaml
@@ -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`
\ No newline at end of file
diff --git a/.chloggen/msg_revert-default-apache-receiver.yaml b/.chloggen/msg_revert-default-apache-receiver.yaml
new file mode 100755
index 000000000000..25c96857a886
--- /dev/null
+++ b/.chloggen/msg_revert-default-apache-receiver.yaml
@@ -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:
diff --git a/receiver/apachereceiver/factory.go b/receiver/apachereceiver/factory.go
index 41bdef1e73d6..7ab75a8f5c7d 100644
--- a/receiver/apachereceiver/factory.go
+++ b/receiver/apachereceiver/factory.go
@@ -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,