Skip to content
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.

Sign up for GitHub

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

Changed Timestamp to be a DateTimeOffset #177

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Changed Timestamp to be a DateTimeOffset #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Microsoft.Azure.WebJobs.Extensions.Kafka/IKafkaEventData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ public interface IKafkaEventData
long Offset { get; }
int Partition { get; }
string Topic { get; }
DateTime Timestamp { get; }
DateTimeOffset Timestamp { get; }
}
}
8 changes: 4 additions & 4 deletions src/Microsoft.Azure.WebJobs.Extensions.Kafka/KafkaEventData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class KafkaEventData<TKey, TValue> : IKafkaEventData
public long Offset { get; set; }
public int Partition { get; set; }
public string Topic { get; set; }
public DateTime Timestamp { get; set; }
public DateTimeOffset Timestamp { get; set; }
public TValue Value { get; set; }

object IKafkaEventData.Value => this.Value;
Expand All @@ -35,7 +35,7 @@ public KafkaEventData(ConsumeResult<TKey, TValue> consumeResult)
this.Value = consumeResult.Value;
this.Offset = consumeResult.Offset;
this.Partition = consumeResult.Partition;
this.Timestamp = consumeResult.Timestamp.UtcDateTime;
this.Timestamp = DateTimeOffset.FromUnixTimeMilliseconds(consumeResult.Message.Timestamp.UnixTimestampMs);
this.Topic = consumeResult.Topic;
}
}
Expand All @@ -46,7 +46,7 @@ public class KafkaEventData<TValue> : IKafkaEventData
public long Offset { get; set; }
public int Partition { get; set; }
public string Topic { get; set; }
public DateTime Timestamp { get; set; }
public DateTimeOffset Timestamp { get; set; }
public TValue Value { get; set; }

object IKafkaEventData.Value => this.Value;
Expand All @@ -69,7 +69,7 @@ internal static KafkaEventData<TValue> CreateFrom<TKey>(ConsumeResult<TKey, TVal
Value = consumeResult.Value,
Offset = consumeResult.Offset,
Partition = consumeResult.Partition,
Timestamp = consumeResult.Timestamp.UtcDateTime,
Timestamp = DateTimeOffset.FromUnixTimeMilliseconds(consumeResult.Message.Timestamp.UnixTimestampMs),
Topic = consumeResult.Topic,
};

Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Azure.WebJobs.Extensions.Kafka/Trigger/KafkaTriggerBindingStrategy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public Dictionary<string, Type> GetBindingContract(bool isSingleDispatch = true)
AddBindingContractMember(contract, nameof(KafkaEventData<TKey, TValue>.Key), typeof(object), isSingleDispatch);
AddBindingContractMember(contract, nameof(KafkaEventData<TKey, TValue>.Partition), typeof(int), isSingleDispatch);
AddBindingContractMember(contract, nameof(KafkaEventData<TKey, TValue>.Topic), typeof(string), isSingleDispatch);
AddBindingContractMember(contract, nameof(KafkaEventData<TKey, TValue>.Timestamp), typeof(DateTime), isSingleDispatch);
AddBindingContractMember(contract, nameof(KafkaEventData<TKey, TValue>.Timestamp), typeof(DateTimeOffset), isSingleDispatch);
AddBindingContractMember(contract, nameof(KafkaEventData<TKey, TValue>.Offset), typeof(long), isSingleDispatch);

return contract;
Expand Down Expand Up @@ -86,7 +86,7 @@ internal static void AddBindingData(Dictionary<string, object> bindingData, IKaf
int length = events.Length;
var partitions = new int[length];
var offsets = new long[length];
var timestamps = new DateTime[length];
var timestamps = new DateTimeOffset[length];
var topics = new string[length];
var keys = new object[length];

Expand Down
18 changes: 9 additions & 9 deletions test/Microsoft.Azure.WebJobs.Extensions.Kafka.UnitTests/KafkaTriggerBindingStrategyTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public void GetStaticBindingContract_ReturnsExpectedValue()
Assert.Equal(typeof(object), contract["Key"]);
Assert.Equal(typeof(int), contract["Partition"]);
Assert.Equal(typeof(string), contract["Topic"]);
Assert.Equal(typeof(DateTime), contract["Timestamp"]);
Assert.Equal(typeof(DateTimeOffset), contract["Timestamp"]);
Assert.Equal(typeof(long), contract["Offset"]);
}

Expand All @@ -33,7 +33,7 @@ public void GetBindingContract_SingleDispatch_ReturnsExpectedValue()
Assert.Equal(typeof(object), contract["Key"]);
Assert.Equal(typeof(int), contract["Partition"]);
Assert.Equal(typeof(string), contract["Topic"]);
Assert.Equal(typeof(DateTime), contract["Timestamp"]);
Assert.Equal(typeof(DateTimeOffset), contract["Timestamp"]);
Assert.Equal(typeof(long), contract["Offset"]);
}

Expand All @@ -45,7 +45,7 @@ public void SingleDispatch_GetBindingData_Should_Create_Data_From_Kafka_Event()
Key = "1",
Offset = 100,
Partition = 2,
Timestamp = new DateTime(2019, 1, 10, 9, 21, 0, DateTimeKind.Utc),
Timestamp = new DateTimeOffset(2019, 1, 10, 9, 21, 0, TimeSpan.Zero),
Topic = "myTopic",
Value = "Nothing",
};
Expand All @@ -55,14 +55,14 @@ public void SingleDispatch_GetBindingData_Should_Create_Data_From_Kafka_Event()
Assert.Equal("1", binding["Key"]);
Assert.Equal(100L, binding["Offset"]);
Assert.Equal(2, binding["Partition"]);
Assert.Equal(new DateTime(2019, 1, 10, 9, 21, 0, DateTimeKind.Utc), binding["Timestamp"]);
Assert.Equal(new DateTimeOffset(2019, 1, 10, 9, 21, 0, TimeSpan.Zero), binding["Timestamp"]);
Assert.Equal("myTopic", binding["Topic"]);

// lower case too
Assert.Equal("1", binding["key"]);
Assert.Equal(100L, binding["offset"]);
Assert.Equal(2, binding["partition"]);
Assert.Equal(new DateTime(2019, 1, 10, 9, 21, 0, DateTimeKind.Utc), binding["timestamp"]);
Assert.Equal(new DateTimeOffset(2019, 1, 10, 9, 21, 0, TimeSpan.Zero), binding["timestamp"]);
Assert.Equal("myTopic", binding["topic"]);
}

Expand All @@ -76,7 +76,7 @@ public void MultiDispatch_GetBindingData_Should_Create_Data_From_Kafka_Event()
Key = "1",
Offset = 100,
Partition = 2,
Timestamp = new DateTime(2019, 1, 10, 9, 21, 0, DateTimeKind.Utc),
Timestamp = new DateTimeOffset(2019, 1, 10, 9, 21, 0, TimeSpan.Zero),
Topic = "myTopic",
Value = "Nothing1",
},
Expand All @@ -85,7 +85,7 @@ public void MultiDispatch_GetBindingData_Should_Create_Data_From_Kafka_Event()
Key = "2",
Offset = 101,
Partition = 2,
Timestamp = new DateTime(2019, 1, 10, 9, 21, 1, DateTimeKind.Utc),
Timestamp = new DateTimeOffset(2019, 1, 10, 9, 21, 1, TimeSpan.Zero),
Topic = "myTopic",
Value = "Nothing2",
},
Expand All @@ -96,14 +96,14 @@ public void MultiDispatch_GetBindingData_Should_Create_Data_From_Kafka_Event()
Assert.Equal(new[] { "1", "2" }, binding["KeyArray"]);
Assert.Equal(new[] { 100L, 101L }, binding["OffsetArray"]);
Assert.Equal(new[] { 2, 2 }, binding["PartitionArray"]);
Assert.Equal(new[] { new DateTime(2019, 1, 10, 9, 21, 0, DateTimeKind.Utc), new DateTime(2019, 1, 10, 9, 21, 1, DateTimeKind.Utc) }, binding["TimestampArray"]);
Assert.Equal(new[] { new DateTimeOffset(2019, 1, 10, 9, 21, 0, TimeSpan.Zero), new DateTimeOffset(2019, 1, 10, 9, 21, 1, TimeSpan.Zero) }, binding["TimestampArray"]);
Assert.Equal(new[] { "myTopic", "myTopic" }, binding["TopicArray"]);

// lower case too
Assert.Equal(new[] { "1", "2" }, binding["keyArray"]);
Assert.Equal(new[] { 100L, 101L }, binding["offsetArray"]);
Assert.Equal(new[] { 2, 2 }, binding["partitionArray"]);
Assert.Equal(new[] { new DateTime(2019, 1, 10, 9, 21, 0, DateTimeKind.Utc), new DateTime(2019, 1, 10, 9, 21, 1, DateTimeKind.Utc) }, binding["timestampArray"]);
Assert.Equal(new[] { new DateTimeOffset(2019, 1, 10, 9, 21, 0, TimeSpan.Zero), new DateTimeOffset(2019, 1, 10, 9, 21, 1, TimeSpan.Zero) }, binding["timestampArray"]);
Assert.Equal(new[] { "myTopic", "myTopic" }, binding["topicArray"]);
}
}
Expand Down