Merge branch 'main' into 525_warn-on-mismatch-between-app-and-schema-versions

Author: waldekmastykarz

dev-proxy-plugins/Inspection/OpenAITelemetryPlugin.cs

@@ -136,6 +136,12 @@ private async Task OnRequestAsync(object sender, ProxyRequestArgs e)
     {
         Logger.LogTrace("OnRequestAsync() called");
 
+        if (UrlsToWatch is null || !e.HasRequestUrlMatch(UrlsToWatch))
+        {
+            Logger.LogRequest("URL not matched", MessageType.Skipped, new LoggingContext(e.Session));
+            return;
+        }
+
         var request = e.Session.HttpClient.Request;
         if (request.Method is null ||
             !request.Method.Equals("POST", StringComparison.OrdinalIgnoreCase) ||

dev-proxy-plugins/Mocks/OpenAIMockResponsePlugin.cs

@@ -34,15 +34,16 @@ public override async Task RegisterAsync()
 
     private async Task OnRequestAsync(object sender, ProxyRequestArgs e)
     {
-        if (e.ResponseState.HasBeenSet)
+        if (UrlsToWatch is null ||
+            !e.HasRequestUrlMatch(UrlsToWatch))
         {
-            Logger.LogRequest("Response already set", MessageType.Skipped, new LoggingContext(e.Session));
+            Logger.LogRequest("URL not matched", MessageType.Skipped, new LoggingContext(e.Session));
             return;
         }
-        if (UrlsToWatch is null ||
-            !e.ShouldExecute(UrlsToWatch))
+
+        if (e.ResponseState.HasBeenSet)
         {
-            Logger.LogRequest("URL not matched", MessageType.Skipped, new LoggingContext(e.Session));
+            Logger.LogRequest("Response already set", MessageType.Skipped, new LoggingContext(e.Session));
             return;
         }