Merge branch 'master' into config_restart

Author: Toshad

Cognite.Extensions/CogniteUtils.cs

@@ -7,9 +7,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Cognite.Extensions.DataModels;
+using Cognite.Extensions.DataModels.CogniteExtractorExtensions;
 using Cognite.Extractor.Common;
 using CogniteSdk;
-using CogniteSdk.Alpha;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -665,6 +665,8 @@ public static void AddExtensionLoggers(this IServiceProvider provider)
             EventExtensions.SetLogger(logger);
             SequenceExtensions.SetLogger(logger);
             StreamRecordExtensions.SetLogger(logger);
+            DataModelUtils.SetLogger(logger);
+            DataPointExtensionsWithInstanceId.SetLogger(logger);
         }
     }
 

ExtractorUtils.Test/TestUtilities.cs

@@ -5,6 +5,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Cognite.Extractor.StateStorage;
+using Microsoft.Extensions.Logging;
 using Moq;
 using Moq.Protected;
 using Xunit;
@@ -29,6 +30,24 @@ public static (Mock<IHttpClientFactory> factory, Mock<HttpMessageHandler> handle
         }
     }
 
+#nullable enable
+    public sealed class FakeLogger<T> : ILogger<T>
+    {
+        public List<(LogLevel Level, string Message)> Entries { get; } = new List<(LogLevel Level, string Message)>();
+
+        IDisposable ILogger.BeginScope<TState>(TState state) => NullScope.Instance;
+        bool ILogger.IsEnabled(LogLevel logLevel) => true;
+        void ILogger.Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
+            => Entries.Add((logLevel, formatter(state, exception)));
+
+        private sealed class NullScope : IDisposable
+        {
+            public static readonly NullScope Instance = new NullScope();
+            public void Dispose() { }
+        }
+    }
+#nullable restore
+
     public class DummyExtractionStore : IExtractionStateStore
     {
         public int DeleteRequests { get; private set; }

ExtractorUtils.Test/unit/MetricsTest.cs

@@ -5,11 +5,11 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Moq;
 using Moq.Protected;
 using Prometheus;
 using Xunit;
-using Cognite.Extractor.Logging;
 using Cognite.Extractor.Metrics;
 using Cognite.Extractor.Utils;
 using System.Reflection;
@@ -245,6 +245,65 @@ public async Task TestMultipeGatewaysAsync()
             File.Delete(path);
         }
 
+        [Fact]
+        public async Task TestRetryPolicyRetriesOnTransientErrorAsync()
+        {
+            Metrics.SuppressDefaultMetrics();
+            var callCount = 0;
+            var (provider, logger) = BuildRetryTestServices((request, token) =>
+            {
+                var status = callCount++ == 0 ? HttpStatusCode.ServiceUnavailable : HttpStatusCode.OK;
+                return Task.FromResult(new HttpResponseMessage(status));
+            });
+
+            using (provider)
+                await provider.GetRequiredService<IHttpClientFactory>()
+                    .CreateClient("prometheus-httpclient").GetAsync("http://example.com/test");
+
+            Assert.Equal(2, callCount);
+            Assert.Contains(logger.Entries, e => e.Level == LogLevel.Warning && e.Message.Contains("failed with status code"));
+        }
+
+        [Fact]
+        public async Task TestRetryPolicyRetriesOnExceptionAsync()
+        {
+            Metrics.SuppressDefaultMetrics();
+            var callCount = 0;
+            var (provider, logger) = BuildRetryTestServices((request, token) =>
+            {
+                if (callCount++ == 0)
+                    throw new HttpRequestException("connection failed", new Exception("inner failure"));
+                return Task.FromResult(new HttpResponseMessage(HttpStatusCode.OK));
+            });
+
+            using (provider)
+                await provider.GetRequiredService<IHttpClientFactory>()
+                    .CreateClient("prometheus-httpclient").GetAsync("http://example.com/test");
+
+            Assert.Equal(2, callCount);
+            Assert.Contains(logger.Entries, e => e.Level == LogLevel.Warning && e.Message.Contains("connection failed"));
+            Assert.Contains(logger.Entries, e => e.Level == LogLevel.Debug && e.Message.Contains("inner failure"));
+        }
+
+        private (ServiceProvider provider, FakeLogger<MetricServer> logger) BuildRetryTestServices(
+            Func<HttpRequestMessage, CancellationToken, Task<HttpResponseMessage>> handler)
+        {
+            var fakeLogger = new FakeLogger<MetricServer>();
+            var services = new ServiceCollection();
+            services.AddTestLogging(_output);
+            services.AddSingleton<ILogger<MetricServer>>(fakeLogger);
+            services.AddCogniteMetrics();
+            services.AddHttpClient("prometheus-httpclient")
+                .ConfigurePrimaryHttpMessageHandler(() => new TestHttpHandler(handler));
+            return (services.BuildServiceProvider(), fakeLogger);
+        }
+
+        private sealed class TestHttpHandler(Func<HttpRequestMessage, CancellationToken, Task<HttpResponseMessage>> handler) : HttpMessageHandler
+        {
+            protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+                => handler(request, cancellationToken);
+        }
+
         [Fact]
         public void TestVersion()
         {
@@ -257,5 +316,6 @@ public void TestVersion()
             // Assert.False(string.IsNullOrWhiteSpace(desc));
             // Assert.NotEqual(version.Trim(), desc.Trim());
         }
+
     }
 }

version

@@ -1 +1 @@
-1.40.0
+1.41.0