Add support for a supplemental YAML configuration for the CloudWatchAgent (#241)

Author: mitali-salvi

apis/v1alpha1/amazoncloudwatchagent_types.go

@@ -167,6 +167,9 @@ type AmazonCloudWatchAgentSpec struct {
 	// Config is the raw JSON to be used as the collector's configuration. Refer to the OpenTelemetry Collector documentation for details.
 	// +required
 	Config string `json:"config,omitempty"`
+	// Config is the raw YAML to be used as the collector's configuration. Refer to the OpenTelemetry Collector documentation for details.
+	// +optional
+	OtelConfig string `json:"otelConfig,omitempty"`
 	// VolumeMounts represents the mount points to use in the underlying collector deployment(s)
 	// +optional
 	// +listType=atomic

apis/v1alpha2/amazoncloudwatchagent_types.go

@@ -92,6 +92,9 @@ type AmazonCloudWatchAgentSpec struct {
 	// Config is the raw JSON to be used as the collector's configuration. Refer to the OpenTelemetry Collector documentation for details.
 	// +required
 	Config string `json:"config,omitempty"`
+	// Config is the raw YAML to be used as the collector's configuration. Refer to the OpenTelemetry Collector documentation for details.
+	// +optional
+	OtelConfig string `json:"otelConfig,omitempty"`
 	// VolumeMounts represents the mount points to use in the underlying collector deployment(s)
 	// +optional
 	// +listType=atomic

config/crd/bases/cloudwatch.aws.amazon.com_amazoncloudwatchagents.yaml

@@ -12,7 +12,8 @@ import (
 )
 
 const (
-	defaultCollectorConfigMapEntry = "cwagentconfig.json"
+	defaultCollectorConfigMapEntry     = "cwagentconfig.json"
+	defaultOtelCollectorConfigMapEntry = "cwagentotelconfig.yaml"
 )
 
 // Config holds the static configuration for this operator.
@@ -21,6 +22,7 @@ type Config struct {
 	autoInstrumentationPythonImage      string
 	collectorImage                      string
 	collectorConfigMapEntry             string
+	otelCollectorConfigMapEntry         string
 	autoInstrumentationDotNetImage      string
 	autoInstrumentationGoImage          string
 	autoInstrumentationApacheHttpdImage string
@@ -36,9 +38,10 @@ type Config struct {
 func New(opts ...Option) Config {
 	// initialize with the default values
 	o := options{
-		collectorConfigMapEntry: defaultCollectorConfigMapEntry,
-		logger:                  logf.Log.WithName("config"),
-		version:                 version.Get(),
+		collectorConfigMapEntry:     defaultCollectorConfigMapEntry,
+		otelCollectorConfigMapEntry: defaultOtelCollectorConfigMapEntry,
+		logger:                      logf.Log.WithName("config"),
+		version:                     version.Get(),
 	}
 	for _, opt := range opts {
 		opt(&o)
@@ -47,6 +50,7 @@ func New(opts ...Option) Config {
 	return Config{
 		collectorImage:                      o.collectorImage,
 		collectorConfigMapEntry:             o.collectorConfigMapEntry,
+		otelCollectorConfigMapEntry:         o.otelCollectorConfigMapEntry,
 		logger:                              o.logger,
 		autoInstrumentationJavaImage:        o.autoInstrumentationJavaImage,
 		autoInstrumentationNodeJSImage:      o.autoInstrumentationNodeJSImage,
@@ -66,11 +70,16 @@ func (c *Config) CollectorImage() string {
 	return c.collectorImage
 }
 
-// CollectorConfigMapEntry represents the configuration file name for the collector. Immutable.
+// CollectorConfigMapEntry represents the configuration JSON file name for the collector. Immutable.
 func (c *Config) CollectorConfigMapEntry() string {
 	return c.collectorConfigMapEntry
 }
 
+// OtelCollectorConfigMapEntry represents the configuration YAML file name for the collector. Immutable.
+func (c *Config) OtelCollectorConfigMapEntry() string {
+	return c.otelCollectorConfigMapEntry
+}
+
 // AutoInstrumentationJavaImage returns OpenTelemetry Java auto-instrumentation container image.
 func (c *Config) AutoInstrumentationJavaImage() string {
 	return c.autoInstrumentationJavaImage

config/crd/bases/cloudwatch.aws.amazon.com_dcgmexporters.yaml

@@ -15,10 +15,12 @@ func TestNewConfig(t *testing.T) {
 	// prepare
 	cfg := config.New(
 		config.WithCollectorImage("some-image"),
-		config.WithCollectorConfigMapEntry("some-config.yaml"),
+		config.WithCollectorConfigMapEntry("some-config.json"),
+		config.WithOtelCollectorConfigMapEntry("some-otel-config.yaml"),
 	)
 
 	// test
 	assert.Equal(t, "some-image", cfg.CollectorImage())
-	assert.Equal(t, "some-config.yaml", cfg.CollectorConfigMapEntry())
+	assert.Equal(t, "some-config.json", cfg.CollectorConfigMapEntry())
+	assert.Equal(t, "some-otel-config.yaml", cfg.OtelCollectorConfigMapEntry())
 }

config/crd/bases/cloudwatch.aws.amazon.com_instrumentations.yaml

@@ -27,6 +27,7 @@ type options struct {
 	autoInstrumentationNginxImage       string
 	collectorImage                      string
 	collectorConfigMapEntry             string
+	otelCollectorConfigMapEntry         string
 	dcgmExporterImage                   string
 	neuronMonitorImage                  string
 	labelsFilter                        []string
@@ -42,6 +43,11 @@ func WithCollectorConfigMapEntry(s string) Option {
 		o.collectorConfigMapEntry = s
 	}
 }
+func WithOtelCollectorConfigMapEntry(s string) Option {
+	return func(o *options) {
+		o.otelCollectorConfigMapEntry = s
+	}
+}
 func WithLogger(logger logr.Logger) Option {
 	return func(o *options) {
 		o.logger = logger