fix appsettings

Azure · Aug 9, 2023 · 567ca55 · 567ca55
1 parent 833e5bd
commit 567ca55
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 43 deletions.
diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/ApplicationInsights/AppSettings.json b/Microsoft.Azure.Cosmos.Samples/Usage/ApplicationInsights/AppSettings.json
diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/ApplicationInsights/ApplicationInsights.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/ApplicationInsights/ApplicationInsights.csproj
@@ -1,10 +1,8 @@
-<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>
 
@@ -15,11 +13,9 @@
     <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" Link="AppSettings.json">
+    <None Include="..\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,12 +4,10 @@
     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
     {
@@ -26,13 +24,13 @@ static async Task Main()
                             .AddJsonFile("AppSettings.json")
                             .Build();
 
-                string endpoint = configuration["CosmosDBEndPointUrl"];
+                string endpoint = configuration["EndPointUrl"];
                 if (string.IsNullOrEmpty(endpoint))
                 {
                     throw new ArgumentNullException("Please specify a valid CosmosDBEndPointUrl in the appSettings.json");
                 }
 
-                string authKey = configuration["CosmosDBAuthorizationKey"];
+                string authKey = configuration["AuthorizationKey"];
                 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/CustomDiagnosticAndEventListener/AppSettings.json b/Microsoft.Azure.Cosmos.Samples/Usage/CustomDiagnosticAndEventListener/AppSettings.json
diff --git a/...os.Samples/Usage/CustomDiagnosticAndEventListener/CustomDiagnosticAndEventListener.csproj b/...os.Samples/Usage/CustomDiagnosticAndEventListener/CustomDiagnosticAndEventListener.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -12,9 +12,8 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
   </ItemGroup>
-
   <ItemGroup>
-    <None Include="AppSettings.json" Link="AppSettings.json">
+    <None Include="..\AppSettings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/CustomDiagnosticAndEventListener/Program.cs b/Microsoft.Azure.Cosmos.Samples/Usage/CustomDiagnosticAndEventListener/Program.cs
@@ -1,6 +1,5 @@
 namespace Cosmos.Samples.ApplicationInsights
 {
-    using System.Net;
     using Microsoft.Azure.Cosmos;
     using Microsoft.Extensions.Configuration;
     using Newtonsoft.Json;
@@ -17,13 +16,13 @@ static async Task Main()
                            .AddJsonFile("AppSettings.json")
                            .Build();
 
-            string endpoint = configuration["CosmosDBEndPointUrl"];
+            string endpoint = configuration["EndPointUrl"];
             if (string.IsNullOrEmpty(endpoint))
             {
                 throw new ArgumentNullException("Please specify a valid CosmosDBEndPointUrl in the appSettings.json");
             }
 
-            string authKey = configuration["CosmosDBAuthorizationKey"];
+            string authKey = configuration["AuthorizationKey"];
             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
diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/OpenTelemetry/OpenTelemetry.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/OpenTelemetry/OpenTelemetry.csproj
@@ -14,11 +14,9 @@
     <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" Link="AppSettings.json">
+    <None Include="..\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["CosmosDBEndPointUrl"];
+                string endpoint = configuration["EndPointUrl"];
                 if (string.IsNullOrEmpty(endpoint))
                 {
                     throw new ArgumentNullException("Please specify a valid CosmosDBEndPointUrl in the appSettings.json");
                 }
 
-                string authKey = configuration["CosmosDBAuthorizationKey"];
+                string authKey = configuration["AuthorizationKey"];
                 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,4 +1,12 @@
 {
   "EndPointUrl": "https://localhost:8081",
-  "AuthorizationKey": "Super secret key"
+  "AuthorizationKey": "Super secret key",
+  "ApplicationInsightsConnectionString": "Super secret connection string",
+  "Logging": {
+    "OpenTelemetry": {
+      "LogLevel": {
+        "Azure.Cosmos.Operation.Request.Diagnostics": "Warning"
+      }
+    }
+  }
 }