From 37320343c698d9d859fb8c89cc70e0209420df30 Mon Sep 17 00:00:00 2001 From: Adam Boguszewski Date: Mon, 14 Nov 2022 11:48:38 +0100 Subject: [PATCH 1/2] fix: fix port feature gate's description --- .chloggen/apache-port-fix-feature-game.yaml | 16 ++++++++++++++++ receiver/apachereceiver/scraper.go | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 .chloggen/apache-port-fix-feature-game.yaml diff --git a/.chloggen/apache-port-fix-feature-game.yaml b/.chloggen/apache-port-fix-feature-game.yaml new file mode 100644 index 000000000000..19b8b186d9ea --- /dev/null +++ b/.chloggen/apache-port-fix-feature-game.yaml @@ -0,0 +1,16 @@ +# 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: apachereceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: fix description of feature gate receiver.apache.emitPortAsResourceAttribute + +# One or more tracking issues related to the change +issues: [14971] + +# (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/scraper.go b/receiver/apachereceiver/scraper.go index a983afefdabd..c3676800a2c2 100644 --- a/receiver/apachereceiver/scraper.go +++ b/receiver/apachereceiver/scraper.go @@ -49,7 +49,7 @@ func init() { featuregate.GetRegistry().MustRegisterID( EmitPortAsResourceAttribute, featuregate.StageAlpha, - featuregate.WithRegisterDescription("When enabled, the port of the server will be sent as an apache.server.name resource attribute."), + featuregate.WithRegisterDescription("When enabled, the port of the server will be sent as an apache.server.port resource attribute."), ) } From 41e8122c3e9cd6d5ab079addc1946d061caf9844 Mon Sep 17 00:00:00 2001 From: Adam Boguszewski Date: Tue, 15 Nov 2022 08:25:12 +0100 Subject: [PATCH 2/2] remove changelog --- .chloggen/apache-port-fix-feature-game.yaml | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 .chloggen/apache-port-fix-feature-game.yaml diff --git a/.chloggen/apache-port-fix-feature-game.yaml b/.chloggen/apache-port-fix-feature-game.yaml deleted file mode 100644 index 19b8b186d9ea..000000000000 --- a/.chloggen/apache-port-fix-feature-game.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: apachereceiver - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: fix description of feature gate receiver.apache.emitPortAsResourceAttribute - -# One or more tracking issues related to the change -issues: [14971] - -# (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: