From eb3b9d7b451baa51273c0ddae7c53b3cae247512 Mon Sep 17 00:00:00 2001 From: Husni Alhamdani Date: Wed, 8 Nov 2023 15:33:33 -0600 Subject: [PATCH 1/3] feat: add default appProtocol on oc receiver Signed-off-by: Husni Alhamdani --- .chloggen/main.yaml | 16 ++++++++++++++++ .../collector/parser/receiver/receiver_oc.go | 12 +++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) create mode 100755 .chloggen/main.yaml diff --git a/.chloggen/main.yaml b/.chloggen/main.yaml new file mode 100755 index 0000000000..ad69da7426 --- /dev/null +++ b/.chloggen/main.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. operator, target allocator, github action) +component: operator + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: add missing appProtocol in opencensus receiver + +# One or more tracking issues related to the change +issues: [] + +# (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/internal/manifests/collector/parser/receiver/receiver_oc.go b/internal/manifests/collector/parser/receiver/receiver_oc.go index 3463a8d398..5aacee89e7 100644 --- a/internal/manifests/collector/parser/receiver/receiver_oc.go +++ b/internal/manifests/collector/parser/receiver/receiver_oc.go @@ -24,12 +24,14 @@ const parserNameOpenCensus = "__opencensus" // NewOpenCensusReceiverParser builds a new parser for OpenCensus receivers. func NewOpenCensusReceiverParser(logger logr.Logger, name string, config map[interface{}]interface{}) parser.ComponentPortParser { + http := "http" return &GenericReceiver{ - logger: logger, - name: name, - config: config, - defaultPort: 55678, - parserName: parserNameOpenCensus, + logger: logger, + name: name, + config: config, + defaultPort: 55678, + parserName: parserNameOpenCensus, + defaultAppProtocol: &http, } } From da9cd16325b7f949e8494ec41337b33ed2b29c3e Mon Sep 17 00:00:00 2001 From: Husni Alhamdani Date: Thu, 4 Jan 2024 13:04:32 +0100 Subject: [PATCH 2/3] feat: add default appProtocol on oc receiver Signed-off-by: Husni Alhamdani --- .chloggen/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.chloggen/main.yaml b/.chloggen/main.yaml index ad69da7426..599e09a1d7 100755 --- a/.chloggen/main.yaml +++ b/.chloggen/main.yaml @@ -8,7 +8,7 @@ component: operator note: add missing appProtocol in opencensus receiver # One or more tracking issues related to the change -issues: [] +issues: [2487] # (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. From c0eb80c45ccc22531084bb4d170a6837f4924497 Mon Sep 17 00:00:00 2001 From: Husni Alhamdani Date: Thu, 4 Jan 2024 14:57:03 +0100 Subject: [PATCH 3/3] feat: add default appProtocol on oc receiver Signed-off-by: Husni Alhamdani --- internal/manifests/collector/parser/receiver/receiver_oc.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/manifests/collector/parser/receiver/receiver_oc.go b/internal/manifests/collector/parser/receiver/receiver_oc.go index 5aacee89e7..6619439a82 100644 --- a/internal/manifests/collector/parser/receiver/receiver_oc.go +++ b/internal/manifests/collector/parser/receiver/receiver_oc.go @@ -24,14 +24,14 @@ const parserNameOpenCensus = "__opencensus" // NewOpenCensusReceiverParser builds a new parser for OpenCensus receivers. func NewOpenCensusReceiverParser(logger logr.Logger, name string, config map[interface{}]interface{}) parser.ComponentPortParser { - http := "http" + httpAppProtocol := "http" return &GenericReceiver{ logger: logger, name: name, config: config, defaultPort: 55678, parserName: parserNameOpenCensus, - defaultAppProtocol: &http, + defaultAppProtocol: &httpAppProtocol, } }