Merge branch '1.0.x'

mhowlett · mhowlett · commit 91d71ec8487a · 2019-05-28T15:13:37.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# 1.0.1
+
+## Enhancements
+
+- Support for Alpine Linux.
+- New LogLevelType enum and functions to convert between different log level type levels.
+- Added netstandard20 as a target.
+- References librdkafka [1.0.1](https://github.com/edenhill/librdkafka/releases/tag/v1.0.1).
+
+
 # 1.0.0
 
 ## Summary
diff --git a/README.md b/README.md
@@ -35,20 +35,20 @@ client. Thanks Andreas!
 
 confluent-kafka-dotnet is distributed via NuGet. We provide three packages:
 
-- [Confluent.Kafka](https://www.nuget.org/packages/Confluent.Kafka/) *[net45, netstandard1.3]* - The core client library.
+- [Confluent.Kafka](https://www.nuget.org/packages/Confluent.Kafka/) *[net45, netstandard1.3, netstandard2.0]* - The core client library.
 - [Confluent.SchemaRegistry.Serdes](https://www.nuget.org/packages/Confluent.SchemaRegistry.Serdes/) *[net452, netstandard2.0]* - Provides a serializer and deserializer for working with Avro serialized data with Confluent Schema Registry integration.
-- [Confluent.SchemaRegistry](https://www.nuget.org/packages/Confluent.SchemaRegistry/) *[net452, netstandard1.4]* - Confluent Schema Registry client (a dependency of Confluent.SchemaRegistry.Serdes).
+- [Confluent.SchemaRegistry](https://www.nuget.org/packages/Confluent.SchemaRegistry/) *[net452, netstandard1.4, netstandard2.0]* - Confluent Schema Registry client (a dependency of Confluent.SchemaRegistry.Serdes).
 
 To install Confluent.Kafka from within Visual Studio, search for Confluent.Kafka in the NuGet Package Manager UI, or run the following command in the Package Manager Console:
 
 ```
-Install-Package Confluent.Kafka -Version 1.0.0
+Install-Package Confluent.Kafka -Version 1.0.1
 ```
 
 To add a reference to a dotnet core project, execute the following at the command line:
 
 ```
-dotnet add package -v 1.0.0 Confluent.Kafka
+dotnet add package -v 1.0.1 Confluent.Kafka
 ```
 
 
diff --git a/examples/AdminClient/AdminClient.csproj b/examples/AdminClient/AdminClient.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.0.0" /> -->
+    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.0.1" /> -->
     <ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
   </ItemGroup>
 
diff --git a/examples/AvroBlogExamples/AvroBlogExamples.csproj b/examples/AvroBlogExamples/AvroBlogExamples.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.0.0" /> -->
+    <!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.0.1" /> -->
     <ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes/Confluent.SchemaRegistry.Serdes.csproj" />
   </ItemGroup>
 
diff --git a/examples/AvroGeneric/AvroGeneric.csproj b/examples/AvroGeneric/AvroGeneric.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.0.0" /> -->
+    <!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.0.1" /> -->
     <ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes/Confluent.SchemaRegistry.Serdes.csproj" />
   </ItemGroup>
 
diff --git a/examples/AvroSpecific/AvroSpecific.csproj b/examples/AvroSpecific/AvroSpecific.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.0.0" /> -->
+    <!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes" Version="1.0.1" /> -->
     <ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes/Confluent.SchemaRegistry.Serdes.csproj" />
   </ItemGroup>
 
diff --git a/examples/AvroSpecific/Program.cs b/examples/AvroSpecific/Program.cs
@@ -96,7 +96,7 @@ static async Task Main(string[] args)
                             {
                                 var consumeResult = consumer.Consume(cts.Token);
 
-                                Console.WriteLine($"user key name: {consumeResult.Message.Key}, user value favorite color: {consumeResult.Value.favorite_color}");
+                                Console.WriteLine($"user name: {consumeResult.Message.Key}, favorite color: {consumeResult.Value.favorite_color}");
                             }
                             catch (ConsumeException e)
                             {
diff --git a/examples/ConfluentCloud/ConfluentCloud.csproj b/examples/ConfluentCloud/ConfluentCloud.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.0.0" /> -->
+    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.0.1" /> -->
     <ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
   </ItemGroup>
 
diff --git a/examples/Consumer/Consumer.csproj b/examples/Consumer/Consumer.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.0.0" /> -->
+    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.0.1" /> -->
     <ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
   </ItemGroup>
 
diff --git a/examples/MultiProducer/MultiProducer.csproj b/examples/MultiProducer/MultiProducer.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.0.0" /> -->
+    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.0.1" /> -->
     <ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
   </ItemGroup>
 
diff --git a/examples/Producer/Producer.csproj b/examples/Producer/Producer.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.0.0" /> -->
+    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.0.1" /> -->
     <ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
   </ItemGroup>
   
diff --git a/examples/Protobuf/Protobuf.csproj b/examples/Protobuf/Protobuf.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.0.0" /> -->
+    <!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.0.1" /> -->
     <ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
     <PackageReference Include="Grpc.Tools" Version="1.16.0" />
     <PackageReference Include="Google.Protobuf" Version="3.6.1" />
diff --git a/src/Confluent.Kafka/Confluent.Kafka.csproj b/src/Confluent.Kafka/Confluent.Kafka.csproj
@@ -12,14 +12,14 @@
     <PackageId>Confluent.Kafka</PackageId>
     <Title>Confluent.Kafka</Title>
     <AssemblyName>Confluent.Kafka</AssemblyName>
-    <VersionPrefix>1.0.0</VersionPrefix>
-    <TargetFrameworks>net45;net46;netcoreapp2.1;netstandard1.3;</TargetFrameworks>
+    <VersionPrefix>1.0.1</VersionPrefix>
+    <TargetFrameworks>net45;net46;netcoreapp2.1;netstandard1.3;netstandard2.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="librdkafka.redist" Version="1.0.0">
+    <PackageReference Include="librdkafka.redist" Version="1.0.1">
         <PrivateAssets Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">None</PrivateAssets>
     </PackageReference>
     <PackageReference Include="System.Memory" Version="4.5.0" />
diff --git a/src/Confluent.Kafka/Consumer.cs b/src/Confluent.Kafka/Consumer.cs
@@ -643,7 +643,7 @@ internal Consumer(ConsumerBuilder<TKey, TValue> builder)
                 if (!defaultDeserializers.TryGetValue(typeof(TValue), out object deserializer))
                 {
                     throw new InvalidOperationException(
-                        $"Value deserializer was not specified and there is no default deserializer defined for type {typeof(TKey).Name}.");
+                        $"Value deserializer was not specified and there is no default deserializer defined for type {typeof(TValue).Name}.");
                 }
                 this.valueDeserializer = (IDeserializer<TValue>)deserializer;
             }
diff --git a/src/Confluent.Kafka/LogLevelType.cs b/src/Confluent.Kafka/LogLevelType.cs
@@ -0,0 +1,41 @@
+// Copyright 2019 Confluent Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Refer to LICENSE for more information.
+
+
+namespace Confluent.Kafka
+{
+    /// <summary>
+    ///     Enumerates different log level enumerations.
+    /// </summary>
+    public enum LogLevelType
+    {
+        /// <summary>
+        ///     Confluent.Kafka.SysLogLevel (severity
+        ///     levels correspond to syslog)
+        /// </summary>
+        SysLogLevel = 1,
+
+        /// <summary>
+        ///     Microsoft.Extensions.Logging.LogLevel
+        /// </summary>
+        MicrosoftExtensionsLogging = 2,
+
+        /// <summary>
+        ///     System.Diagnostics.TraceLevel
+        /// </summary>
+        SystemDiagnostics = 3
+    }
+}
diff --git a/src/Confluent.Kafka/LogMessage.cs b/src/Confluent.Kafka/LogMessage.cs
@@ -16,6 +16,8 @@
 //
 // Refer to LICENSE for more information.
 
+using System;
+
 
 namespace Confluent.Kafka
 {
@@ -67,5 +69,57 @@ public LogMessage(string name, SyslogLevel level, string facility, string messag
         ///     Gets the log message.
         /// </summary>
         public string Message { get; }
+
+        
+        // SysLog levels:
+        // [0] emergency, [1] alert, [2] critical, [3] error, [4] warning, [5] notice, [6] info, [7] debug.
+
+        private static int[] SystemDiagnosticsLevelLookup = new int[]
+        {
+            // System.Diagnostics.TraceLevel: [0] Off, [1] Error, [2] Warning, [3] Info, [4] Verbose
+
+            1, // emergency -> error
+            1, // alert -> error
+            1, // critical -> error
+            1, // error -> error
+            2, // warning -> warning
+            3, // notice -> info
+            3, // info -> info
+            4  // debug -> verbose
+        };
+
+        private static int[] MicrosoftExtensionsLoggingLevelLookup = new int[]
+        {
+            // Microsoft.Extensions.Logging.LogLevel: [0] Trace, [1] Debug, [2] Information, [3] Warning, [4] Error, [5] Critical, [6] None
+
+            5, // emergency -> critical
+            5, // alert -> critical
+            5, // critical -> critical
+            4, // error -> error
+            3, // warning -> warning
+            2, // notice -> information
+            2, // info -> information
+            1, // debug -> debug
+        };
+
+        /// <summary>
+        ///     Convert the syslog message severity
+        ///     level to correspond to the values of
+        ///     a different log level enumeration type.
+        /// </summary>
+        public int LevelAs(LogLevelType type)
+        {
+            switch (type)
+            {
+                case LogLevelType.SysLogLevel:
+                    return (int)Level;
+                case LogLevelType.MicrosoftExtensionsLogging:
+                    return MicrosoftExtensionsLoggingLevelLookup[(int)Level];
+                case LogLevelType.SystemDiagnostics:
+                    return SystemDiagnosticsLevelLookup[(int)Level];
+                default:
+                    throw new ArgumentException($"Unexpected log level type: {type}");
+            }
+        }
     }
 }
diff --git a/src/Confluent.Kafka/Producer.cs b/src/Confluent.Kafka/Producer.cs
@@ -459,7 +459,7 @@ private void InitializeSerializers(
                 if (!defaultSerializers.TryGetValue(typeof(TValue), out object serializer))
                 {
                     throw new ArgumentNullException(
-                        $"Value serializer not specified and there is no default serializer defined for type {typeof(TKey).Name}.");
+                        $"Value serializer not specified and there is no default serializer defined for type {typeof(TValue).Name}.");
                 }
                 this.valueSerializer = (ISerializer<TValue>)serializer;
             }
diff --git a/src/Confluent.SchemaRegistry.Serdes/Confluent.SchemaRegistry.Serdes.csproj b/src/Confluent.SchemaRegistry.Serdes/Confluent.SchemaRegistry.Serdes.csproj
@@ -13,7 +13,7 @@
     <PackageId>Confluent.SchemaRegistry.Serdes</PackageId>
     <Title>Confluent.SchemaRegistry.Serdes</Title>
     <AssemblyName>Confluent.SchemaRegistry.Serdes</AssemblyName>
-    <VersionPrefix>1.0.0</VersionPrefix>
+    <VersionPrefix>1.0.1</VersionPrefix>
     <TargetFrameworks>netstandard2.0;net452;</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj b/src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj
@@ -13,8 +13,8 @@
     <PackageId>Confluent.SchemaRegistry</PackageId>
     <Title>Confluent.SchemaRegistry</Title>
     <AssemblyName>Confluent.SchemaRegistry</AssemblyName>
-    <VersionPrefix>1.0.0</VersionPrefix>
-    <TargetFrameworks>net452;netstandard1.4;</TargetFrameworks>
+    <VersionPrefix>1.0.1</VersionPrefix>
+    <TargetFrameworks>net452;netstandard1.4;netstandard2.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
diff --git a/test/Confluent.Kafka.StrongName.UnitTests/Confluent.Kafka.StrongName.UnitTests.csproj b/test/Confluent.Kafka.StrongName.UnitTests/Confluent.Kafka.StrongName.UnitTests.csproj
@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="librdkafka.redist" Version="1.0.0" />
+    <PackageReference Include="librdkafka.redist" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Confluent.Kafka.UnitTests/LogMessage.cs b/test/Confluent.Kafka.UnitTests/LogMessage.cs
@@ -15,6 +15,7 @@
 // Refer to LICENSE for more information.
 
 using Xunit;
+using System.Diagnostics;
 
 
 namespace Confluent.Kafka.UnitTests
@@ -30,5 +31,52 @@ public void Constuctor()
             Assert.Equal("myfacility", lm.Facility);
             Assert.Equal("mymessage", lm.Message);
         }
+
+        [Fact]
+        public void SystemDiagnosticsConvert()
+        {
+            var lm = new LogMessage("name", SyslogLevel.Emergency, "facility", "message");
+            Assert.Equal((int)TraceLevel.Error, lm.LevelAs(LogLevelType.SystemDiagnostics));
+            lm = new LogMessage("name", SyslogLevel.Alert, "facility", "message");
+            Assert.Equal((int)TraceLevel.Error, lm.LevelAs(LogLevelType.SystemDiagnostics));
+            lm = new LogMessage("name", SyslogLevel.Critical, "facility", "message");
+            Assert.Equal((int)TraceLevel.Error, lm.LevelAs(LogLevelType.SystemDiagnostics));
+            lm = new LogMessage("name", SyslogLevel.Error, "facility", "message");
+            Assert.Equal((int)TraceLevel.Error, lm.LevelAs(LogLevelType.SystemDiagnostics));
+            lm = new LogMessage("name", SyslogLevel.Warning, "facility", "message");
+            Assert.Equal((int)TraceLevel.Warning, lm.LevelAs(LogLevelType.SystemDiagnostics));
+            lm = new LogMessage("name", SyslogLevel.Notice, "facility", "message");
+            Assert.Equal((int)TraceLevel.Info, lm.LevelAs(LogLevelType.SystemDiagnostics));
+            lm = new LogMessage("name", SyslogLevel.Info, "facility", "message");
+            Assert.Equal((int)TraceLevel.Info, lm.LevelAs(LogLevelType.SystemDiagnostics));
+            lm = new LogMessage("name", SyslogLevel.Debug, "facility", "message");
+            Assert.Equal((int)TraceLevel.Verbose, lm.LevelAs(LogLevelType.SystemDiagnostics));
+        }
+
+        [Fact]
+        public void MicrosoftExtensionsLogging()
+        {
+            // Microsoft.Extensions.Logging.LogLevel: [0] Trace, [1] Debug, [2] Information, [3] Warning, [4] Error, [5] Critical, [6] None
+            // Note: Package containing Microsoft.Extensions.Logging.LogLevel is not referenced
+            //       so as to retain compatibility with net452.
+
+            var lm = new LogMessage("name", SyslogLevel.Emergency, "facility", "message");
+            Assert.Equal(5, lm.LevelAs(LogLevelType.MicrosoftExtensionsLogging));
+            lm = new LogMessage("name", SyslogLevel.Alert, "facility", "message");
+            Assert.Equal(5, lm.LevelAs(LogLevelType.MicrosoftExtensionsLogging));
+            lm = new LogMessage("name", SyslogLevel.Critical, "facility", "message");
+            Assert.Equal(5, lm.LevelAs(LogLevelType.MicrosoftExtensionsLogging));
+            lm = new LogMessage("name", SyslogLevel.Error, "facility", "message");
+            Assert.Equal(4, lm.LevelAs(LogLevelType.MicrosoftExtensionsLogging));
+            lm = new LogMessage("name", SyslogLevel.Warning, "facility", "message");
+            Assert.Equal(3, lm.LevelAs(LogLevelType.MicrosoftExtensionsLogging));
+            lm = new LogMessage("name", SyslogLevel.Notice, "facility", "message");
+            Assert.Equal(2, lm.LevelAs(LogLevelType.MicrosoftExtensionsLogging));
+            lm = new LogMessage("name", SyslogLevel.Info, "facility", "message");
+            Assert.Equal(2, lm.LevelAs(LogLevelType.MicrosoftExtensionsLogging));
+            lm = new LogMessage("name", SyslogLevel.Debug, "facility", "message");
+            Assert.Equal(1, lm.LevelAs(LogLevelType.MicrosoftExtensionsLogging));
+        }
+
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ static async Task Main(string[] args)`
`96`	`96`	`{`
`97`	`97`	`var consumeResult = consumer.Consume(cts.Token);`
`98`	`98`
`99`		`- Console.WriteLine($"user key name: {consumeResult.Message.Key}, user value favorite color: {consumeResult.Value.favorite_color}");`
	`99`	`+ Console.WriteLine($"user name: {consumeResult.Message.Key}, favorite color: {consumeResult.Value.favorite_color}");`
`100`	`100`	`}`
`101`	`101`	`catch (ConsumeException e)`
`102`	`102`	`{`