Merge branch 'master' into cijothomas/activity3adapter1a_alternate

open-telemetry · Jun 4, 2020 · 121e4b5 · 121e4b5
2 parents 19d138f + 601ded5
commit 121e4b5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/build/Common.test.props b/build/Common.test.props
@@ -4,6 +4,7 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)/debug.snk</AssemblyOriginatorKeyFile>
     <DefineConstants>$(DefineConstants);SIGNED</DefineConstants>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">

diff --git a/test/OpenTelemetry.Exporter.Prometheus.Tests/PrometheusExporterTests.cs b/test/OpenTelemetry.Exporter.Prometheus.Tests/PrometheusExporterTests.cs
@@ -121,12 +121,12 @@ private static void CollectMetrics(UngroupedBatcher simpleProcessor, MetricExpor
 
             var labels1 = new List<KeyValuePair<string, string>>
             {
-                new KeyValuePair<string, string>("dim1", "value1"), new KeyValuePair<string, string>("dim2", "value1")
+                new KeyValuePair<string, string>("dim1", "value1"), new KeyValuePair<string, string>("dim2", "value1"),
             };
 
             var labels2 = new List<KeyValuePair<string, string>>
             {
-                new KeyValuePair<string, string>("dim1", "value2"), new KeyValuePair<string, string>("dim2", "value2")
+                new KeyValuePair<string, string>("dim1", "value2"), new KeyValuePair<string, string>("dim2", "value2"),
             };
 
             var defaultContext = default(SpanContext);