Skip to content

Commit f648537

Browse files
pakrympakrym
authored
Try to fix Monitor Query tests hangs again (Azure#24345)
1 parent 769425d commit f648537

File tree

7 files changed

+62
-39
lines changed

7 files changed

+62
-39
lines changed

‎sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Integration.Tests/FunctionalTests/AzureMonitorLogExporterLiveTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public class AzureMonitorLogExporterLiveTests : AzureMonitorTestBase
2222
public AzureMonitorLogExporterLiveTests(bool isAsync) : base(isAsync) { }
2323

2424
[RecordedTest]
25+
[PlaybackOnly("https://github.com/Azure/azure-sdk-for-net/issues/24360")]
2526
public async Task VerifyLogExporter()
2627
{
2728
// SETUP

‎sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Integration.Tests/OpenTelemetryTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public OpenTelemetryTests(OpenTelemetryWebApplicationFactory<AspNetCoreWebApp.St
2727
/// This test validates that when an app instrumented with the AzureMonitorExporter receives an HTTP request,
2828
/// A TelemetryItem is created matching that request.
2929
/// </summary>
30-
[Fact]
30+
[Fact(Skip = "https://github.com/Azure/azure-sdk-for-net/issues/24362")]
3131
public async Task ProofOfConcept()
3232
{
3333
string testValue = Guid.NewGuid().ToString();

‎sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/tests/Integration.Tests/TelemetryItemTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void VerifyActivity(ActivityKind activityKind)
6565
});
6666
}
6767

68-
[Theory]
68+
[Theory(Skip = "https://github.com/Azure/azure-sdk-for-net/issues/24372")]
6969
[InlineData(LogLevel.Information, "Information")]
7070
[InlineData(LogLevel.Warning, "Warning")]
7171
[InlineData(LogLevel.Error, "Error")]

‎sdk/monitor/Azure.Monitor.Query/tests/LogsQueryClientClientLiveTests.cs‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -626,18 +626,31 @@ public async Task CanSetServiceTimeout()
626626
{
627627
await client.QueryWorkspaceAsync(TestEnvironment.WorkspaceId, $"range x from 1 to {cnt} step 1 | count", _logsTestData.DataTimeRange, options: new LogsQueryOptions()
628628
{
629-
ServerTimeout = TimeSpan.FromSeconds(1),
630-
AllowPartialErrors = false
629+
ServerTimeout = TimeSpan.FromSeconds(1)
631630
});
632631
}
633632
catch (AggregateException)
634633
{
635634
// The client cancelled, retry.
636635
continue;
637636
}
637+
catch (TaskCanceledException)
638+
{
639+
// The client cancelled, retry.
640+
continue;
641+
}
638642
catch (RequestFailedException exception)
639643
{
640-
Assert.AreEqual(504, exception.Status);
644+
// Cancellation can be observed as either 504 response code from the gateway
645+
// or a partial failure 200 response
646+
if (exception.Status == 200)
647+
{
648+
StringAssert.Contains("Query cancelled by the user's request", exception.Message);
649+
}
650+
else
651+
{
652+
Assert.AreEqual(504, exception.Status);
653+
}
641654
return;
642655
}
643656
}

‎sdk/monitor/Azure.Monitor.Query/tests/LogsQueryClientSamples.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ namespace Azure.Monitor.Query.Tests
1515
public class LogsQueryClientSamples: SamplesBase<MonitorQueryTestEnvironment>
1616
{
1717
[Test]
18+
[Explicit]
1819
public async Task QueryLogsAsTable()
1920
{
2021
#region Snippet:QueryLogsAsTable
@@ -42,6 +43,7 @@ public async Task QueryLogsAsTable()
4243
}
4344

4445
[Test]
46+
[Explicit]
4547
public async Task QueryLogsAsTablePrintAll()
4648
{
4749
#region Snippet:QueryLogsPrintTable
@@ -82,6 +84,7 @@ public async Task QueryLogsAsTablePrintAll()
8284
}
8385

8486
[Test]
87+
[Explicit]
8588
public async Task QueryLogsAsPrimitive()
8689
{
8790
#region Snippet:QueryLogsAsPrimitive
@@ -111,6 +114,7 @@ public async Task QueryLogsAsPrimitive()
111114
}
112115

113116
[Test]
117+
[Explicit]
114118
public async Task QueryLogsAsModels()
115119
{
116120
#region Snippet:QueryLogsAsModels
@@ -139,6 +143,7 @@ public async Task QueryLogsAsModels()
139143
}
140144

141145
[Test]
146+
[Explicit]
142147
public async Task BatchQuery()
143148
{
144149
#region Snippet:BatchQuery
@@ -181,6 +186,7 @@ public async Task BatchQuery()
181186
}
182187

183188
[Test]
189+
[Explicit]
184190
public async Task QueryLogsWithTimeout()
185191
{
186192
#region Snippet:QueryLogsWithTimeout
@@ -211,6 +217,7 @@ public async Task QueryLogsWithTimeout()
211217
}
212218

213219
[Test]
220+
[Explicit]
214221
public async Task QueryLogsWithAdditionalWorkspace()
215222
{
216223
#region Snippet:QueryLogsWithAdditionalWorkspace
@@ -243,6 +250,7 @@ public async Task QueryLogsWithAdditionalWorkspace()
243250
}
244251

245252
[Test]
253+
[Explicit]
246254
public async Task BadRequest()
247255
{
248256
#region Snippet:BadRequest

‎sdk/monitor/Azure.Monitor.Query/tests/MetricsQueryClientLiveTests.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -258,11 +258,6 @@ public async Task CanListNamespacesMetrics()
258258
ns.Name == "Microsoft.OperationalInsights-workspaces" &&
259259
ns.Type == "Microsoft.Insights/metricNamespaces" &&
260260
ns.FullyQualifiedName == "Microsoft.OperationalInsights/workspaces"));
261-
262-
Assert.True(results.Any(ns =>
263-
ns.Name == "Cows" &&
264-
ns.Type == "Microsoft.Insights/metricNamespaces" &&
265-
ns.FullyQualifiedName == "Cows"));
266261
}
267262
}
268263
}

‎sdk/monitor/Azure.Monitor.Query/tests/MetricsTestData.cs‎

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,15 @@ public MetricsTestData(MonitorQueryTestEnvironment environment, DateTimeOffset d
2929
{
3030
_testEnvironment = environment;
3131

32-
var recordingUtcNow = dateTimeOffset;
32+
// The service allows metrics sent maximum 4 minutes into the future
33+
var maxTimeInTheFuture = dateTimeOffset.AddMinutes(4);
3334
// Snap to 15 minute intervals
34-
StartTime = recordingUtcNow.AddTicks(- (Duration.Ticks + recordingUtcNow.Ticks % Duration.Ticks));
35+
StartTime = dateTimeOffset.AddTicks(- (dateTimeOffset.Ticks % Duration.Ticks));
36+
// Back off until we are in the allowed range
37+
while (StartTime + Duration > maxTimeInTheFuture)
38+
{
39+
StartTime -= Duration;
40+
}
3541

3642
MetricName = "CowsHappiness";
3743
MetricNamespace = "Cows";
@@ -66,7 +72,7 @@ private async Task Initialize()
6672
Diagnostics = { IsLoggingContentEnabled = true }
6773
});
6874

69-
do
75+
while (!await MetricsPropagated(metricClient))
7076
{
7177
// Stop sending when we are past the allowed threshold
7278
if (DateTimeOffset.UtcNow - StartTime < AllowedMetricAge)
@@ -75,7 +81,7 @@ private async Task Initialize()
7581
}
7682

7783
await Task.Delay(TimeSpan.FromSeconds(5));
78-
} while (!await MetricsPropagated(metricClient));
84+
}
7985
}
8086

8187
private async Task SendData(MetricsSenderClient senderClient)
@@ -100,40 +106,40 @@ private async Task SendData(MetricsSenderClient senderClient)
100106

101107
private async Task<bool> MetricsPropagated(MetricsQueryClient metricQueryClient)
102108
{
103-
var nsExists = (await metricQueryClient.GetMetricNamespacesAsync(_testEnvironment.MetricsResource).ToEnumerableAsync()).Any(ns => ns.Name == MetricNamespace);
104-
105-
if (!nsExists)
109+
try
106110
{
107-
return false;
108-
}
111+
var metrics = await metricQueryClient.QueryResourceAsync(_testEnvironment.MetricsResource, new[] {MetricName},
112+
new MetricsQueryOptions()
113+
{
114+
TimeRange = new QueryTimeRange(StartTime, Duration),
115+
MetricNamespace = MetricNamespace,
116+
Granularity = TimeSpan.FromMinutes(1),
117+
Aggregations =
118+
{
119+
MetricAggregationType.Count
120+
}
121+
});
122+
123+
var timeSeries = metrics.Value.Metrics[0].TimeSeries.FirstOrDefault();
124+
if (timeSeries == null)
125+
{
126+
return false;
127+
}
109128

110-
var metrics = await metricQueryClient.QueryResourceAsync(_testEnvironment.MetricsResource, new[] {MetricName},
111-
new MetricsQueryOptions()
129+
foreach (var data in timeSeries.Values)
112130
{
113-
TimeRange = new QueryTimeRange(StartTime, Duration),
114-
MetricNamespace = MetricNamespace,
115-
Granularity = TimeSpan.FromMinutes(1),
116-
Aggregations =
131+
if (data.Count == null)
117132
{
118-
MetricAggregationType.Count
133+
return false;
119134
}
120-
});
135+
}
121136

122-
var timeSeries = metrics.Value.Metrics[0].TimeSeries.FirstOrDefault();
123-
if (timeSeries == null)
124-
{
125-
return false;
137+
return true;
126138
}
127-
128-
foreach (var data in timeSeries.Values)
139+
catch (RequestFailedException e) when (e.ErrorCode == "BadRequest")
129140
{
130-
if (data.Count == null)
131-
{
132-
return false;
133-
}
141+
return false;
134142
}
135-
136-
return true;
137143
}
138144

139145
private record MetricDataDocument(DateTimeOffset time, MetricData data);

0 commit comments

Comments
 (0)