[exporter/awsemfexporter] add tags feature for Cloudwatch Log Group

.chloggen/add-tags-log-group.yaml

@@ -0,0 +1,16 @@
+# 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: awsemfexporter
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Added a `tags` field to the config of the exporter to set tags for a Cloudwatch Log Group
+
+# One or more tracking issues related to the change
+issues: [19406]
+
+# (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:

exporter/awscloudwatchlogsexporter/README.md

@@ -24,6 +24,7 @@ The following settings can be optionally configured:
 - `region`: The AWS region where the log stream is in.
 - `endpoint`: The CloudWatch Logs service endpoint which the requests are forwarded to. [See the CloudWatch Logs endpoints](https://docs.aws.amazon.com/general/latest/gr/cwl_region.html) for a list.
 - `log_retention`: LogRetention is the option to set the log retention policy for only newly created CloudWatch Log Groups. Defaults to Never Expire if not specified or set to 0. Possible values for retention in days are 1, 3, 5, 7, 14, 30, 60, 90, 120, 150, 180, 365, 400, 545, 731, 1827, 2192, 2557, 2922, 3288, or 3653. 
+- `tags`: Tags is the option to set tags for the CloudWatch Log Group. If specified, please add at most 50 tags. Input is a string to string map like so: { 'key': 'value' }. Keys must be between 1-128 characters and follow the regex pattern: `^([\p{L}\p{Z}\p{N}_.:/=+\-@]+)$`. Values must be between 1-256 characters and follow the regex pattern: `^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$`.
 - `role_arn`: The AWS IAM role to upload segments to a same/different account
 - `raw_log`: Boolean default false. If you want to export only the log message to cw logs. This is required for emf logs. 
 
@@ -49,6 +50,7 @@ exporters:
  role_arn: "arn:aws:iam::123456789:role/monitoring-application-logs"
  endpoint: "logs.us-east-1.amazonaws.com"
  log_retention: 365
+ tags: { 'sampleKey': 'sampleValue'}
  sending_queue:
  queue_size: 50
  retry_on_failure:

exporter/awscloudwatchlogsexporter/config.go

@@ -22,6 +22,7 @@ import (
  "go.uber.org/zap"
 
  "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil"
+ "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs"
 )
 
 // Config represent a configuration for the CloudWatch logs exporter.
@@ -46,6 +47,11 @@ type Config struct {
  // Possible values are 1, 3, 5, 7, 14, 30, 60, 90, 120, 150, 180, 365, 400, 545, 731, 1827, 2192, 2557, 2922, 3288, or 3653
  LogRetention int64 `mapstructure:"log_retention"`
 
+ // Tags is the option to set tags for the CloudWatch Log Group. If specified, please add add at least 1 and at most 50 tags. Input is a string to string map like so: { 'key': 'value' }
+ // Keys must be between 1-128 characters and follow the regex pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]+)$
+ // Values must be between 1-256 characters and follow the regex pattern: ^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$
+ Tags map[string]*string `mapstructure:"tags"`
+
  // QueueSettings is a subset of exporterhelper.QueueSettings,
  // because only QueueSize is user-settable due to how AWS CloudWatch API works
  QueueSettings QueueSettings `mapstructure:"sending_queue"`
@@ -77,41 +83,14 @@ func (config *Config) Validate() error {
  if config.QueueSettings.QueueSize < 1 {
  return errors.New("'sending_queue.queue_size' must be 1 or greater")
  }
- if !isValidRetentionValue(config.LogRetention) {
+ if !cwlogs.IsValidRetentionValue(config.LogRetention) {
  return errors.New("invalid value for retention policy. Please make sure to use the following values: 0 (Never Expire), 1, 3, 5, 7, 14, 30, 60, 90, 120, 150, 180, 365, 400, 545, 731, 1827, 2192, 2557, 2922, 3288, or 3653")
  }
- return nil
-}
-
-// Added function to check if value is an accepted number of log retention days
-func isValidRetentionValue(input int64) bool {
- switch input {
- case
- 0,
- 1,
- 3,
- 5,
- 7,
- 14,
- 30,
- 60,
- 90,
- 120,
- 150,
- 180,
- 365,
- 400,
- 545,
- 731,
- 1827,
- 2192,
- 2557,
- 2922,
- 3288,
- 3653:
- return true
+ tagInputErr := cwlogs.ValidateTagsInput(config.Tags)
+ if tagInputErr != nil {
+ return errors.New(tagInputErr.Error())
  }
- return false
+ return nil
 }
 
 func (config *Config) enforcedQueueSettings() exporterhelper.QueueSettings {

exporter/awscloudwatchlogsexporter/config_test.go

@@ -16,6 +16,7 @@ package awscloudwatchlogsexporter
 
 import (
  "path/filepath"
+ "strconv"
  "testing"
 
  "github.com/cenkalti/backoff/v4"
@@ -142,6 +143,154 @@ func TestRetentionValidateWrong(t *testing.T) {
  QueueSize: exporterhelper.NewDefaultQueueSettings().QueueSize,
  },
  }
- assert.Error(t, wrongcfg.Validate())
+ assert.Error(t, component.ValidateConfig(wrongcfg))
 
 }
+
+func TestTagsValidateCorrect(t *testing.T) {
+ defaultRetrySettings := exporterhelper.NewDefaultRetrySettings()
+ avalue := "avalue"
+ cfg := &Config{
+ RetrySettings: defaultRetrySettings,
+ LogGroupName: "test-1",
+ LogStreamName: "testing",
+ Endpoint: "",
+ Tags: map[string]*string{"akey": &avalue},
+ AWSSessionSettings: awsutil.CreateDefaultSessionConfig(),
+ QueueSettings: QueueSettings{
+ QueueSize: exporterhelper.NewDefaultQueueSettings().QueueSize,
+ },
+ }
+ assert.NoError(t, component.ValidateConfig(cfg))
+
+}
+
+func TestTagsValidateTooManyTags(t *testing.T) {
+ m := make(map[string]*string)
+ avalue := "avalue"
+ for i := 0; i < 51; i++ {
+ m[strconv.Itoa(i)] = &avalue
+ }
+ defaultRetrySettings := exporterhelper.NewDefaultRetrySettings()
+ wrongcfg := &Config{
+ RetrySettings: defaultRetrySettings,
+ LogGroupName: "test-1",
+ LogStreamName: "testing",
+ Endpoint: "",
+ Tags: m,
+ AWSSessionSettings: awsutil.CreateDefaultSessionConfig(),
+ QueueSettings: QueueSettings{
+ QueueSize: exporterhelper.NewDefaultQueueSettings().QueueSize,
+ },
+ }
+ assert.EqualError(t, component.ValidateConfig(wrongcfg), "invalid amount of items. Please input at most 50 tags")
+}
+
+func TestTagsValidateWrongKeyRegex(t *testing.T) {
+ avalue := "avalue"
+ defaultRetrySettings := exporterhelper.NewDefaultRetrySettings()
+ wrongcfg := &Config{
+ RetrySettings: defaultRetrySettings,
+ LogGroupName: "test-1",
+ LogStreamName: "testing",
+ Endpoint: "",
+ Tags: map[string]*string{"***": &avalue},
+ AWSSessionSettings: awsutil.CreateDefaultSessionConfig(),
+ QueueSettings: QueueSettings{
+ QueueSize: exporterhelper.NewDefaultQueueSettings().QueueSize,
+ },
+ }
+ assert.EqualError(t, component.ValidateConfig(wrongcfg), "key - *** does not follow the regex pattern"+`^([\p{L}\p{Z}\p{N}_.:/=+\-@]+)$`)
+}
+
+func TestTagsValidateWrongValueRegex(t *testing.T) {
+ avalue := "***"
+ defaultRetrySettings := exporterhelper.NewDefaultRetrySettings()
+ wrongcfg := &Config{
+ RetrySettings: defaultRetrySettings,
+ LogGroupName: "test-1",
+ LogStreamName: "testing",
+ Endpoint: "",
+ Tags: map[string]*string{"akey": &avalue},
+ AWSSessionSettings: awsutil.CreateDefaultSessionConfig(),
+ QueueSettings: QueueSettings{
+ QueueSize: exporterhelper.NewDefaultQueueSettings().QueueSize,
+ },
+ }
+ assert.EqualError(t, component.ValidateConfig(wrongcfg), "value - "+avalue+" does not follow the regex pattern"+`^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$`)
+}
+
+func TestTagsValidateKeyTooShort(t *testing.T) {
+ avalue := "avalue"
+ defaultRetrySettings := exporterhelper.NewDefaultRetrySettings()
+ wrongcfg := &Config{
+ RetrySettings: defaultRetrySettings,
+ LogGroupName: "test-1",
+ LogStreamName: "testing",
+ Endpoint: "",
+ Tags: map[string]*string{"": &avalue},
+ AWSSessionSettings: awsutil.CreateDefaultSessionConfig(),
+ QueueSettings: QueueSettings{
+ QueueSize: exporterhelper.NewDefaultQueueSettings().QueueSize,
+ },
+ }
+ assert.EqualError(t, component.ValidateConfig(wrongcfg), "key - has an invalid length. Please use keys with a length of 1 to 128 characters")
+}
+
+func TestTagsValidateKeyTooLong(t *testing.T) {
+ avalue := "avalue"
+ akey := ""
+ for i := 0; i < 129; i++ {
+ akey += "a"
+ }
+ defaultRetrySettings := exporterhelper.NewDefaultRetrySettings()
+ wrongcfg := &Config{
+ RetrySettings: defaultRetrySettings,
+ LogGroupName: "test-1",
+ LogStreamName: "testing",
+ Endpoint: "",
+ Tags: map[string]*string{"": &avalue},
+ AWSSessionSettings: awsutil.CreateDefaultSessionConfig(),
+ QueueSettings: QueueSettings{
+ QueueSize: exporterhelper.NewDefaultQueueSettings().QueueSize,
+ },
+ }
+ assert.Error(t, component.ValidateConfig(wrongcfg), "key - "+akey+" has an invalid length. Please use keys with a length of 1 to 128 characters")
+}
+
+func TestTagsValidateValueTooShort(t *testing.T) {
+ avalue := ""
+ defaultRetrySettings := exporterhelper.NewDefaultRetrySettings()
+ wrongcfg := &Config{
+ RetrySettings: defaultRetrySettings,
+ LogGroupName: "test-1",
+ LogStreamName: "testing",
+ Endpoint: "",
+ Tags: map[string]*string{"akey": &avalue},
+ AWSSessionSettings: awsutil.CreateDefaultSessionConfig(),
+ QueueSettings: QueueSettings{
+ QueueSize: exporterhelper.NewDefaultQueueSettings().QueueSize,
+ },
+ }
+ assert.Error(t, component.ValidateConfig(wrongcfg), "value - "+avalue+" has an invalid length. Please use keys with a length of 1 to 256 characters")
+}
+
+func TestTagsValidateValueTooLong(t *testing.T) {
+ avalue := ""
+ for i := 0; i < 257; i++ {
+ avalue += "a"
+ }
+ defaultRetrySettings := exporterhelper.NewDefaultRetrySettings()
+ wrongcfg := &Config{
+ RetrySettings: defaultRetrySettings,
+ LogGroupName: "test-1",
+ LogStreamName: "testing",
+ Endpoint: "",
+ Tags: map[string]*string{"akey": &avalue},
+ AWSSessionSettings: awsutil.CreateDefaultSessionConfig(),
+ QueueSettings: QueueSettings{
+ QueueSize: exporterhelper.NewDefaultQueueSettings().QueueSize,
+ },
+ }
+ assert.Error(t, component.ValidateConfig(wrongcfg), "value - "+avalue+" has an invalid length. Please use keys with a length of 1 to 256 characters")
+}

exporter/awscloudwatchlogsexporter/exporter.go

@@ -72,7 +72,7 @@ func newCwLogsPusher(expConfig *Config, params exp.CreateSettings) (*exporter, e
  }
 
  // create CWLogs client with aws session config
- svcStructuredLog := cwlogs.NewClient(params.Logger, awsConfig, params.BuildInfo, expConfig.LogGroupName, expConfig.LogRetention, session)
+ svcStructuredLog := cwlogs.NewClient(params.Logger, awsConfig, params.BuildInfo, expConfig.LogGroupName, expConfig.LogRetention, expConfig.Tags, session)
  collectorIdentifier, err := uuid.NewRandom()
 
  if err != nil {