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

Azure.Monitor.Query: invalid date string format in MetricsClient #45998

Merged
merged 16 commits into from
Oct 8, 2024
Merged

Azure.Monitor.Query: invalid date string format in MetricsClient #45998

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
637b2f9
fixed string format
Sep 17, 2024
fa7a540
Fixed a test
Sep 17, 2024
87c3f7a
small fix
Sep 17, 2024
8729815
Fix MetricsClient tests
nisha-bhatia Oct 1, 2024
01c9071
Merge remote-tracking branch 'upstream/main' into wps0/40047-time-ran…
nisha-bhatia Oct 1, 2024
ecb48a8
add tests per scenario
nisha-bhatia Oct 1, 2024
7dff003
update Changelog
nisha-bhatia Oct 1, 2024
a231d6e
Update assets.json
nisha-bhatia Oct 1, 2024
0867d1e
restore Bicep
nisha-bhatia Oct 2, 2024
dcaa462
wip
nisha-bhatia Oct 3, 2024
9421168
Update MetricsClientLiveTests.cs
nisha-bhatia Oct 3, 2024
7868586
Update assets.json
nisha-bhatia Oct 3, 2024
1c66738
remove duration from options
nisha-bhatia Oct 7, 2024
bb49917
merge
nisha-bhatia Oct 7, 2024
91aea76
update exception to message
nisha-bhatia Oct 8, 2024
1e6be51
update recordings
nisha-bhatia Oct 8, 2024
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
8 changes: 6 additions & 2 deletions sdk/monitor/Azure.Monitor.Query/src/MetricsClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,12 @@ private async Task<Response<MetricsQueryResourcesResult>> ExecuteBatchAsync(IEnu
{
if (options.TimeRange != null)
{
startTime = options.TimeRange.Value.Start.ToString();
endTime = options.TimeRange.Value.End.ToString();
DateTimeOffset? startTimeDto = options.TimeRange.Value.Start;
DateTimeOffset? endTimeDto = options.TimeRange.Value.End;
TimeSpan duration = options.TimeRange.Value.Duration;

startTime = startTimeDto.ToIsoString() ?? endTimeDto?.Subtract(duration).ToIsoString();
endTime = endTimeDto.ToIsoString() ?? startTimeDto?.Add(duration).ToIsoString();
}
aggregations = MetricsClientExtensions.CommaJoin(options.Aggregations);
top = options.Size;
Expand Down
16 changes: 16 additions & 0 deletions sdk/monitor/Azure.Monitor.Query/src/MetricsClientExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using Azure.Monitor.Query.Models;
Expand Down Expand Up @@ -51,5 +52,20 @@ internal static IList<string> CommaSplit(string value) =>
new List<string>() :
// TODO: #10600 - Verify we don't need to worry about escaping
new List<string>(value.Split(','));

internal static string ToIsoString(this DateTimeOffset value)
nisha-bhatia marked this conversation as resolved.
Show resolved Hide resolved
{
if (value.Offset == TimeSpan.Zero)
{
// Some Azure service required 0-offset dates to be formatted without the
// -00:00 part
const string roundtripZFormat = "yyyy-MM-ddTHH:mm:ss.fffffffZ";
return value.ToString(roundtripZFormat, CultureInfo.InvariantCulture);
}

return value.ToString("O", CultureInfo.InvariantCulture);
}

internal static string ToIsoString(this DateTimeOffset? value) => value?.ToIsoString();
}
}
18 changes: 2 additions & 16 deletions sdk/monitor/Azure.Monitor.Query/src/QueryTimeRange.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Licensed under the MIT License.

using System;
using System.Globalization;
using System.Xml;
using Azure.Core;

Expand Down Expand Up @@ -105,21 +104,8 @@ public override string ToString()

internal string ToIsoString()
{
string ToString(DateTimeOffset value)
{
if (value.Offset == TimeSpan.Zero)
{
// Some Azure service required 0-offset dates to be formatted without the
// -00:00 part
const string roundtripZFormat = "yyyy-MM-ddTHH:mm:ss.fffffffZ";
return value.ToString(roundtripZFormat, CultureInfo.InvariantCulture);
}

return value.ToString("O", CultureInfo.InvariantCulture);
}

var startTime = Start != null ? ToString(Start.Value) : null;
var endTime = End != null ? ToString(End.Value) : null;
var startTime = Start.ToIsoString();
var endTime = End.ToIsoString();
var duration = XmlConvert.ToString(Duration);

switch (startTime, endTime, duration)
Expand Down