APM Logs-in-Context Forwarding on by default (#1078)

* APM Logs-in-Context Forwarding on by default * Updated Forwarding default test to check for true * Removed applicationLogging defaults where possible in integration tests
newrelic · May 5, 2022 · 3c61a36 · 3c61a36
1 parent d594aa8
commit 3c61a36
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 16 deletions.
diff --git a/src/Agent/NewRelic/Agent/Core/Config/Configuration.cs b/src/Agent/NewRelic/Agent/Core/Config/Configuration.cs
@@ -5063,12 +5063,12 @@ public partial class configurationApplicationLoggingForwarding
         /// </summary>
         public configurationApplicationLoggingForwarding()
         {
-            this.enabledField = false;
+            this.enabledField = true;
             this.maxSamplesStoredField = 10000;
         }
 
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        [System.ComponentModel.DefaultValueAttribute(false)]
+        [System.ComponentModel.DefaultValueAttribute(true)]
         public bool enabled
         {
             get

diff --git a/src/Agent/NewRelic/Agent/Core/Config/Configuration.xsd b/src/Agent/NewRelic/Agent/Core/Config/Configuration.xsd
@@ -1615,7 +1615,7 @@
                                     </xs:documentation>
                                 </xs:annotation>
                                 <xs:complexType>
-                                    <xs:attribute name="enabled" type="xs:boolean" default="false">
+                                    <xs:attribute name="enabled" type="xs:boolean" default="true">
                                         <xs:annotation>
                                             <xs:documentation>
                                                 Controls whether or not log forwarding occurs. Defaults to false.

diff --git a/tests/Agent/IntegrationTests/IntegrationTests/Logging/HSMOrCSPDisablesForwardingTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/Logging/HSMOrCSPDisablesForwardingTests.cs
@@ -35,10 +35,8 @@ public HSMOrCSPDisablesForwardingTestsBase(TFixture fixture, ITestOutputHelper o
                 {
                     var configModifier = new NewRelicConfigModifier(fixture.DestinationNewRelicConfigFilePath);
 
+                    // applicationLogging metrics and forwarding enabled by default
                     configModifier
-                    .EnableApplicationLogging()
-                    .EnableLogForwarding()
-                    .EnableLogMetrics()
                     .EnableDistributedTrace()
                     .SetLogLevel("debug");
 

diff --git a/tests/Agent/IntegrationTests/IntegrationTests/Logging/LocalDecorationTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/Logging/LocalDecorationTests.cs
@@ -45,7 +45,6 @@ public LocalDecorationTestsBase(TFixture fixture, ITestOutputHelper output, bool
                     var configModifier = new NewRelicConfigModifier(fixture.DestinationNewRelicConfigFilePath);
 
                     configModifier
-                    .EnableApplicationLogging()
                     .EnableLogDecoration(_decorationEnabled)
                     .EnableDistributedTrace()
                     .SetLogLevel("debug");

diff --git a/tests/Agent/IntegrationTests/IntegrationTests/Logging/MaxSamplesStoredTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/Logging/MaxSamplesStoredTests.cs
@@ -34,10 +34,8 @@ public MaxSamplesStoredTestsBase(TFixture fixture, ITestOutputHelper output, Log
                 {
                     var configModifier = new NewRelicConfigModifier(fixture.DestinationNewRelicConfigFilePath);
 
+                    // applicationLogging metrics and forwarding enabled by default
                     configModifier
-                    .EnableApplicationLogging()
-                    .EnableLogForwarding()
-                    .EnableLogMetrics()
                     .SetLogForwardingMaxSamplesStored(12)
                     .EnableDistributedTrace()
                     .SetLogLevel("debug");

diff --git a/tests/Agent/IntegrationTests/IntegrationTests/Logging/MetricsAndForwardingTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/Logging/MetricsAndForwardingTests.cs
@@ -134,7 +134,7 @@ public MetricsAndForwardingTestsBase(TFixture fixture, ITestOutputHelper output,
                 {
                     var configModifier = new NewRelicConfigModifier(fixture.DestinationNewRelicConfigFilePath);
 
-                    configModifier.EnableApplicationLogging()
+                    configModifier
                     .EnableLogMetrics(metricsEnabled)
                     .EnableLogForwarding(forwardingEnabled)
                     .EnableDistributedTrace()

diff --git a/tests/Agent/IntegrationTests/IntegrationTests/Logging/ZeroMaxSamplesStoredTests.cs b/tests/Agent/IntegrationTests/IntegrationTests/Logging/ZeroMaxSamplesStoredTests.cs
@@ -34,10 +34,8 @@ public ZeroMaxSamplesStoredTestsBase(TFixture fixture, ITestOutputHelper output,
                 {
                     var configModifier = new NewRelicConfigModifier(fixture.DestinationNewRelicConfigFilePath);
 
+                    // applicationLogging metrics and forwarding enabled by default
                     configModifier
-                    .EnableApplicationLogging()
-                    .EnableLogForwarding()
-                    .EnableLogMetrics()
                     .SetLogForwardingMaxSamplesStored(1) // must be 1 since 0 causes it to return the default
                     .EnableDistributedTrace()
                     .SetLogLevel("debug");

diff --git a/tests/Agent/UnitTests/Core.UnitTest/Configuration/DefaultConfigurationTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Configuration/DefaultConfigurationTests.cs
@@ -2643,9 +2643,9 @@ public void ApplicationLogging_Enabled_OverridesIndividualLoggingFeatures(bool a
         }
 
         [Test]
-        public void ApplicationLogging_ForwardingEnabled_IsFalseInLocalConfigByDefault()
+        public void ApplicationLogging_ForwardingEnabled_IsTrueInLocalConfigByDefault()
         {
-            Assert.IsFalse(_defaultConfig.LogEventCollectorEnabled);
+            Assert.IsTrue(_defaultConfig.LogEventCollectorEnabled);
         }
 
         [Test]