feat: Add config option for providing AWS account ID for linking (#2851)

Author: chynesNR

src/Agent/NewRelic/Agent/Core/Config/Configuration.cs

@@ -98,6 +98,8 @@ public partial class configuration
 
         private configurationCodeLevelMetrics codeLevelMetricsField;
 
+        private configurationCloud cloudField;
+        
         private bool agentEnabledField;
 
         private bool rootAgentEnabledField;
@@ -121,6 +123,7 @@ public partial class configuration
         /// </summary>
         public configuration()
         {
+            this.cloudField = new configurationCloud();
             this.codeLevelMetricsField = new configurationCodeLevelMetrics();
             this.processHostField = new configurationProcessHost();
             this.utilizationField = new configurationUtilization();
@@ -600,6 +603,18 @@ public configurationCodeLevelMetrics codeLevelMetrics
             }
         }
 
+        public configurationCloud cloud
+        {
+            get
+            {
+                return this.cloudField;
+            }
+            set
+            {
+                this.cloudField = value;
+            }
+        }
+        
         /// <summary>
         /// Set this to true to enable the agent.
         /// </summary>
@@ -6013,6 +6028,79 @@ public virtual configurationCodeLevelMetrics Clone()
         #endregion
     }
 
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.6.0.20097")]
+    [System.SerializableAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:newrelic-config")]
+    public partial class configurationCloud
+    {
+        
+        private configurationCloudAws awsField;
+        
+        /// <summary>
+        /// configurationCloud class constructor
+        /// </summary>
+        public configurationCloud()
+        {
+            this.awsField = new configurationCloudAws();
+        }
+        
+        public configurationCloudAws aws
+        {
+            get
+            {
+                return this.awsField;
+            }
+            set
+            {
+                this.awsField = value;
+            }
+        }
+        
+        #region Clone method
+        /// <summary>
+        /// Create a clone of this configurationCloud object
+        /// </summary>
+        public virtual configurationCloud Clone()
+        {
+            return ((configurationCloud)(this.MemberwiseClone()));
+        }
+        #endregion
+    }
+    
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.6.0.20097")]
+    [System.SerializableAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:newrelic-config")]
+    public partial class configurationCloudAws
+    {
+        
+        private string accountIdField;
+        
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public string accountId
+        {
+            get
+            {
+                return this.accountIdField;
+            }
+            set
+            {
+                this.accountIdField = value;
+            }
+        }
+        
+        #region Clone method
+        /// <summary>
+        /// Create a clone of this configurationCloudAws object
+        /// </summary>
+        public virtual configurationCloudAws Clone()
+        {
+            return ((configurationCloudAws)(this.MemberwiseClone()));
+        }
+        #endregion
+    }
+    
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.6.0.20097")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:newrelic-config")]

src/Agent/NewRelic/Agent/Core/Config/Configuration.xsd

@@ -2025,6 +2025,30 @@
                         </xs:attribute>
                     </xs:complexType>
                 </xs:element>
+
+                <xs:element name="cloud" minOccurs="0" maxOccurs="1">
+                    <xs:annotation>
+                        <xs:documentation>
+                            Provide linking data needed for certain cloud services.
+                        </xs:documentation>
+                    </xs:annotation>
+
+                    <xs:complexType>
+                        <xs:all>
+                            <xs:element name="aws" minOccurs="0" maxOccurs="1">
+                                <xs:complexType>
+                                    <xs:attribute name="accountId" type="xs:string">
+                                        <xs:annotation>
+                                            <xs:documentation>
+                                                The AWS Account ID used by this application.
+                                            </xs:documentation>
+                                        </xs:annotation>
+                                    </xs:attribute>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:all>
+                    </xs:complexType>
+                </xs:element>
             </xs:all>
 
             <xs:attribute name="agentEnabled" type="xs:boolean" default="true">

src/Agent/NewRelic/Agent/Core/Configuration/DefaultConfiguration.cs

@@ -2978,6 +2978,23 @@ public bool CodeLevelMetricsEnabled
 
         #endregion
 
+        #region Cloud
+        private string _awsAccountId;
+        public string AwsAccountId
+        {
+            get
+            {
+                if (_awsAccountId != null)
+                {
+                    return _awsAccountId;
+                }
+                _awsAccountId = EnvironmentOverrides(_localConfiguration.cloud.aws.accountId, "NEW_RELIC_CLOUD_AWS_ACCOUNT_ID");
+
+                return _awsAccountId;
+            }
+        }
+        #endregion
+
         public static bool GetLoggingEnabledValue(IEnvironment environment, configurationLog localLogConfiguration)
         {
             return EnvironmentOverrides(environment, localLogConfiguration.enabled, "NEW_RELIC_LOG_ENABLED");

src/Agent/NewRelic/Agent/Core/Configuration/ReportedConfiguration.cs

@@ -711,6 +711,9 @@ public ReportedConfiguration(IConfiguration configuration)
 
         public string AzureFunctionResourceIdWithFunctionName(string functionName) => _configuration.AzureFunctionResourceIdWithFunctionName(functionName);
 
+        [JsonIgnore]
+        public string AwsAccountId => _configuration.AwsAccountId;
+
         [JsonProperty("gc_sampler_v2.enabled")]
         public bool GCSamplerV2Enabled => _configuration.GCSamplerV2Enabled;
 

src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Configuration/IConfiguration.cs

@@ -232,6 +232,7 @@ public interface IConfiguration
 
         bool UtilizationDetectAzureFunction { get; }
 
+        string AwsAccountId { get; }
         bool GCSamplerV2Enabled { get; }
     }
 }

tests/Agent/UnitTests/Core.UnitTest/Configuration/DefaultConfigurationTests.cs

@@ -4438,9 +4438,93 @@ public void AzureFunctionServiceName_ShouldReturnServiceName_WhenEnvironmentVari
             // Assert
             Assert.That(result, Is.EqualTo("some-service-name"));
         }
+        #endregion
+
+        #region Cloud
+        [Test]
+        public void Cloud_Section_Parsing_And_Override()
+        {
+            string xmlString = """
+            <?xml version="1.0"?>
+            <configuration xmlns="urn:newrelic-config" agentEnabled="true">
+              <cloud>
+                <aws accountId="123456789012" />
+              </cloud>
+            </configuration>
+            """;
+            var config = GenerateConfigFromXml(xmlString);
+
+            Assert.That(config.AwsAccountId, Is.EqualTo("123456789012"));
+
+            xmlString = """
+            <?xml version="1.0"?>
+            <configuration xmlns="urn:newrelic-config" agentEnabled="true">
+              <cloud>
+                <aws />
+              </cloud>
+            </configuration>
+            """;
+            config = GenerateConfigFromXml(xmlString);
+
+            Assert.That(config.AwsAccountId, Is.Null);
+
+            xmlString = """
+            <?xml version="1.0"?>
+            <configuration xmlns="urn:newrelic-config" agentEnabled="true">
+              <cloud>
+              </cloud>
+            </configuration>
+            """;
+            config = GenerateConfigFromXml(xmlString);
+
+            Assert.That(config.AwsAccountId, Is.Null);
+
+            xmlString = """
+            <?xml version="1.0"?>
+            <configuration xmlns="urn:newrelic-config" agentEnabled="true">
+            </configuration>
+            """;
+            config = GenerateConfigFromXml(xmlString);
+
+            Assert.That(config.AwsAccountId, Is.Null);
+
+            // null from the last test, but env override should work
+            Mock.Arrange(() => _environment.GetEnvironmentVariableFromList("NEW_RELIC_CLOUD_AWS_ACCOUNT_ID")).Returns("444488881212");
+
+            Assert.That(config.AwsAccountId, Is.EqualTo("444488881212"));
+
+            // A second call should use the cached value
+            Assert.That(config.AwsAccountId, Is.EqualTo("444488881212"));
+
+            // If it exists in the config, the env variable should still override
+            xmlString = """
+            <?xml version="1.0"?>
+            <configuration xmlns="urn:newrelic-config" agentEnabled="true">
+              <cloud>
+                <aws accountId="123456789012" />
+              </cloud>
+            </configuration>
+            """;
+            config = GenerateConfigFromXml(xmlString);
+            Assert.That(config.AwsAccountId, Is.EqualTo("444488881212"));
+        }
 
         #endregion
 
+        private DefaultConfiguration GenerateConfigFromXml(string xml)
+        {
+            var root = new XmlRootAttribute { ElementName = "configuration", Namespace = "urn:newrelic-config" };
+            var serializer = new XmlSerializer(typeof(configuration), root);
+
+            configuration localConfiguration;
+            using (var reader = new StringReader(xml))
+            {
+                localConfiguration = serializer.Deserialize(reader) as configuration;
+            }
+
+            return new TestableDefaultConfiguration(_environment, localConfiguration, _serverConfig, _runTimeConfig, _securityPoliciesConfiguration, _bootstrapConfiguration, _processStatic, _httpRuntimeStatic, _configurationManagerStatic, _dnsStatic);
+        }
+
         private void CreateDefaultConfiguration()
         {
             _defaultConfig = new TestableDefaultConfiguration(_environment, _localConfig, _serverConfig, _runTimeConfig, _securityPoliciesConfiguration, _bootstrapConfiguration, _processStatic, _httpRuntimeStatic, _configurationManagerStatic, _dnsStatic);

tests/Agent/UnitTests/Core.UnitTest/DataTransport/AgentSettingsTests.cs

@@ -360,6 +360,7 @@ public void serializes_correctly()
                 Assert.That(agentSettings.ServerlessFunctionName, Is.Null);
                 Assert.That(agentSettings.ServerlessFunctionVersion, Is.Null);
                 Assert.That(json, Is.EqualTo(expectedJson.Condense()));
+                Assert.That(agentSettings.AwsAccountId, Is.Empty);
             });
         }
     }

tests/Agent/UnitTests/Core.UnitTest/DataTransport/ExhaustiveTestConfiguration.cs

@@ -493,7 +493,7 @@ public IReadOnlyDictionary<string, string> GetAppSettings()
 
         public string LoggingLevel => "info";
 
+        public string AwsAccountId => "";
         public bool GCSamplerV2Enabled => true;
-
     }
 }