anaselhajjaji · Nov 28, 2022 · Nov 30, 2022 · Nov 30, 2022 · Nov 30, 2022 · Nov 30, 2022
diff --git a/.github/workflows/netframework.build.yml b/.github/workflows/netframework.build.yml
@@ -1,4 +1,4 @@
-name: Dot Net Framework 4 (Build)
+name: Dot Net Framework (Build)
 
 on:
    push:
@@ -12,15 +12,15 @@ jobs:
     steps:
     - name: Checkout the repository
       uses: actions/checkout@master
-
+      
     - name: Setup NuGet
-      uses: NuGet/setup-nuget@v1.0.2
+      uses: NuGet/setup-nuget@v1.1.1
 
     - name: Restore NuGet Packages
       run: nuget restore log4net.Appender.Loki.sln
 
-    - name: Setup MSBuild Path
-      uses: warrenbuckley/Setup-MSBuild@v1
+    - name: Setup-msbuild
+      uses: microsoft/setup-msbuild@v1.1.3
 
     - name: Build
-      run: msbuild log4net.Appender.Loki.csproj /p:Configuration=Release
+      run: msbuild Log4Net.Appender.Grafana.Loki.csproj /p:Configuration=Release
diff --git a/.github/workflows/netframework.release.yml b/.github/workflows/netframework.release.yml
@@ -1,4 +1,4 @@
-name: Dot Net Framework 4 (Release)
+name: Dot Net Framework (Release)
 
 on:
    push:
@@ -14,19 +14,19 @@ jobs:
       uses: actions/checkout@master
 
     - name: Setup NuGet
-      uses: NuGet/setup-nuget@v1.0.2
+      uses: NuGet/setup-nuget@v1.1.1
 
     - name: Restore NuGet Packages
       run: nuget restore log4net.Appender.Loki.sln
 
     - name: Setup MSBuild Path
-      uses: warrenbuckley/Setup-MSBuild@v1
+      uses: microsoft/setup-msbuild@v1.1.3
 
     - name: Build
-      run: msbuild log4net.Appender.Loki.csproj /p:Configuration=Release
+      run: msbuild Log4Net.Appender.Grafana.Loki.csproj /p:Configuration=Release
 
     - name: Create NuGet Package
-      run: nuget pack log4net.Appender.Loki.csproj -OutputDirectory ./artifact -Prop Configuration=Release
+      run: nuget pack Log4Net.Appender.Grafana.Loki.csproj -OutputDirectory ./artifact -Prop Configuration=Release
 
     - name: Upload Artifact
       uses: actions/upload-artifact@v1.0.0

diff --git a/Example.NetCore/Example.NetCore.csproj b/Example.NetCore/Example.NetCore.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="log4net" Version="2.0.15" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Log4Net.Appender.Grafana.Loki.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="log4net.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>
diff --git a/Example.NetCore/Program.cs b/Example.NetCore/Program.cs
@@ -0,0 +1,23 @@
+// See https://aka.ms/new-console-template for more information
+
+Console.WriteLine("Hello, World!");
+
+var logger = log4net.LogManager.GetLogger("Program");
+
+var fileInfo = new FileInfo(AppDomain.CurrentDomain.BaseDirectory + "log4net.config");
+if (fileInfo.Exists)
+    log4net.Config.XmlConfigurator.Configure(fileInfo);
+else
+    throw new InvalidOperationException("No log config file found");
+
+int count = 0;
+
+while (true)
+{
+    Thread.Sleep(2000);
+    logger.Debug($"Log number {count++}");
+    logger.Info($"Log number {count++}");
+    logger.Warn($"Log number {count++}");
+    logger.Error($"Log number {count++}");
+    logger.Fatal($"Log number {count++}");
+}
diff --git a/Example.NetCore/log4net.config b/Example.NetCore/log4net.config
@@ -0,0 +1,34 @@
+<log4net>
+  <root>
+    <level value="ALL" />
+    <appender-ref ref="console" />
+    <appender-ref ref="file" />
+    <appender-ref ref="loki" />
+  </root>
+  <appender name="console" type="log4net.Appender.ConsoleAppender">
+    <layout type="log4net.Layout.PatternLayout">
+      <conversionPattern value="%date %level %logger - %message%newline" />
+    </layout>
+  </appender>
+  <appender name="file" type="log4net.Appender.RollingFileAppender">
+    <file value="example.log" />
+    <appendToFile value="true" />
+    <rollingStyle value="Size" />
+    <maxSizeRollBackups value="5" />
+    <maximumFileSize value="10MB" />
+    <staticLogFileName value="true" />
+    <layout type="log4net.Layout.PatternLayout">
+      <conversionPattern value="%date [%thread] %level %logger - %message%newline" />
+    </layout>
+  </appender>
+  <appender name="loki" type="Log4Net.Appender.Loki.LokiAppender, Log4Net.Appender.Grafana.Loki">
+    <Application value="Example" />
+    <Environment value="Development" />
+    <BufferSize value="10" />
+    <ServiceUrl value="" />
+    <BasicAuthUserName value="" />
+    <BasicAuthPassword value="" />
+    <GZipCompression value="true" />
+    <TrustSelfSignedCerts value="false" />
+  </appender>
+</log4net>
diff --git a/Example/Example.csproj b/Example/Example.csproj
@@ -8,9 +8,10 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Example</RootNamespace>
     <AssemblyName>Example</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -21,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -30,13 +32,16 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.8\lib\net40-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -48,15 +53,16 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="log4net.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\log4net.Appender.Loki.csproj">
-      <Project>{d2dd78d6-396a-4f1e-8d5e-0f7d4f8463eb}</Project>
-      <Name>log4net.Appender.Loki</Name>
+    <ProjectReference Include="..\Log4Net.Appender.Grafana.Loki.csproj">
+      <Project>{ecd5cca2-e1c6-4534-8236-c47261118867}</Project>
+      <Name>Log4Net.Appender.Grafana.Loki</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/Example/Program.cs b/Example/Program.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Threading;
 
 namespace Example
@@ -13,7 +10,6 @@ class Program
 
         static void Main(string[] args)
         {
-            // or wherever your file is
             var fileInfo = new FileInfo(AppDomain.CurrentDomain.BaseDirectory + "log4net.config");
             if (fileInfo.Exists)
                 log4net.Config.XmlConfigurator.Configure(fileInfo);
@@ -25,7 +21,11 @@ static void Main(string[] args)
             while (true)
             {
                 Thread.Sleep(2000);
+                logger.Debug($"Log number {count++}");
                 logger.Info($"Log number { count++ }");
+                logger.Warn($"Log number {count++}");
+                logger.Error($"Log number {count++}");
+                logger.Fatal($"Log number {count++}");
             }
         }
     }

diff --git a/app.config → Example/app.config b/app.config → Example/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.2.29.0" newVersion="2.2.29.0" />
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.2.29.0" newVersion="2.2.29.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
diff --git a/Example/log4net.config b/Example/log4net.config
@@ -10,15 +10,8 @@
       <conversionPattern value="%date %level %logger - %message%newline" />
     </layout>
   </appender>
-  <appender name="loki" type="log4net.Appender.LokiAppender, log4net.Appender.Loki">
-    <BufferSize  value="3" />
-    <ServiceUrl value="https://localhost/loki" />
-    <BasicAuthUserName value="username" />
-    <BasicAuthPassword value="password" />
-    <TrustSelfCignedCerts value="false" />
-  </appender>
   <appender name="file" type="log4net.Appender.RollingFileAppender">
-    <file value="myapp.log" />
+    <file value="example.log" />
     <appendToFile value="true" />
     <rollingStyle value="Size" />
     <maxSizeRollBackups value="5" />
@@ -28,4 +21,14 @@
       <conversionPattern value="%date [%thread] %level %logger - %message%newline" />
     </layout>
   </appender>
+  <appender name="loki" type="Log4Net.Appender.Loki.LokiAppender, Log4Net.Appender.Grafana.Loki">
+    <Application value="Example" />
+    <Environment value="Development" />
+    <BufferSize value="10" />
+    <ServiceUrl value="" />
+    <BasicAuthUserName value="" />
+    <BasicAuthPassword value="" />
+    <GZipCompression value="true" />
+    <TrustSelfSignedCerts value="false" />
+  </appender>
 </log4net>
diff --git a/Example/packages.config b/Example/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.8" targetFramework="net40" />
+  <package id="log4net" version="2.0.15" targetFramework="net462" />
 </packages>
diff --git a/Image/loki.png b/Image/loki.png
diff --git a/Log4Net.Appender.Grafana.Loki.csproj b/Log4Net.Appender.Grafana.Loki.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>9.0</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="Example.NetCore\**" />
+    <Compile Remove="Example\**" />
+    <Compile Remove="packages\**" />
+    <EmbeddedResource Remove="Example.NetCore\**" />
+    <EmbeddedResource Remove="Example\**" />
+    <EmbeddedResource Remove="packages\**" />
+    <None Remove="Example.NetCore\**" />
+    <None Remove="Example\**" />
+    <None Remove="packages\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="LICENSE" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="log4net" Version="2.0.15" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+  </ItemGroup>
+
+</Project>
diff --git a/Log4Net.Appender.Grafana.Loki.nuspec b/Log4Net.Appender.Grafana.Loki.nuspec
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package >
+  <metadata>
+    <id>$id$</id>
+    <version>1.0.5</version>
+    <title>$title$</title>
+    <icon>loki.png</icon>
+    <authors>Gabriel Cerutti</authors>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <license type="expression">Apache-2.0</license>
+    <projectUrl>https://github.com/gabrielcerutti/log4net.Appender.Loki</projectUrl>
+    <description>Log4Net buffering appender to send log messages to Grafana Loki directly using latest Loki HTTP API (POST /loki/api/v1/push), JSON format and GZip compression.</description>
+    <!--releaseNotes>Summary of changes made in this release of the package.</releaseNotes-->
+    <copyright>Copyright 2022</copyright>
+    <tags>log4net appender grafana loki</tags>
+    <dependencies>
+      <dependency id="log4net" version="2.0.15" />
+      <dependency id="Newtonsoft.Json" version="13.0.2" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="Image\loki.png" target="" />
+    <file src="README.md" target="docs\" />
+  </files>
+</package>
diff --git a/Loki/Labels.cs b/Loki/Labels.cs
@@ -0,0 +1,28 @@
+namespace Log4Net.Appender.Loki
+{
+    public class LokiLabel
+    {
+        public LokiLabel(string key, string value)
+        {
+            Key = key;
+            Value = value;
+        }
+
+        public string Key { get; }
+
+        public string Value { get; }
+    }
+
+    public class LokiProperty
+    {
+        public LokiProperty(string key, string value)
+        {
+            Key = key;
+            Value = value;
+        }
+
+        public string Key { get; }
+
+        public string Value { get; }
+    }
+}
diff --git a/Loki/Labels/LokiLabel.cs b/Loki/Labels/LokiLabel.cs