feat(config): Add config options for aws configuration

Author: cade-conklin

v3/integrations/nrawssdk-v2/example/main.go

@@ -24,6 +24,8 @@ func main() {
 		newrelic.ConfigAppName("Example App"),
 		newrelic.ConfigInfoLogger(os.Stdout),
 		newrelic.ConfigDistributedTracerEnabled(true),
+		// newrelic.ConfigCloudAWSAccountID("<insert-aws-account-id>"), // Set the AWS accountID.  Will override any previous config options
+		// newrelic.ConfigCloudAWSAccountDecodingEnabled(true), // Enable/disable accountID decoding. Default is disabled
 	)
 	if nil != err {
 		fmt.Println(err)
@@ -40,12 +42,13 @@ func main() {
 
 	ctx := newrelic.NewContext(context.Background(), txn)
 
-	awsConfig, err := config.LoadDefaultConfig(ctx, func(awsConfig *config.LoadOptions) error {
-		// Instrument all new AWS clients with New Relic
-		return nil
-	})
+	// We need the values in the aws.Config for InitializeMiddleware, so
+	// there is no longer a need for a config option function.
+	awsConfig, err := config.LoadDefaultConfig(ctx)
 
-	nrawssdk.NRAppendMiddlewares(&awsConfig.APIOptions, ctx, awsConfig)
+	// nrawssdk.AppendMiddlewares(&awsConfig.APIOptions, txn) // LEGACY
+	// AppendMiddlewares is DEPRECATED. Please use InitializeMiddleware shown below
+	nrawssdk.InitializeMiddleware(&awsConfig.APIOptions, ctx, awsConfig)
 	if err != nil {
 		log.Fatal(err)
 	}

v3/integrations/nrawssdk-v2/nrawssdk.go

@@ -235,7 +235,7 @@ func AppendMiddlewares(apiOptions *[]func(*smithymiddle.Stack) error, txn *newre
 	*apiOptions = append(*apiOptions, m.serializeMiddleware)
 }
 
-func NRAppendMiddlewares(apiOptions *[]func(*smithymiddle.Stack) error, ctx context.Context, awsConfig aws.Config) {
+func InitializeMiddleware(apiOptions *[]func(*smithymiddle.Stack) error, ctx context.Context, awsConfig aws.Config) {
 	txn := newrelic.FromContext(ctx)
 
 	creds, err := awsConfig.Credentials.Retrieve(ctx)
@@ -249,7 +249,7 @@ func NRAppendMiddlewares(apiOptions *[]func(*smithymiddle.Stack) error, ctx cont
 	if ok {
 		err := m.ResolveAWSCredentials(cfg, creds)
 		if err != nil {
-			fmt.Println("error: Couldn't resolve AWS credentials")
+			cfg.Logger.Error(err.Error(), map[string]interface{}{})
 		}
 	}
 
@@ -325,9 +325,9 @@ func (m *nrMiddleware) ResolveAWSCredentials(cfg newrelic.Config, creds aws.Cred
 	if m.resolver == nil {
 		m.resolver = &defaultResolver{}
 	}
-
 	accountID, err := m.resolver.AWSAccountIdFromAWSAccessKey(creds)
 	if err != nil {
+		// return err, aws account id remains empty
 		return err
 	}
 

v3/newrelic/config_options.go

@@ -488,6 +488,22 @@ func ConfigCustomInsightsCustomAttributesValues(customAttributes map[string]stri
 	}
 }
 
+// ConfigCloudAWSAccountID is used to set the accountID for the AWS account to add as an attribute to span events. This may also be set using the
+// NEW_RELIC_CLOUD_AWS_ACCOUNT_ID environment variable.
+func ConfigCloudAWSAccountID(accountID string) ConfigOption {
+	return func(cfg *Config) {
+		cfg.CloudAWS.AccountID = accountID
+	}
+}
+
+// ConfigCloudAWSAccountDecodingEnabled is used to enable/disable accountID decoding for an AWS Access Key.  Any value that is decoded will be
+// overriden if the accountID is set in the config.
+func ConfigCloudAWSAccountDecodingEnabled(enabled bool) ConfigOption {
+	return func(cfg *Config) {
+		cfg.CloudAWS.AccountDecoding.Enabled = enabled
+	}
+}
+
 // ConfigFromEnvironment populates the config based on environment variables:
 //
 //		NEW_RELIC_APP_NAME                                			sets AppName