Merge from main.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,4 +1,5 @@
 name: Bug report
+title: "[bug] "
 description: Create a report to help us improve
 labels: ["bug"]
 body:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,4 +1,5 @@
 name: Feature request
+title: "[feature request] "
 description: Suggest an idea for this project
 labels: ["enhancement"]
 body:

.github/workflows/add-labels.yml

@@ -27,6 +27,7 @@ jobs:
 
           AddLabelsOnIssuesForComponentFoundInBody `
             -issueNumber ${{ github.event.issue.number }} `
+            -issueLabels '${{ join(github.event.issue.labels.*.name, ', ') }}' `
             -issueBody $env:ISSUE_BODY
         env:
           GH_TOKEN: ${{ github.token }}

build/scripts/add-labels.psm1

@@ -1,6 +1,9 @@
+Import-Module $PSScriptRoot\build.psm1
+
 function AddLabelsOnIssuesForComponentFoundInBody {
   param(
     [Parameter(Mandatory=$true)][int]$issueNumber,
+    [Parameter(Mandatory=$true)][string]$issueLabels,
     [Parameter(Mandatory=$true)][string]$issueBody
   )
 
@@ -10,7 +13,36 @@ function AddLabelsOnIssuesForComponentFoundInBody {
       Return
   }
 
-  gh issue edit $issueNumber --add-label $("comp:" + $match.Groups[1].Value.ToLower())
+  $component = $match.Groups[1].Value.Trim()
+
+  gh issue edit $issueNumber --add-label $("comp:" + $component.ToLower())
+
+  if ($issueLabels.Contains('bug') -or $issueLabels.Contains('enhancement'))
+  {
+     $componentOwners = $null
+
+     FindComponentOwners `
+         -component "OpenTelemetry.$component" `
+         -componentOwners ([ref]$componentOwners)
+
+     if ($componentOwners.Count -gt 0)
+     {
+       $componentOwnerApprovers = ''
+       foreach ($componentOwner in $componentOwners)
+       {
+         $componentOwnerApprovers += "@$componentOwner "
+       }
+
+       $body =
+@"
+Tagging component owner(s).
+
+$componentOwnerApprovers
+"@
+
+       gh issue comment $issueNumber --body $body
+     }
+  }
 }
 
 Export-ModuleMember -Function AddLabelsOnIssuesForComponentFoundInBody

build/scripts/build.psm1

@@ -80,3 +80,62 @@ function ResolveProject {
 }
 
 Export-ModuleMember -Function ResolveProject
+
+function FindComponentOwners {
+  param(
+    [Parameter(Mandatory=$true)][string]$component,
+    [Parameter()][string]$issueNumber,
+    [Parameter()][ref]$componentOwners
+  )
+
+  $projectPath = "src/$component/$component.csproj"
+
+  if ((Test-Path -Path $projectPath) -eq $false)
+  {
+      if ([string]::IsNullOrEmpty($issueNumber) -eq $false)
+      {
+        gh issue comment $issueNumber `
+          --body "I couldn't find the project file for the requested component. Please create a new release request and select a valid component or edit the description and set a valid component."
+      }
+      Return
+  }
+
+  $projectContent = Get-Content -Path $projectPath
+
+  $match = [regex]::Match($projectContent, '<MinVerTagPrefix>(.*)<\/MinVerTagPrefix>')
+  if ($match.Success -eq $false)
+  {
+      if ([string]::IsNullOrEmpty($issueNumber) -eq $false)
+      {
+        gh issue comment $issueNumber `
+          --body "I couldn't find ``MinVerTagPrefix`` in the project file for the requested component. Please create a new release request and select a valid component or edit the description and set a valid component."
+      }
+      Return
+  }
+
+  $minVerTagPrefix = $match.Groups[1].Value
+
+  $projectDirs = Get-ChildItem -Path src/**/*.csproj | Select-String "<MinVerTagPrefix>$minVerTagPrefix</MinVerTagPrefix>" -List | Select Path | Split-Path -Parent
+
+  $componentOwnersContent = Get-Content '.github/component_owners.yml' -Raw
+
+  $componentOwners.Value = [System.Collections.Generic.HashSet[string]]::new([System.StringComparer]::OrdinalIgnoreCase)
+
+  foreach ($projectDir in $projectDirs)
+  {
+    $projectName = [System.IO.Path]::GetFileName($projectDir)
+
+    $match = [regex]::Match($componentOwnersContent, "src\/$projectName\/:([\w\W\s]*?)src")
+    if ($match.Success -eq $true)
+    {
+      $matches = [regex]::Matches($match.Groups[1].Value, "-\s*(.*)")
+      foreach ($match in $matches)
+      {
+        $owner = $match.Groups[1].Value
+        $_ = $componentOwners.Value.Add($owner.Trim())
+      }
+    }
+  }
+}
+
+Export-ModuleMember -Function FindComponentOwners

build/scripts/prepare-release.psm1

@@ -1,3 +1,5 @@
+Import-Module $PSScriptRoot\build.psm1
+
 function CreatePullRequestToUpdateChangelogsAndPublicApis {
   param(
     [Parameter(Mandatory=$true)][string]$gitRepository,
@@ -354,48 +356,12 @@ function TagCodeOwnersOnOrRunWorkflowForRequestReleaseIssue {
       Return
   }
 
-  $projectPath = "src/$component/$component.csproj"
-
-  if ((Test-Path -Path $projectPath) -eq $false)
-  {
-      gh issue comment $issueNumber `
-        --body "I couldn't find the project file for the requested component. Please create a new release request and select a valid component or edit the description and set a valid component."
-      Return
-  }
-
-  $projectContent = Get-Content -Path $projectPath
-
-  $match = [regex]::Match($projectContent, '<MinVerTagPrefix>(.*)<\/MinVerTagPrefix>')
-  if ($match.Success -eq $false)
-  {
-      gh issue comment $issueNumber `
-        --body "I couldn't find ``MinVerTagPrefix`` in the project file for the requested component. Please create a new release request and select a valid component or edit the description and set a valid component."
-      Return
-  }
-
-  $minVerTagPrefix = $match.Groups[1].Value
-
-  $projectDirs = Get-ChildItem -Path src/**/*.csproj | Select-String "<MinVerTagPrefix>$minVerTagPrefix</MinVerTagPrefix>" -List | Select Path | Split-Path -Parent
-
-  $componentOwnersContent = Get-Content '.github/component_owners.yml' -Raw
-
-  $componentOwners = [System.Collections.Generic.HashSet[string]]::new([System.StringComparer]::OrdinalIgnoreCase)
-
-  foreach ($projectDir in $projectDirs)
-  {
-    $projectName = [System.IO.Path]::GetFileName($projectDir)
+  $componentOwners = $null
 
-    $match = [regex]::Match($componentOwnersContent, "src\/$projectName\/:([\w\W\s]*?)src")
-    if ($match.Success -eq $true)
-    {
-      $matches = [regex]::Matches($match.Groups[1].Value, "-\s*(.*)")
-      foreach ($match in $matches)
-      {
-        $owner = $match.Groups[1].Value
-        $_ = $componentOwners.Add($owner.Trim())
-      }
-    }
-  }
+  FindComponentOwners `
+      -component $component `
+      -issueNumber $issueNumber `
+      -componentOwners ([ref]$componentOwners)
 
   $requestedByUserPermission = gh api "repos/$gitRepository/collaborators/$requestedByUserName/permission" | ConvertFrom-Json
 

src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Drop support for .NET 6 as this target is no longer supported.
+  ([#2117](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2117))
+
 ## 1.9.0
 
 Released 2024-Jun-21

src/OpenTelemetry.Exporter.Geneva/CompatibilitySuppressions.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Suppression>
+        <DiagnosticId>CP0008</DiagnosticId>
+        <Target>T:OpenTelemetry.Exporter.Geneva.EventNameExportMode</Target>
+        <Left>lib/net6.0/OpenTelemetry.Exporter.Geneva.dll</Left>
+        <Right>lib/netstandard2.0/OpenTelemetry.Exporter.Geneva.dll</Right>
+        <IsBaselineSuppression>true</IsBaselineSuppression>
+    </Suppression>
+    <Suppression>
+        <DiagnosticId>CP0008</DiagnosticId>
+        <Target>T:OpenTelemetry.Exporter.Geneva.ExceptionStackExportMode</Target>
+        <Left>lib/net6.0/OpenTelemetry.Exporter.Geneva.dll</Left>
+        <Right>lib/netstandard2.0/OpenTelemetry.Exporter.Geneva.dll</Right>
+        <IsBaselineSuppression>true</IsBaselineSuppression>
+    </Suppression>
+</Suppressions>

src/OpenTelemetry.Exporter.Geneva/Internal/MsgPack/MsgPackExporter.cs

@@ -3,7 +3,7 @@
 
 #nullable enable
 
-#if NET8_0_OR_GREATER
+#if NET
 using System.Collections.Frozen;
 #endif
 
@@ -33,7 +33,7 @@ internal abstract class MsgPackExporter
         [Schema.V40.PartA.Extensions.Os.Ver] = "env_os_ver",
     };
 
-#if NET8_0_OR_GREATER
+#if NET
     internal static readonly IReadOnlyDictionary<string, string> V40_PART_A_MAPPING = PART_A_MAPPING_DICTIONARY.ToFrozenDictionary();
 #else
     internal static readonly IReadOnlyDictionary<string, string> V40_PART_A_MAPPING = PART_A_MAPPING_DICTIONARY;

src/OpenTelemetry.Exporter.Geneva/Internal/MsgPack/MsgPackLogExporter.cs

@@ -3,7 +3,7 @@
 
 #nullable enable
 
-#if NET8_0_OR_GREATER
+#if NET
 using System.Collections.Frozen;
 #endif
 using System.Diagnostics;
@@ -33,7 +33,7 @@ internal sealed class MsgPackLogExporter : MsgPackExporter, IDisposable
     private readonly bool shouldExportEventName;
     private readonly TableNameSerializer tableNameSerializer;
 
-#if NET8_0_OR_GREATER
+#if NET
     private readonly FrozenSet<string>? customFields;
     private readonly FrozenDictionary<string, object>? prepopulatedFields;
 #else
@@ -94,7 +94,7 @@ public MsgPackLogExporter(GenevaExporterOptions options)
                 this.prepopulatedFieldKeys.Add(kv.Key);
             }
 
-#if NET8_0_OR_GREATER
+#if NET
             this.prepopulatedFields = tempPrepopulatedFields.ToFrozenDictionary(StringComparer.Ordinal);
 #else
             this.prepopulatedFields = tempPrepopulatedFields;
@@ -110,7 +110,7 @@ public MsgPackLogExporter(GenevaExporterOptions options)
                 customFields.Add(name);
             }
 
-#if NET8_0_OR_GREATER
+#if NET
             this.customFields = customFields.ToFrozenSet(StringComparer.Ordinal);
 #else
             this.customFields = customFields;

src/OpenTelemetry.Exporter.Geneva/Internal/MsgPack/MsgPackTraceExporter.cs

@@ -3,7 +3,7 @@
 
 #nullable enable
 
-#if NET8_0_OR_GREATER
+#if NET
 using System.Collections.Frozen;
 #endif
 using System.Diagnostics;
@@ -34,15 +34,15 @@ internal sealed class MsgPackTraceExporter : MsgPackExporter, IDisposable
         ["messaging.url"] = "messagingUrl",
     };
 
-#if NET8_0_OR_GREATER
+#if NET
     internal static readonly FrozenDictionary<string, string> CS40_PART_B_MAPPING = CS40_PART_B_MAPPING_DICTIONARY.ToFrozenDictionary();
 #else
     internal static readonly Dictionary<string, string> CS40_PART_B_MAPPING = CS40_PART_B_MAPPING_DICTIONARY;
 #endif
 
     internal readonly ThreadLocal<byte[]> Buffer = new();
 
-#if NET8_0_OR_GREATER
+#if NET
     internal readonly FrozenSet<string>? CustomFields;
 
     internal readonly FrozenSet<string>? DedicatedFields;
@@ -123,7 +123,7 @@ public MsgPackTraceExporter(GenevaExporterOptions options)
                 dedicatedFields.Add(name);
             }
 
-#if NET8_0_OR_GREATER
+#if NET
             this.CustomFields = customFields.ToFrozenSet(StringComparer.Ordinal);
 #else
             this.CustomFields = customFields;
@@ -137,7 +137,7 @@ public MsgPackTraceExporter(GenevaExporterOptions options)
             dedicatedFields.Add("otel.status_code");
             dedicatedFields.Add("otel.status_description");
 
-#if NET8_0_OR_GREATER
+#if NET
             this.DedicatedFields = dedicatedFields.ToFrozenSet(StringComparer.Ordinal);
 #else
             this.DedicatedFields = dedicatedFields;

src/OpenTelemetry.Exporter.Geneva/Internal/Tld/UncheckedASCIIEncoding.cs

@@ -83,7 +83,7 @@ public unsafe override int GetChars(byte[] bytes, int byteIndex, int byteCount,
 
     public override unsafe int GetBytes(char* charPtr, int charCount, byte* bytePtr, int byteCount)
     {
-#if NET8_0_OR_GREATER
+#if NET
         ArgumentOutOfRangeException.ThrowIfLessThan(byteCount, charCount);
 #else
         if (byteCount < charCount)
@@ -102,7 +102,7 @@ public override unsafe int GetBytes(char* charPtr, int charCount, byte* bytePtr,
 
     public override unsafe int GetChars(byte* bytePtr, int byteCount, char* charPtr, int charCount)
     {
-#if NET8_0_OR_GREATER
+#if NET
         ArgumentOutOfRangeException.ThrowIfLessThan(charCount, byteCount);
 #else
         if (charCount < byteCount)

src/OpenTelemetry.Exporter.Geneva/Metrics/GenevaMetricExporter.cs

@@ -116,7 +116,7 @@ protected override void Dispose(bool disposing)
         base.Dispose(disposing);
     }
 
-#if NET8_0_OR_GREATER
+#if NET
     [GeneratedRegex(DisableRegexPattern)]
     private static partial Regex GetDisableRegexPattern();
 #else

src/OpenTelemetry.Exporter.Geneva/Metrics/OtlpProtobuf/OtlpProtobufMetricExporter.cs

@@ -25,7 +25,7 @@ public OtlpProtobufMetricExporter(Func<Resource> getResource, ConnectionStringBu
 
         this.getResource = getResource;
 
-        this.otlpProtobufSerializer = new OtlpProtobufSerializer(MetricEtwDataTransport.Instance, connectionStringBuilder, prepopulatedMetricDimensions);
+        this.otlpProtobufSerializer = new OtlpProtobufSerializer(MetricWindowsEventTracingDataTransport.Instance, connectionStringBuilder, prepopulatedMetricDimensions);
     }
 
     public ExportResult Export(in Batch<Metric> batch)

src/OpenTelemetry.Exporter.Geneva/Metrics/TlvMetricExporter.cs

@@ -43,12 +43,12 @@ internal TlvMetricExporter(ConnectionStringBuilder connectionStringBuilder, IRea
                 }
 
                 var unixDomainSocketPath = connectionStringBuilder.ParseUnixDomainSocketPath();
-                this.metricDataTransport = new MetricUnixDataTransport(unixDomainSocketPath);
+                this.metricDataTransport = new MetricUnixDomainSocketDataTransport(unixDomainSocketPath);
                 break;
             case TransportProtocol.Unspecified:
                 if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 {
-                    this.metricDataTransport = MetricEtwDataTransport.Instance;
+                    this.metricDataTransport = MetricWindowsEventTracingDataTransport.Instance;
                     break;
                 }
                 else
@@ -77,7 +77,7 @@ public void Dispose()
         {
             // The ETW data transport singleton on Windows should NOT be disposed.
             // On Linux, Unix Domain Socket is used and should be disposed.
-            if (this.metricDataTransport != MetricEtwDataTransport.Instance)
+            if (this.metricDataTransport != MetricWindowsEventTracingDataTransport.Instance)
             {
                 this.metricDataTransport.Dispose();
             }

src/OpenTelemetry.Exporter.Geneva/Metrics/Transport/MetricUnixDataTransport.cs → src/OpenTelemetry.Exporter.Geneva/Metrics/Transport/MetricUnixDomainSocketDataTransport.cs

@@ -5,13 +5,13 @@
 
 namespace OpenTelemetry.Exporter.Geneva;
 
-internal sealed class MetricUnixDataTransport : IMetricDataTransport
+internal sealed class MetricUnixDomainSocketDataTransport : IMetricDataTransport
 {
     private readonly int fixedPayloadLength;
     private readonly UnixDomainSocketDataTransport udsDataTransport;
     private bool isDisposed;
 
-    public MetricUnixDataTransport(
+    public MetricUnixDomainSocketDataTransport(
         string unixDomainSocketPath,
         int timeoutMilliseconds = UnixDomainSocketDataTransport.DefaultTimeoutMilliseconds)
     {