Merge to master

Cosmonaut.ApplicationInsights/AppInsightsTelemetryModule.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Tracing;
+using System.Threading;
+using Cosmonaut.Diagnostics;
+using Microsoft.ApplicationInsights;
+using Microsoft.ApplicationInsights.DataContracts;
+using Microsoft.ApplicationInsights.Extensibility;
+
+namespace Cosmonaut.ApplicationInsights
+{
+    public sealed class AppInsightsTelemetryModule : EventListener, ITelemetryModule
+    {
+        private static readonly Lazy<ITelemetryModule> SingleInstance =
+            new Lazy<ITelemetryModule>(() => new AppInsightsTelemetryModule(), LazyThreadSafetyMode.ExecutionAndPublication);
+
+        private TelemetryClient _telemetryClient;
+        private bool _initialised;
+
+        private AppInsightsTelemetryModule()
+        {
+        }
+
+        public static ITelemetryModule Instance => SingleInstance.Value;
+
+        public void Initialize(TelemetryConfiguration configuration)
+        {
+            if (_initialised)
+            {
+                return;
+            }
+
+            _telemetryClient =
+                new TelemetryClient(configuration) {InstrumentationKey = configuration.InstrumentationKey};
+            _initialised = true;
+        }
+
+        protected override void OnEventSourceCreated(EventSource eventSource)
+        {
+            base.OnEventSourceCreated(eventSource);
+
+            if (eventSource.IsDependencyTrackingEventSource())
+            {
+                EnableEvents(eventSource, EventLevel.Informational);
+            }
+        }
+
+        protected override void OnEventWritten(EventWrittenEventArgs eventData)
+        {
+            if (!_initialised || !eventData.EventSource.IsDependencyTrackingEventSource())
+            {
+                return;
+            }
+
+            var dependencyTelemetry = CreateDependency(eventData);
+            _telemetryClient.TrackDependency(dependencyTelemetry);
+        }
+
+        private static DependencyTelemetry CreateDependency(EventWrittenEventArgs eventData)
+        {
+            var dependency = AsDependency(eventData);
+
+            var dependencyTelemetry = new DependencyTelemetry(
+                dependency.DependencyTypeName,
+                dependency.Target,
+                dependency.DependencyName,
+                dependency.Data,
+                dependency.StartTime,
+                dependency.Duration,
+                dependency.ResultCode,
+                dependency.Success);
+
+            foreach (var propertyPair in dependency.Properties ?? new Dictionary<string, object>())
+            {
+                dependencyTelemetry.Context.Properties[propertyPair.Key] = propertyPair.Value.ToString();
+            }
+
+            return dependencyTelemetry;
+        }
+
+        public static CosmosEventMetadata AsDependency(EventWrittenEventArgs eventData)
+        {
+            return CosmosEventDataConverter.ExtractData(eventData).AsDependency();
+        }
+
+        public static CosmosEventMetadata AsDependency(IDictionary<string, object> eventData)
+        {
+            return CosmosEventDataConverter.ConvertToDependencyFromEventData(eventData);
+        }
+    }
+}

Cosmonaut.ApplicationInsights/Cosmonaut.ApplicationInsights.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Authors>Nick Chapsas</Authors>
+    <Description>ApplicationInsights support for Cosmonaut</Description>
+    <Copyright>Copyright 2018 - Nick Chapsas</Copyright>
+    <PackageLicenseUrl>https://github.com/Elfocrash/Cosmonaut/blob/develop/LICENSE</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/Elfocrash/Cosmonaut</PackageProjectUrl>
+    <PackageTags>cosmosdb azure cosmos entitystore entity db orm</PackageTags>
+    <RepositoryUrl>https://github.com/Elfocrash/Cosmonaut</RepositoryUrl>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.6.4" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Cosmonaut\Cosmonaut.csproj" />
+  </ItemGroup>
+
+</Project>

Cosmonaut.Console/Program.cs

@@ -16,13 +16,8 @@ static async Task Main(string[] args)
         {
             var connectionPolicy = new ConnectionPolicy
             {
-                ConnectionProtocol = Protocol.Tcp,
-                ConnectionMode = ConnectionMode.Direct,
-                RetryOptions = new RetryOptions
-                {
-                    MaxRetryAttemptsOnThrottledRequests = 2,
-                    MaxRetryWaitTimeInSeconds = 3
-                }
+                ConnectionProtocol = Protocol.Https,
+                ConnectionMode = ConnectionMode.Gateway
             };
 
             var cosmosSettings = new CosmosStoreSettings("localtest", 
@@ -74,8 +69,6 @@ static async Task Main(string[] args)
             watch.Restart();
             //await Task.Delay(3000);
 
-            var testResult = await carStore.Query(new FeedOptions{EnableScanInQuery = true}).SingleOrDefaultAsync(x => x.ModelName.StartsWith("Car 1"));
-
             var addedRetrieved = booksStore.Query().ToListAsync().Result;
             System.Console.WriteLine($"Retrieved 50 documents in {watch.ElapsedMilliseconds}ms");
             watch.Restart();
@@ -84,7 +77,7 @@ static async Task Main(string[] args)
                 addedre.AnotherRandomProp += " Nick";
             }
 
-            var updated = booksStore.UpdateRangeAsync(addedRetrieved).Result;
+            var updated = booksStore.UpsertRangeAsync(addedRetrieved).Result;
             System.Console.WriteLine($"Updated 50 documents in {watch.ElapsedMilliseconds}ms");
             watch.Restart();
 

Cosmonaut.Tests/CollectionCreatorTests.cs

@@ -41,7 +41,7 @@ public async Task EnsureCreatedCreatesCollectionIfMissing()
             var creator = new CosmosCollectionCreator(_mockDocumentClient.Object);
 
             // Act
-            var result = await creator.EnsureCreatedAsync<Dummy>(new Database {Id = "databaseName"}, 500);
+            var result = await creator.EnsureCreatedAsync<Dummy>(UriFactory.CreateDatabaseUri("databaseName").ToString(), collection.Id, 500);
 
             // Assert
             result.Should().BeTrue();

Cosmonaut.Tests/CosmosAddTests.cs

@@ -32,20 +32,22 @@ public async Task AddValidObjectSuccess()
                 Id = id,
                 Name = "Nick"
             };
-            var document = dummy.GetCosmosDbFriendlyEntity() as Document;
+            var document = dummy.ConvertObjectToDocument();
             var resourceResponse = MockHelpers.CreateResourceResponse(document, HttpStatusCode.OK);
-            _mockDocumentClient.Setup(x => x.CreateDocumentAsync(It.IsAny<string>(),
+            _mockDocumentClient.Setup(x => x.CreateDocumentAsync(It.IsAny<Uri>(),
                     It.IsAny<object>(), It.IsAny<RequestOptions>(), false))
                 .ReturnsAsync(resourceResponse);
 
-            var entityStore = new CosmosStore<Dummy>(_mockDocumentClient.Object, "databaseName", new CosmosDatabaseCreator(_mockDocumentClient.Object), new CosmosCollectionCreator(_mockDocumentClient.Object));
+            var entityStore = new CosmosStore<Dummy>(_mockDocumentClient.Object, "databaseName", "", "http://test.com");
 
             // Act
             var result = await entityStore.AddAsync(dummy);
 
             //Assert
             result.IsSuccess.Should().BeTrue();
             result.Entity.Should().BeEquivalentTo(dummy);
+            result.ResourceResponse.Resource.Should().NotBeNull();
+            result.ResourceResponse.Resource.Should().BeEquivalentTo(document);
             result.CosmosOperationStatus.Should().Be(CosmosOperationStatus.Success);
             result.ResourceResponse.StatusCode.Should().Be(HttpStatusCode.OK);
         }
@@ -65,14 +67,14 @@ public async Task AddRangeValidObjectsSuccess()
                 };
                 dummies.Add(dummy);
 
-                var document = dummy.GetCosmosDbFriendlyEntity() as Document;
+                var document = dummy.ConvertObjectToDocument();
                 var resourceResponse = MockHelpers.CreateResourceResponse(document, HttpStatusCode.OK);
-                _mockDocumentClient.Setup(x => x.CreateDocumentAsync(It.IsAny<string>(),
+                _mockDocumentClient.Setup(x => x.CreateDocumentAsync(It.IsAny<Uri>(),
                         It.IsAny<object>(), It.IsAny<RequestOptions>(), false))
                     .ReturnsAsync(resourceResponse);
             }
 
-            var entityStore = new CosmosStore<Dummy>(_mockDocumentClient.Object, "databaseName", new CosmosDatabaseCreator(_mockDocumentClient.Object), new CosmosCollectionCreator(_mockDocumentClient.Object));
+            var entityStore = new CosmosStore<Dummy>(_mockDocumentClient.Object, "databaseName", "", "http://test.com");
 
             // Act
             var result = await entityStore.AddRangeAsync(dummies);
@@ -98,14 +100,14 @@ public async Task AddRangeParamsValidObjectsSuccess()
                 };
                 dummies.Add(dummy);
 
-                var document = dummy.GetCosmosDbFriendlyEntity() as Document;
+                var document = dummy.ConvertObjectToDocument();
                 var resourceResponse = MockHelpers.CreateResourceResponse(document, HttpStatusCode.OK);
-                _mockDocumentClient.Setup(x => x.CreateDocumentAsync(It.IsAny<string>(),
+                _mockDocumentClient.Setup(x => x.CreateDocumentAsync(It.IsAny<Uri>(),
                         It.IsAny<object>(), It.IsAny<RequestOptions>(), false))
                     .ReturnsAsync(resourceResponse);
             }
 
-            var entityStore = new CosmosStore<Dummy>(_mockDocumentClient.Object, "databaseName", new CosmosDatabaseCreator(_mockDocumentClient.Object), new CosmosCollectionCreator(_mockDocumentClient.Object));
+            var entityStore = new CosmosStore<Dummy>(_mockDocumentClient.Object, "databaseName", "", "http://test.com");
 
             // Act
             var result = await entityStore.AddRangeAsync(dummies[0], dummies[1], dummies[2], dummies[3], dummies[4]);
@@ -124,13 +126,13 @@ public async Task AddEntityWithoutIdEmptyGeneratedId()
             {
                 Name = "Nick"
             };
-            var document = dummy.GetCosmosDbFriendlyEntity() as Document;
+            var document = dummy.ConvertObjectToDocument();
             var resourceResponse = MockHelpers.CreateResourceResponse(document, HttpStatusCode.OK);
-            _mockDocumentClient.Setup(x => x.CreateDocumentAsync(It.IsAny<string>(),
+            _mockDocumentClient.Setup(x => x.CreateDocumentAsync(It.IsAny<Uri>(),
                     It.IsAny<object>(), It.IsAny<RequestOptions>(), false))
                 .ReturnsAsync(resourceResponse);
 
-            var entityStore = new CosmosStore<Dummy>(_mockDocumentClient.Object, "databaseName", new CosmosDatabaseCreator(_mockDocumentClient.Object), new CosmosCollectionCreator(_mockDocumentClient.Object));
+            var entityStore = new CosmosStore<Dummy>(_mockDocumentClient.Object, "databaseName", "", "http://test.com");
 
             // Act
             var result = await entityStore.AddAsync(dummy);
@@ -140,6 +142,8 @@ public async Task AddEntityWithoutIdEmptyGeneratedId()
             isGuid.Should().BeTrue();
             guid.Should().NotBeEmpty();
             result.IsSuccess.Should().BeTrue();
+            result.ResourceResponse.Resource.Should().NotBeNull();
+            result.ResourceResponse.Resource.Should().BeEquivalentTo(document);
             result.Entity.Should().BeEquivalentTo(dummy);
             result.CosmosOperationStatus.Should().Be(CosmosOperationStatus.Success);
             result.ResourceResponse.StatusCode.Should().Be(HttpStatusCode.OK);

Cosmonaut.Tests/CosmosRemoveTests.cs

@@ -34,18 +34,20 @@ public async Task RemoveEntityRemoves()
                 Name = "Test"
             };
 
-            var document = dummy.GetCosmosDbFriendlyEntity() as Document;
+            var document = dummy.ConvertObjectToDocument();
             var resourceResponse = MockHelpers.CreateResourceResponse(document, HttpStatusCode.OK);
             _mockDocumentClient.Setup(x => x.DeleteDocumentAsync(It.IsAny<Uri>(), It.IsAny<RequestOptions>()))
                 .ReturnsAsync(resourceResponse);
-            var entityStore = new CosmosStore<Dummy>(_mockDocumentClient.Object, "databaseName", new CosmosDatabaseCreator(_mockDocumentClient.Object), new CosmosCollectionCreator(_mockDocumentClient.Object));
+            var entityStore = new CosmosStore<Dummy>(_mockDocumentClient.Object, "databaseName", "", "http://test.com");
 
             // Act
             var result = await entityStore.RemoveAsync(dummy);
 
             // Assert
             result.IsSuccess.Should().BeTrue();
             result.Entity.Should().BeEquivalentTo(dummy);
+            result.ResourceResponse.Resource.Should().NotBeNull();
+            result.ResourceResponse.Resource.Should().BeEquivalentTo(document);
             result.CosmosOperationStatus.Should().Be(CosmosOperationStatus.Success);
             result.ResourceResponse.StatusCode.Should().Be(HttpStatusCode.OK);
         }
@@ -60,17 +62,19 @@ public async Task RemoveByIdRemoves()
                 Id = id,
                 Name = "Test"
             };
-            var document = toRemove.GetCosmosDbFriendlyEntity() as Document;
+            var document = toRemove.ConvertObjectToDocument();
             var resourceResponse = MockHelpers.CreateResourceResponse(document, HttpStatusCode.OK);
             _mockDocumentClient.Setup(x => x.DeleteDocumentAsync(It.IsAny<Uri>(), It.IsAny<RequestOptions>()))
                 .ReturnsAsync(resourceResponse);
-            var entityStore = new CosmosStore<Dummy>(_mockDocumentClient.Object, "databaseName", new CosmosDatabaseCreator(_mockDocumentClient.Object), new CosmosCollectionCreator(_mockDocumentClient.Object));
+            var entityStore = new CosmosStore<Dummy>(_mockDocumentClient.Object, "databaseName", "", "http://test.com");
 
             // Act
             var result = await entityStore.RemoveByIdAsync(id);
 
             // Assert
             result.IsSuccess.Should().BeTrue();
+            result.ResourceResponse.Resource.Should().NotBeNull();
+            result.ResourceResponse.Resource.Should().BeEquivalentTo(document);
             result.CosmosOperationStatus.Should().Be(CosmosOperationStatus.Success);
             result.ResourceResponse.StatusCode.Should().Be(HttpStatusCode.OK);
         }
@@ -88,11 +92,11 @@ public async Task RemoveEntitiesRemoves()
 
             var dummies = new List<Dummy> {dummy};
 
-            var document = dummy.GetCosmosDbFriendlyEntity() as Document;
+            var document = dummy.ConvertObjectToDocument();
             var resourceResponse = MockHelpers.CreateResourceResponse(document, HttpStatusCode.OK);
-            _mockDocumentClient.Setup(x => x.DeleteDocumentAsync(It.IsAny<string>(), It.IsAny<RequestOptions>()))
+            _mockDocumentClient.Setup(x => x.DeleteDocumentAsync(It.IsAny<Uri>(), It.IsAny<RequestOptions>()))
                 .ReturnsAsync(resourceResponse);
-            var entityStore = new CosmosStore<Dummy>(_mockDocumentClient.Object, "databaseName", new CosmosDatabaseCreator(_mockDocumentClient.Object), new CosmosCollectionCreator(_mockDocumentClient.Object));
+            var entityStore = new CosmosStore<Dummy>(_mockDocumentClient.Object, "databaseName", "", "http://test.com");
 
             // Act
             var result = await entityStore.RemoveRangeAsync(dummies);
@@ -101,6 +105,8 @@ public async Task RemoveEntitiesRemoves()
             result.IsSuccess.Should().BeTrue();
             result.FailedEntities.Should().BeEmpty();
             result.SuccessfulEntities.Should().HaveCount(1);
+            result.SuccessfulEntities.Single().ResourceResponse.Resource.Should().NotBeNull();
+            result.SuccessfulEntities.Single().ResourceResponse.Resource.Should().BeEquivalentTo(document);
         }
     }
 }

Cosmonaut.Tests/CosmosStoreTests.cs

@@ -8,6 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Cosmonaut.Extensions;
+using Cosmonaut.Response;
 using Cosmonaut.Storage;
 using FluentAssertions;
 using Microsoft.Azure.Documents;
@@ -98,5 +99,30 @@ public void RemovePotentialDuplicateIdPropertiesRemovesNoMatterTheCase()
             ((string)obj.ID?.ToString()).Should().BeNull();
             ((string)obj.Id?.ToString()).Should().BeNull();
         }
+
+        [Fact]
+        public async Task FindAsync_ReturnsEntity_WhenFoundInCosmosDB()
+        {
+            // Arrange
+            Mock<IDocumentClient> mockDocumentClient = MockHelpers.GetMockDocumentClient();
+            var id = Guid.NewGuid().ToString();
+            var dummy = new Dummy
+            {
+                Id = id,
+                Name = "Nick"
+            };
+            var document = dummy.ConvertObjectToDocument();
+            var resourceResponse = MockHelpers.CreateResourceResponse(document, HttpStatusCode.OK);
+            mockDocumentClient.Setup(x => x.ReadDocumentAsync(UriFactory.CreateDocumentUri("databaseName", "dummies", id), It.IsAny<RequestOptions>()))
+                .ReturnsAsync(resourceResponse);
+
+            var entityStore = new CosmosStore<Dummy>(mockDocumentClient.Object, "databaseName", "", "http://test.com");
+
+            // Act
+            var result = await entityStore.FindAsync(id);
+
+            //Assert
+            result.Should().BeEquivalentTo(dummy);
+        }
     }
 }