Skip to content

Drop .Extensions from Steeltoe.Logging namespace #1038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
using Steeltoe.Connector.Redis;
using Steeltoe.Connector.SqlServer;
using Steeltoe.Discovery.Client;
using Steeltoe.Extensions.Logging.DynamicSerilog;
using Steeltoe.Logging.DynamicSerilog;
using Steeltoe.Management.Endpoint;
using Steeltoe.Management.Endpoint.Metrics;
using Steeltoe.Management.Kubernetes;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<ProjectReference Include="..\..\..\Connectors\src\EntityFramework6\Steeltoe.Connector.EntityFramework6.csproj" PrivateAssets="All" />
<ProjectReference Include="..\..\..\Connectors\src\Connector\Steeltoe.Connector.csproj" PrivateAssets="All" />
<ProjectReference Include="..\..\..\Discovery\src\Client\Steeltoe.Discovery.Client.csproj" PrivateAssets="All" />
<ProjectReference Include="..\..\..\Logging\src\DynamicSerilog\Steeltoe.Extensions.Logging.DynamicSerilog.csproj" PrivateAssets="All" />
<ProjectReference Include="..\..\..\Logging\src\DynamicSerilog\Steeltoe.Logging.DynamicSerilog.csproj" PrivateAssets="All" />
<ProjectReference Include="..\..\..\Management\src\Endpoint\Steeltoe.Management.Endpoint.csproj" PrivateAssets="All" />
<ProjectReference Include="..\..\..\Management\src\Kubernetes\Steeltoe.Management.Kubernetes.csproj" PrivateAssets="All" />
<ProjectReference Include="..\..\..\Management\src\Task\Steeltoe.Management.Task.csproj" PrivateAssets="All" />
Expand All @@ -33,7 +33,7 @@
<ProjectReference Include="..\..\..\Security\src\DataProtection.Redis\Steeltoe.Security.DataProtection.Redis.csproj" PrivateAssets="All" />
<ProjectReference Include="..\..\..\Connectors\src\CloudFoundry\Steeltoe.Connector.CloudFoundry.csproj" PrivateAssets="All" />
<ProjectReference Include="..\..\..\Connectors\src\EntityFrameworkCore\Steeltoe.Connector.EntityFrameworkCore.csproj" PrivateAssets="All" />
<ProjectReference Include="..\..\..\Logging\src\DynamicLogger\Steeltoe.Extensions.Logging.DynamicLogger.csproj" PrivateAssets="All" />
<ProjectReference Include="..\..\..\Logging\src\DynamicLogger\Steeltoe.Logging.DynamicLogger.csproj" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Bootstrap/src/AutoConfiguration/SteeltoeAssemblies.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public static class SteeltoeAssemblies
public const string SteeltoeExtensionsConfigurationPlaceholder = "Steeltoe.Configuration.Placeholder";
public const string SteeltoeConnector = "Steeltoe.Connector";
public const string SteeltoeDiscoveryClient = "Steeltoe.Discovery.Client";
public const string SteeltoeExtensionsLoggingDynamicSerilog = "Steeltoe.Extensions.Logging.DynamicSerilog";
public const string SteeltoeExtensionsLoggingDynamicSerilog = "Steeltoe.Logging.DynamicSerilog";
public const string SteeltoeManagementEndpoint = "Steeltoe.Management.Endpoint";
public const string SteeltoeManagementKubernetes = "Steeltoe.Management.Kubernetes";
public const string SteeltoeManagementTracing = "Steeltoe.Management.Tracing";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
using Steeltoe.Connector.Redis;
using Steeltoe.Connector.SqlServer;
using Steeltoe.Discovery.Client;
using Steeltoe.Extensions.Logging.DynamicSerilog;
using Steeltoe.Logging.DynamicSerilog;
using Steeltoe.Management.Endpoint;
using Steeltoe.Management.Kubernetes;
using Steeltoe.Management.Tracing;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
using Steeltoe.Connector.Redis;
using Steeltoe.Connector.SqlServer;
using Steeltoe.Discovery.Client;
using Steeltoe.Extensions.Logging.DynamicSerilog;
using Steeltoe.Logging.DynamicSerilog;
using Steeltoe.Management.Endpoint;
using Steeltoe.Management.Endpoint.Metrics;
using Steeltoe.Management.Kubernetes;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
using Steeltoe.Connector;
using Steeltoe.Discovery;
using Steeltoe.Discovery.Eureka;
using Steeltoe.Extensions.Logging;
using Steeltoe.Extensions.Logging.DynamicSerilog;
using Steeltoe.Logging;
using Steeltoe.Logging.DynamicSerilog;
using Steeltoe.Management.Endpoint;
using Steeltoe.Management.Endpoint.Hypermedia;
using Steeltoe.Management.OpenTelemetry.Exporters;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ProjectReference Include="..\..\..\Configuration\src\RandomValue\Steeltoe.Configuration.RandomValue.csproj" />
<ProjectReference Include="..\..\..\Discovery\src\Client\Steeltoe.Discovery.Client.csproj" />
<ProjectReference Include="..\..\..\Discovery\src\Eureka\Steeltoe.Discovery.Eureka.csproj" />
<ProjectReference Include="..\..\..\Logging\src\DynamicSerilog\Steeltoe.Extensions.Logging.DynamicSerilog.csproj" />
<ProjectReference Include="..\..\..\Logging\src\DynamicSerilog\Steeltoe.Logging.DynamicSerilog.csproj" />
<ProjectReference Include="..\..\..\Management\src\Endpoint\Steeltoe.Management.Endpoint.csproj" />
<ProjectReference Include="..\..\..\Management\src\Kubernetes\Steeltoe.Management.Kubernetes.csproj" />
<ProjectReference Include="..\..\..\Management\src\Tracing\Steeltoe.Management.Tracing.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
using Steeltoe.Connector;
using Steeltoe.Discovery;
using Steeltoe.Discovery.Eureka;
using Steeltoe.Extensions.Logging;
using Steeltoe.Extensions.Logging.DynamicSerilog;
using Steeltoe.Logging;
using Steeltoe.Logging.DynamicSerilog;
using Steeltoe.Management.Endpoint;
using Steeltoe.Management.Endpoint.Hypermedia;
using Steeltoe.Management.OpenTelemetry.Exporters;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
using Steeltoe.Connector;
using Steeltoe.Discovery;
using Steeltoe.Discovery.Eureka;
using Steeltoe.Extensions.Logging;
using Steeltoe.Extensions.Logging.DynamicSerilog;
using Steeltoe.Logging;
using Steeltoe.Logging.DynamicSerilog;
using Steeltoe.Management.Endpoint;
using Steeltoe.Management.Endpoint.Hypermedia;
using Steeltoe.Management.OpenTelemetry.Exporters;
Expand Down
2 changes: 1 addition & 1 deletion src/Logging/src/Abstractions/DynamicLoggerConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

using Microsoft.Extensions.Logging;

namespace Steeltoe.Extensions.Logging;
namespace Steeltoe.Logging;

public class DynamicLoggerConfiguration : ILoggerConfiguration
{
Expand Down
2 changes: 1 addition & 1 deletion src/Logging/src/Abstractions/DynamicLoggerProviderBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Microsoft.Extensions.Logging;
using Filter = System.Func<string, Microsoft.Extensions.Logging.LogLevel, bool>;

namespace Steeltoe.Extensions.Logging;
namespace Steeltoe.Logging;

public class DynamicLoggerProviderBase : IDynamicLoggerProvider
{
Expand Down
2 changes: 1 addition & 1 deletion src/Logging/src/Abstractions/IDynamicLoggerProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

using Microsoft.Extensions.Logging;

namespace Steeltoe.Extensions.Logging;
namespace Steeltoe.Logging;

public interface IDynamicLoggerProvider : ILoggerProvider
{
Expand Down
2 changes: 1 addition & 1 deletion src/Logging/src/Abstractions/IDynamicMessageProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the Apache 2.0 License.
// See the LICENSE file in the project root for more information.

namespace Steeltoe.Extensions.Logging;
namespace Steeltoe.Logging;

/// <summary>
/// Provides the ability to process each log message before it is sent to the Console.
Expand Down
2 changes: 1 addition & 1 deletion src/Logging/src/Abstractions/ILoggerConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

using Microsoft.Extensions.Logging;

namespace Steeltoe.Extensions.Logging;
namespace Steeltoe.Logging;

public interface ILoggerConfiguration
{
Expand Down
2 changes: 1 addition & 1 deletion src/Logging/src/Abstractions/InitialLevels.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Microsoft.Extensions.Logging;
using Filter = System.Func<string, Microsoft.Extensions.Logging.LogLevel, bool>;

namespace Steeltoe.Extensions.Logging;
namespace Steeltoe.Logging;

/// <summary>
/// Initial set of LogLevels, Filters and DefaultFilter to initialize a <see cref="IDynamicLoggerProvider" />.
Expand Down
2 changes: 1 addition & 1 deletion src/Logging/src/Abstractions/MessageProcessingLogger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Steeltoe.Common;
using Filter = System.Func<string, Microsoft.Extensions.Logging.LogLevel, bool>;

namespace Steeltoe.Extensions.Logging;
namespace Steeltoe.Logging;

public class MessageProcessingLogger : ILogger
{
Expand Down
2 changes: 1 addition & 1 deletion src/Logging/src/Abstractions/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("Steeltoe.Extensions.Logging.DynamicSerilog")]
[assembly: InternalsVisibleTo("Steeltoe.Logging.DynamicSerilog")]
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<RootNamespace>Steeltoe.Extensions.Logging</RootNamespace>
<RootNamespace>Steeltoe.Logging</RootNamespace>
<Description>Abstractions for use with dynamic logging</Description>
<PackageTags></PackageTags>
<IsPackable>true</IsPackable>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

using Microsoft.Extensions.Logging;

namespace Steeltoe.Extensions.Logging;
namespace Steeltoe.Logging;

public class StructuredMessageProcessingLogger : MessageProcessingLogger
{
Expand Down
2 changes: 1 addition & 1 deletion src/Logging/src/DynamicLogger/ConsoleLoggerOptionsSetup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Microsoft.Extensions.Logging.Console;
using Microsoft.Extensions.Options;

namespace Steeltoe.Extensions.Logging;
namespace Steeltoe.Logging.DynamicLogger;

internal sealed class ConsoleLoggerOptionsSetup : ConfigureFromConfigurationOptions<ConsoleLoggerOptions>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using Microsoft.Extensions.Options;
using Filter = System.Func<string, Microsoft.Extensions.Logging.LogLevel, bool>;

namespace Steeltoe.Extensions.Logging;
namespace Steeltoe.Logging.DynamicLogger;

[ProviderAlias("Dynamic")]
public class DynamicConsoleLoggerProvider : DynamicLoggerProviderBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Microsoft.Extensions.Hosting;
using Steeltoe.Common;

namespace Steeltoe.Extensions.Logging;
namespace Steeltoe.Logging.DynamicLogger;

public static class DynamicLoggerHostBuilderExtensions
{
Expand Down
2 changes: 1 addition & 1 deletion src/Logging/src/DynamicLogger/DynamicLoggingBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
using Microsoft.Extensions.Options;
using Steeltoe.Common;

namespace Steeltoe.Extensions.Logging;
namespace Steeltoe.Logging.DynamicLogger;

public static class DynamicLoggingBuilder
{
Expand Down
2 changes: 1 addition & 1 deletion src/Logging/src/DynamicLogger/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("Steeltoe.Extensions.Logging.DynamicSerilog")]
[assembly: InternalsVisibleTo("Steeltoe.Logging.DynamicSerilog")]
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@

<ItemGroup>
<ProjectReference Include="..\..\..\Common\src\Common\Steeltoe.Common.csproj" />
<ProjectReference Include="..\Abstractions\Steeltoe.Extensions.Logging.Abstractions.csproj" />
<ProjectReference Include="..\Abstractions\Steeltoe.Logging.Abstractions.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Logging/src/DynamicSerilog/ISerilogOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the Apache 2.0 License.
// See the LICENSE file in the project root for more information.

namespace Steeltoe.Extensions.Logging.DynamicSerilog;
namespace Steeltoe.Logging.DynamicSerilog;

public interface ISerilogOptions
{
Expand Down
2 changes: 1 addition & 1 deletion src/Logging/src/DynamicSerilog/MinimumLevel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

using Serilog.Events;

namespace Steeltoe.Extensions.Logging.DynamicSerilog;
namespace Steeltoe.Logging.DynamicSerilog;

public class MinimumLevel
{
Expand Down
4 changes: 2 additions & 2 deletions src/Logging/src/DynamicSerilog/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@

using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("Steeltoe.Extensions.Logging.DynamicSerilog")]
[assembly: InternalsVisibleTo("Steeltoe.Extensions.Logging.DynamicSerilog.Test")]
[assembly: InternalsVisibleTo("Steeltoe.Logging.DynamicSerilog")]
[assembly: InternalsVisibleTo("Steeltoe.Logging.DynamicSerilog.Test")]
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Serilog;
using Serilog.Events;

namespace Steeltoe.Extensions.Logging.DynamicSerilog;
namespace Steeltoe.Logging.DynamicSerilog;

internal static class SerilogConfigurationExtensions
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

using Microsoft.Extensions.Logging;

namespace Steeltoe.Extensions.Logging.DynamicSerilog;
namespace Steeltoe.Logging.DynamicSerilog;

public class SerilogDynamicLoggerFactory : ILoggerFactory
{
Expand Down
2 changes: 1 addition & 1 deletion src/Logging/src/DynamicSerilog/SerilogDynamicProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using Serilog.Extensions.Logging;
using Filter = System.Func<string, Microsoft.Extensions.Logging.LogLevel, bool>;

namespace Steeltoe.Extensions.Logging.DynamicSerilog;
namespace Steeltoe.Logging.DynamicSerilog;

public class SerilogDynamicProvider : DynamicLoggerProviderBase
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Microsoft.Extensions.Hosting;
using Serilog;

namespace Steeltoe.Extensions.Logging.DynamicSerilog;
namespace Steeltoe.Logging.DynamicSerilog;

public static class SerilogHostBuilderExtensions
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using Serilog;
using Steeltoe.Common;

namespace Steeltoe.Extensions.Logging.DynamicSerilog;
namespace Steeltoe.Logging.DynamicSerilog;

public static class SerilogLoggingBuilderExtensions
{
Expand Down
2 changes: 1 addition & 1 deletion src/Logging/src/DynamicSerilog/SerilogOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using Serilog.Core;
using Serilog.Events;

namespace Steeltoe.Extensions.Logging.DynamicSerilog;
namespace Steeltoe.Logging.DynamicSerilog;

/// <summary>
/// Implements a subset of the Serilog Options needed for SerilogDynamicProvider.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Microsoft.AspNetCore.Builder;
using Serilog;

namespace Steeltoe.Extensions.Logging.DynamicSerilog;
namespace Steeltoe.Logging.DynamicSerilog;

public static class SerilogWebApplicationBuilderExtensions
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Microsoft.AspNetCore.Hosting;
using Serilog;

namespace Steeltoe.Extensions.Logging.DynamicSerilog;
namespace Steeltoe.Logging.DynamicSerilog;

public static class SerilogWebHostBuilderExtensions
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Abstractions\Steeltoe.Extensions.Logging.Abstractions.csproj" />
<ProjectReference Include="..\Abstractions\Steeltoe.Logging.Abstractions.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the Apache 2.0 License.
// See the LICENSE file in the project root for more information.

namespace Steeltoe.Extensions.Logging.Test;
namespace Steeltoe.Logging.DynamicLogger.Test;

internal sealed class ConsoleOutputBorrower : IDisposable
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using Microsoft.Extensions.Logging.Console;
using Xunit;

namespace Steeltoe.Extensions.Logging.DynamicLogger.Test;
namespace Steeltoe.Logging.DynamicLogger.Test;

public class DynamicLoggerHostBuilderExtensionsTest
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using Microsoft.Extensions.Logging;
using Xunit;

namespace Steeltoe.Extensions.Logging.Test;
namespace Steeltoe.Logging.DynamicLogger.Test;

public class DynamicLoggerProviderTest
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
using Microsoft.Extensions.Options;
using Xunit;

namespace Steeltoe.Extensions.Logging.Test;
namespace Steeltoe.Logging.DynamicLogger.Test;

public class DynamicLoggingBuilderTest
{
Expand All @@ -20,7 +20,7 @@ public class DynamicLoggingBuilderTest
["Logging:Console:LogLevel:Default"] = "Information",
["Logging:Console:LogLevel:A.B.C.D"] = "Critical",
["Logging:Console:DisableColors"] = "True",
["Logging:LogLevel:Steeltoe.Extensions.Logging.Test"] = "Information",
["Logging:LogLevel:Steeltoe.Logging.DynamicLogger.Test"] = "Information",
["Logging:LogLevel:Default"] = "Warning"
};

Expand Down Expand Up @@ -131,7 +131,7 @@ public void DynamicLevelSetting_ParameterlessAddDynamic_NotBrokenByAddConfigurat

// change the log level and confirm it worked
var provider = services.GetRequiredService(typeof(ILoggerProvider)) as DynamicConsoleLoggerProvider;
provider.SetLogLevel("Steeltoe.Extensions.Logging.Test", LogLevel.Trace);
provider.SetLogLevel("Steeltoe.Logging.DynamicLogger.Test", LogLevel.Trace);
Assert.True(logger.IsEnabled(LogLevel.Trace), "Trace level should have been enabled");
}

Expand Down
Loading