Merge branch 'master' of https://github.com/dotnetcore/CAP

# Conflicts:
#	src/DotNetCore.CAP.AzureServiceBus/AzureServiceBusConsumerClient.cs

src/DotNetCore.CAP.AzureServiceBus/AzureServiceBusConsumerClient.cs

@@ -159,7 +159,7 @@ namespace DotNetCore.CAP.AzureServiceBus
 
         private Task OnConsumerReceived(Message message, CancellationToken token)
         {
-            var header = message.UserProperties.ToDictionary(x => x.Key, y => y.Value.ToString());
+            var header = message.UserProperties.ToDictionary(x => x.Key, y => y.Value?.ToString());
             header.Add(Headers.Group, _subscriptionName);
 
             var context = new TransportMessage(header, message.Body);

src/DotNetCore.CAP.Kafka/ITransport.Kafka.cs

@@ -43,7 +43,7 @@ namespace DotNetCore.CAP.Kafka
                 var result = await producer.ProduceAsync(message.GetName(), new Message<string, byte[]>
                 {
                     Headers = headers,
-                    Key = message.GetId(),
+                    Key = message.Headers.TryGetValue(KafkaHeaders.KafkaKey, out string kafkaMessageKey) && !string.IsNullOrEmpty(kafkaMessageKey) ? kafkaMessageKey : message.GetId(),
                     Value = message.Body
                 });
 

src/DotNetCore.CAP.Kafka/KafkaConsumerClient.cs

@@ -62,6 +62,8 @@ namespace DotNetCore.CAP.Kafka
                 }
                 headers.Add(Messages.Headers.Group, _groupId);
 
+                headers.Add(KafkaHeaders.KafkaKey, consumerResult.Key);
+
                 if (_kafkaOptions.CustomHeaders != null)
                 {
                     var customHeaders = _kafkaOptions.CustomHeaders(consumerResult);

src/DotNetCore.CAP.Kafka/KafkaHeaders.cs

@@ -0,0 +1,10 @@
+// Copyright (c) .NET Core Community. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+namespace DotNetCore.CAP.Kafka
+{
+    public static class KafkaHeaders
+    {
+        public const string KafkaKey = "cap-kafka-key";
+    }
+}

src/DotNetCore.CAP.SqlServer/IMonitoringApi.SqlServer.cs

@@ -175,7 +175,7 @@ select count(Id) from {_recName} with (nolock) where StatusName = N'Failed';";
             var sqlQuery2008 = $@"
 with aggr as (
     select replace(convert(varchar, Added, 111), '/','-') + '-' + CONVERT(varchar, DATEPART(hh, Added)) as [Key],
-        count(id) [Count]
+        count(Id) [Count]
     from  {tableName}
     where StatusName = @statusName
     group by replace(convert(varchar, Added, 111), '/','-') + '-' + CONVERT(varchar, DATEPART(hh, Added))
@@ -186,7 +186,7 @@ select [Key], [Count] from aggr with (nolock) where [Key] in @keys;";
             var sqlQuery = $@"
 with aggr as (
     select FORMAT(Added,'yyyy-MM-dd-HH') as [Key],
-        count(id) [Count]
+        count(Id) [Count]
     from  {tableName}
     where StatusName = @statusName
     group by FORMAT(Added,'yyyy-MM-dd-HH')