revert changes

Azure · Aug 9, 2023 · 4137c58 · 4137c58
1 parent 567ca55
commit 4137c58
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 16 deletions.
diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/ApplicationInsights/AppSettings.json b/Microsoft.Azure.Cosmos.Samples/Usage/ApplicationInsights/AppSettings.json
@@ -0,0 +1,5 @@
+{
+  "CosmosDBEndPointUrl": "https://localhost:8081",
+  "CosmosDBAuthorizationKey": "Super secret key",
+  "ApplicationInsightsConnectionString": "Super secret connection string"
+}
diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/ApplicationInsights/ApplicationInsights.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/ApplicationInsights/ApplicationInsights.csproj
@@ -1,8 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
+    <AssemblyName>Cosmos.Samples.ApplicationInsights</AssemblyName>
+    <RootNamespace>Cosmos.Samples.ApplicationInsights</RootNamespace>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
@@ -13,9 +15,11 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="..\AppSettings.json">
+    <None Include="AppSettings.json" Link="AppSettings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+
 </Project>
diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/ApplicationInsights/Program.cs b/Microsoft.Azure.Cosmos.Samples/Usage/ApplicationInsights/Program.cs
@@ -4,10 +4,12 @@
     using System.Threading.Tasks;
     using Newtonsoft.Json;
     using Microsoft.Azure.Cosmos;
+    using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.ApplicationInsights;
     using Microsoft.ApplicationInsights.WorkerService;
+    using Microsoft.Extensions.Logging.ApplicationInsights;
 
     internal class Program
     {
@@ -24,13 +26,13 @@ static async Task Main()
                             .AddJsonFile("AppSettings.json")
                             .Build();
 
-                string endpoint = configuration["EndPointUrl"];
+                string endpoint = configuration["CosmosDBEndPointUrl"];
                 if (string.IsNullOrEmpty(endpoint))
                 {
                     throw new ArgumentNullException("Please specify a valid CosmosDBEndPointUrl in the appSettings.json");
                 }
 
-                string authKey = configuration["AuthorizationKey"];
+                string authKey = configuration["CosmosDBAuthorizationKey"];
                 if (string.IsNullOrEmpty(authKey) || string.Equals(authKey, "Super secret key"))
                 {
                     throw new ArgumentException("Please specify a valid CosmosDBAuthorizationKey in the appSettings.json");

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/OpenTelemetry/AppSettings.json b/Microsoft.Azure.Cosmos.Samples/Usage/OpenTelemetry/AppSettings.json
@@ -0,0 +1,12 @@
+{
+  "Logging": {
+    "OpenTelemetry": {
+      "LogLevel": {
+        "Azure.Cosmos.Operation.Request.Diagnostics": "Warning"
+      }
+    }
+  },
+  "CosmosDBEndPointUrl": "https://localhost:8081",
+  "CosmosDBAuthorizationKey": "Super secret key",
+  "ApplicationInsightsConnectionString": "Super secret connection string"
+}
diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/OpenTelemetry/OpenTelemetry.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/OpenTelemetry/OpenTelemetry.csproj
@@ -14,9 +14,11 @@
     <PackageReference Include="Microsoft.Extensions.Azure" Version="1.6.3" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="..\AppSettings.json">
+    <None Include="AppSettings.json" Link="AppSettings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+
 </Project>
diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/OpenTelemetry/Program.cs b/Microsoft.Azure.Cosmos.Samples/Usage/OpenTelemetry/Program.cs
@@ -28,13 +28,13 @@ static async Task Main()
                                                             .AddJsonFile("AppSettings.json")
                                                             .Build();
 
-                string endpoint = configuration["EndPointUrl"];
+                string endpoint = configuration["CosmosDBEndPointUrl"];
                 if (string.IsNullOrEmpty(endpoint))
                 {
                     throw new ArgumentNullException("Please specify a valid CosmosDBEndPointUrl in the appSettings.json");
                 }
 
-                string authKey = configuration["AuthorizationKey"];
+                string authKey = configuration["CosmosDBAuthorizationKey"];
                 if (string.IsNullOrEmpty(authKey) || string.Equals(authKey, "Super secret key"))
                 {
                     throw new ArgumentException("Please specify a valid CosmosDBAuthorizationKey in the appSettings.json");

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/appSettings.json b/Microsoft.Azure.Cosmos.Samples/Usage/appSettings.json
@@ -1,12 +1,4 @@
 {
   "EndPointUrl": "https://localhost:8081",
-  "AuthorizationKey": "Super secret key",
-  "ApplicationInsightsConnectionString": "Super secret connection string",
-  "Logging": {
-    "OpenTelemetry": {
-      "LogLevel": {
-        "Azure.Cosmos.Operation.Request.Diagnostics": "Warning"
-      }
-    }
-  }
+  "AuthorizationKey": "Super secret key"
 }