Merge branch 'main' into aws-jsonsourcegen

open-telemetry · Oct 7, 2024 · 828f900 · 828f900
2 parents 673bd11 + 4ab83e0
commit 828f900
Show file tree

Hide file tree

Showing 10 changed files with 1,023 additions and 18 deletions.
diff --git a/src/OpenTelemetry.Exporter.Instana/OpenTelemetry.Exporter.Instana.csproj b/src/OpenTelemetry.Exporter.Instana/OpenTelemetry.Exporter.Instana.csproj
@@ -2,17 +2,17 @@
 
   <PropertyGroup>
     <!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
-    <TargetFrameworks>netstandard2.0;$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
+    <TargetFrameworks>$(NetStandardMinimumSupportedVersion);$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
     <PackageTags>Instana Tracing APM</PackageTags>
-    <Description>Instana .NET Exporter for OpenTelemetry</Description>
+    <Description>Instana .NET Exporter for OpenTelemetry.</Description>
     <MinVerTagPrefix>Exporter.Instana-</MinVerTagPrefix>
     <PackageValidationBaselineVersion>1.0.3</PackageValidationBaselineVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="OpenTelemetry" Version="$(OpenTelemetryCoreLatestVersion)" />
 
-    <!--We need the package reference to `System.Net.Http` to use `HttpClientHandler.ServerCertificateCustomValidationCallback` property
+    <!-- We need the package reference to `System.Net.Http` to use `HttpClientHandler.ServerCertificateCustomValidationCallback` property
     on net462 target. Starting net471, we could just add an assembly `Reference` instead of `PackageReference`.
 
     For example:

diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/External/.editorconfig b/test/OpenTelemetry.Exporter.Geneva.Tests/External/.editorconfig
@@ -0,0 +1,2 @@
+[*.cs]
+generated_code = true
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/External/MetricsContract.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/External/MetricsContract.cs
@@ -1,6 +1,3 @@
-// <auto-generated />
-
-using System.Collections.Generic;
 using Kaitai;
 
 namespace OpenTelemetry.Exporter.Geneva.Tests;

diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/External/VlqBase128Le.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/External/VlqBase128Le.cs
@@ -1,6 +1,3 @@
-// <auto-generated />
-
-using System.Collections.Generic;
 using Kaitai;
 
 namespace OpenTelemetry.Exporter.Geneva.Tests;