Merge latest from main, resolve conflicts

.github/workflows/repolinter.yml

@@ -38,7 +38,7 @@ jobs:
 
       - name: Test Default Branch
         id: default-branch
-        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
+        uses: actions/github-script@e69ef5462fd455e02edcaf4dd7708eda96b9eda0 # v7.0.0
         with:
           script: |
             const data = await github.rest.repos.get(context.repo)

CONTRIBUTING.md

@@ -77,7 +77,3 @@ Keep in mind that when you submit your Pull Request, you'll need to sign the CLA
 
 For more information about CLAs, please check out Alex Russell’s excellent post,
 [“Why Do I Need to Sign This?”](https://infrequently.org/2008/06/why-do-i-need-to-sign-this/).
-
-## Slack
-
-We host a public Slack with a dedicated channel for contributors and maintainers of open source projects hosted by New Relic.  If you are contributing to this project, you're welcome to request access to the #oss-contributors channel in the newrelicusers.slack.com workspace.  To request access, please use this [link](https://join.slack.com/t/newrelicusers/shared_invite/zt-1ayj69rzm-~go~Eo1whIQGYnu3qi15ng).

src/Agent/NewRelic/Agent/Core/AgentHealth/AgentHealthReporter.cs

@@ -695,6 +695,7 @@ private void CollectOneTimeMetrics()
             ReportLogForwardingConfiguredValues();
             ReportIfAppDomainCachingDisabled();
             ReportInfiniteTracingOneTimeMetrics();
+            ReportIfLoggingDisabled();
         }
 
         public void CollectMetrics()
@@ -829,5 +830,17 @@ protected override void OnConfigurationUpdated(ConfigurationUpdateSource configu
             // Some one time metrics are reporting configured values, so we want to re-report them if the configuration changed
             _oneTimeMetricsCollected = false;
         }
+
+        private void ReportIfLoggingDisabled()
+        {
+            if (!_configuration.LoggingEnabled)
+            {
+                ReportSupportabilityCountMetric(MetricNames.SupportabilityLoggingDisabled);
+            }
+            if (Log.FileLoggingHasFailed)
+            {
+                ReportSupportabilityCountMetric(MetricNames.SupportabilityLoggingFatalError);
+            }
+        }
     }
 }

src/Agent/NewRelic/Agent/Core/AgentManager.cs

@@ -220,6 +220,8 @@ private void LogInitialized()
                     "NEW_RELIC_LOG",
                     "NEWRELIC_PROFILER_LOG_DIRECTORY",
                     "NEWRELIC_LOG_LEVEL",
+                    "NEW_RELIC_LOG_ENABLED",
+                    "NEW_RELIC_LOG_CONSOLE",
                     "NEW_RELIC_LABELS",
                     "NEW_RELIC_PROXY_HOST",
                     "NEW_RELIC_PROXY_URI_PATH",

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

@@ -1284,6 +1284,7 @@ public virtual configurationApplication Clone()
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true, Namespace="urn:newrelic-config")]
     public partial class configurationLog
     {
+        private bool enabledField;
 
         private string levelField;
 
@@ -1300,6 +1301,7 @@ public partial class configurationLog
         /// </summary>
         public configurationLog()
         {
+            this.enabledField = true;
             this.levelField = "info";
             this.consoleField = false;
             this.auditLogField = false;
@@ -1358,6 +1360,20 @@ public bool console
                 this.consoleField = value;
             }
         }
+
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        [System.ComponentModel.DefaultValueAttribute(true)]
+        public bool enabled
+        {
+            get
+            {
+                return this.enabledField;
+            }
+            set
+            {
+                this.enabledField = value;
+            }
+        }
 
         [System.Xml.Serialization.XmlAttributeAttribute()]
         [System.ComponentModel.DefaultValueAttribute(false)]

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

@@ -313,6 +313,14 @@
                             </xs:annotation>
                         </xs:attribute>
 
+                        <xs:attribute name="enabled" type="xs:boolean" default="true">
+                            <xs:annotation>
+                                <xs:documentation>
+                                    If this is false, no attempts will be made to write to a log file. This is primarily used for installations on read-only file systems.
+                                </xs:documentation>
+                            </xs:annotation>
+                        </xs:attribute>
+
                         <xs:attribute name="directory" type="xs:string" use="optional">
                             <xs:annotation>
                                 <xs:documentation>

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

@@ -59,6 +59,7 @@ private static string InternalGetAppDomainAppPath()
 
         public static Func<string, bool> FileExists = File.Exists;
         public static Func<string, string> PathGetDirectoryName = Path.GetDirectoryName;
+        public static Func<string, string> GetEnvironmentVar = System.Environment.GetEnvironmentVariable;
 
         private static string InternalGetNewRelicHome()
         {
@@ -522,6 +523,10 @@ public string LogLevel
         {
             get
             {
+                if (!Enabled)
+                {
+                    return "off";
+                }
                 // Environment variable or log.level from config...
                 return (AgentInstallConfiguration.NewRelicLogLevel
                     ?? this.level).ToUpper();
@@ -559,7 +564,7 @@ public string GetFullLogFileName()
 
         private string GetLogFileName()
         {
-            string name = System.Environment.GetEnvironmentVariable("NEW_RELIC_LOG");
+            string name = ConfigurationLoader.GetEnvironmentVar("NEW_RELIC_LOG");
             if (name != null)
             {
                 return Strings.SafeFileName(name);
@@ -594,11 +599,46 @@ private string GetLogFileName()
             return "newrelic_agent_" + Strings.SafeFileName(name) + ".log";
         }
 
+        private bool GetOverride(string name, bool fallback)
+        {
+            var val = ConfigurationLoader.GetEnvironmentVar(name);
+
+            if (val != null)
+            {
+                val = val.ToLower();
+            }
+
+            if (bool.TryParse(val, out var parsedValue))
+            {
+                return parsedValue;
+            }
+
+            if ("0" == val)
+            {
+                return false;
+            }
+
+            if ("1" == val)
+            {
+                return true;
+            }
+
+            return fallback;
+        }
+
         public bool Console
         {
             get
             {
-                return console;
+                return GetOverride("NEW_RELIC_LOG_CONSOLE", console);
+            }
+        }
+
+        public bool Enabled
+        {
+            get
+            {
+                return GetOverride("NEW_RELIC_LOG_ENABLED", enabled);
             }
         }
 

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

@@ -5,6 +5,8 @@ namespace NewRelic.Agent.Core.Config
 {
     public interface ILogConfig
     {
+        bool Enabled { get; }
+
         string LogLevel { get; }
 
         string GetFullLogFileName();

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

@@ -64,7 +64,7 @@ private void OnConfigurationDeserialized(ConfigurationDeserializedEvent configur
         private static void UpdateLogLevel(configuration localConfiguration)
         {
             Log.Info("The log level was updated to {0}", localConfiguration.LogConfig.LogLevel);
-            LoggerBootstrapper.UpdateLoggingLevel(localConfiguration.LogConfig.LogLevel);
+            LoggerBootstrapper.SetLoggingLevel(localConfiguration.LogConfig.LogLevel);
         }
 
         private void OnServerConfigurationUpdated(ServerConfigurationUpdatedEvent serverConfigurationUpdatedEvent)

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

@@ -2775,6 +2775,8 @@ public bool CodeLevelMetricsEnabled
 
         #endregion
 
+        public bool LoggingEnabled => _localConfiguration.log.Enabled;
+
         private const bool CaptureTransactionTraceAttributesDefault = true;
         private const bool CaptureErrorCollectorAttributesDefault = true;
         private const bool CaptureBrowserMonitoringAttributesDefault = false;

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

@@ -647,6 +647,9 @@ public ReportedConfiguration(IConfiguration configuration)
         [JsonProperty("stackexchangeredis_cleanup.cycle")]
         public TimeSpan StackExchangeRedisCleanupCycle => _configuration.StackExchangeRedisCleanupCycle;
 
+        [JsonProperty("agent.logging_enabled")]
+        public bool LoggingEnabled => _configuration.LoggingEnabled;
+
         public IReadOnlyDictionary<string, string> GetAppSettings()
         {
             return _configuration.GetAppSettings();

src/Agent/NewRelic/Agent/Core/Core.csproj

@@ -39,7 +39,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Serilog" Version="3.0.1" />
-    <PackageReference Include="Serilog.Expressions" Version="3.4.1" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
@@ -101,7 +100,6 @@
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'NewRelic.Parsing'" />
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Newtonsoft.Json'" />
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Serilog'" />
-      <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Serilog.Expressions'" />
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Serilog.Sinks.Async'" />
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Serilog.Sinks.Console'" />
       <ILRepackInclude Include="@(PossibleRefsForILRepack)" Condition="'%(FileName)' == 'Serilog.Sinks.Debug'" />
@@ -126,8 +124,8 @@
     </ItemGroup>
 
     <PropertyGroup>
-      <ILRepackIncludeCount Condition="'$(TargetFramework)' == 'net462'">20</ILRepackIncludeCount>
-      <ILRepackIncludeCount Condition="'$(TargetFramework)' == 'netstandard2.0'">17</ILRepackIncludeCount>
+      <ILRepackIncludeCount Condition="'$(TargetFramework)' == 'net462'">19</ILRepackIncludeCount>
+      <ILRepackIncludeCount Condition="'$(TargetFramework)' == 'netstandard2.0'">16</ILRepackIncludeCount>
     </PropertyGroup>
 
     <Error Text="ILRepack of $(AssemblyName) ($(TargetFramework)) failed. A dependency is missing. Expected $(ILRepackIncludeCount) dependencies but found @(ILRepackInclude-&gt;Count())." Condition="@(ILRepackInclude-&gt;Count()) != $(ILRepackIncludeCount)" />

src/Agent/NewRelic/Agent/Core/Logging/AuditLog.cs

@@ -38,12 +38,12 @@ public static void Log(string message)
 
         public static LoggerConfiguration IncludeOnlyAuditLog(this LoggerConfiguration loggerConfiguration)
         {
-            return loggerConfiguration.Filter.ByIncludingOnly($"{LogLevelExtensions.AuditLevel} is not null");
+            return loggerConfiguration.Filter.ByIncludingOnly(logEvent => logEvent.Properties.ContainsKey(LogLevelExtensions.AuditLevel));
         }
 
         public static LoggerConfiguration ExcludeAuditLog(this LoggerConfiguration loggerConfiguration)
         {
-            return loggerConfiguration.Filter.ByIncludingOnly($"{LogLevelExtensions.AuditLevel} is null");
+            return loggerConfiguration.Filter.ByIncludingOnly(logEvent => !logEvent.Properties.ContainsKey(LogLevelExtensions.AuditLevel));
         }
     }
 }