Skip to content

Commit 794eb48

Browse files
joegoldman2joegoldman2
authored
[Exporter.Geneva] Remove .NET 6 target (open-telemetry#2117)
Co-authored-by: joegoldman2 <[email protected]>
1 parent 68a25e8 commit 794eb48

File tree

10 files changed

+47
-25
lines changed

10 files changed

+47
-25
lines changed

‎src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## Unreleased
44

5+
* Drop support for .NET 6 as this target is no longer supported.
6+
([#2117](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2117))
7+
58
## 1.9.0
69

710
Released 2024-Jun-21

‎src/OpenTelemetry.Exporter.Geneva/CompatibilitySuppressions.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
3+
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
5+
<Suppression>
6+
<DiagnosticId>CP0008</DiagnosticId>
7+
<Target>T:OpenTelemetry.Exporter.Geneva.EventNameExportMode</Target>
8+
<Left>lib/net6.0/OpenTelemetry.Exporter.Geneva.dll</Left>
9+
<Right>lib/netstandard2.0/OpenTelemetry.Exporter.Geneva.dll</Right>
10+
<IsBaselineSuppression>true</IsBaselineSuppression>
11+
</Suppression>
12+
<Suppression>
13+
<DiagnosticId>CP0008</DiagnosticId>
14+
<Target>T:OpenTelemetry.Exporter.Geneva.ExceptionStackExportMode</Target>
15+
<Left>lib/net6.0/OpenTelemetry.Exporter.Geneva.dll</Left>
16+
<Right>lib/netstandard2.0/OpenTelemetry.Exporter.Geneva.dll</Right>
17+
<IsBaselineSuppression>true</IsBaselineSuppression>
18+
</Suppression>
19+
</Suppressions>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#nullable enable
55

6-
#if NET8_0_OR_GREATER
6+
#if NET
77
using System.Collections.Frozen;
88
#endif
99

@@ -33,7 +33,7 @@ internal abstract class MsgPackExporter
3333
[Schema.V40.PartA.Extensions.Os.Ver] = "env_os_ver",
3434
};
3535

36-
#if NET8_0_OR_GREATER
36+
#if NET
3737
internal static readonly IReadOnlyDictionary<string, string> V40_PART_A_MAPPING = PART_A_MAPPING_DICTIONARY.ToFrozenDictionary();
3838
#else
3939
internal static readonly IReadOnlyDictionary<string, string> V40_PART_A_MAPPING = PART_A_MAPPING_DICTIONARY;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#nullable enable
55

6-
#if NET8_0_OR_GREATER
6+
#if NET
77
using System.Collections.Frozen;
88
#endif
99
using System.Diagnostics;
@@ -33,7 +33,7 @@ internal sealed class MsgPackLogExporter : MsgPackExporter, IDisposable
3333
private readonly bool shouldExportEventName;
3434
private readonly TableNameSerializer tableNameSerializer;
3535

36-
#if NET8_0_OR_GREATER
36+
#if NET
3737
private readonly FrozenSet<string>? customFields;
3838
private readonly FrozenDictionary<string, object>? prepopulatedFields;
3939
#else
@@ -94,7 +94,7 @@ public MsgPackLogExporter(GenevaExporterOptions options)
9494
this.prepopulatedFieldKeys.Add(kv.Key);
9595
}
9696

97-
#if NET8_0_OR_GREATER
97+
#if NET
9898
this.prepopulatedFields = tempPrepopulatedFields.ToFrozenDictionary(StringComparer.Ordinal);
9999
#else
100100
this.prepopulatedFields = tempPrepopulatedFields;
@@ -110,7 +110,7 @@ public MsgPackLogExporter(GenevaExporterOptions options)
110110
customFields.Add(name);
111111
}
112112

113-
#if NET8_0_OR_GREATER
113+
#if NET
114114
this.customFields = customFields.ToFrozenSet(StringComparer.Ordinal);
115115
#else
116116
this.customFields = customFields;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#nullable enable
55

6-
#if NET8_0_OR_GREATER
6+
#if NET
77
using System.Collections.Frozen;
88
#endif
99
using System.Diagnostics;
@@ -34,15 +34,15 @@ internal sealed class MsgPackTraceExporter : MsgPackExporter, IDisposable
3434
["messaging.url"] = "messagingUrl",
3535
};
3636

37-
#if NET8_0_OR_GREATER
37+
#if NET
3838
internal static readonly FrozenDictionary<string, string> CS40_PART_B_MAPPING = CS40_PART_B_MAPPING_DICTIONARY.ToFrozenDictionary();
3939
#else
4040
internal static readonly Dictionary<string, string> CS40_PART_B_MAPPING = CS40_PART_B_MAPPING_DICTIONARY;
4141
#endif
4242

4343
internal readonly ThreadLocal<byte[]> Buffer = new();
4444

45-
#if NET8_0_OR_GREATER
45+
#if NET
4646
internal readonly FrozenSet<string>? CustomFields;
4747

4848
internal readonly FrozenSet<string>? DedicatedFields;
@@ -123,7 +123,7 @@ public MsgPackTraceExporter(GenevaExporterOptions options)
123123
dedicatedFields.Add(name);
124124
}
125125

126-
#if NET8_0_OR_GREATER
126+
#if NET
127127
this.CustomFields = customFields.ToFrozenSet(StringComparer.Ordinal);
128128
#else
129129
this.CustomFields = customFields;
@@ -137,7 +137,7 @@ public MsgPackTraceExporter(GenevaExporterOptions options)
137137
dedicatedFields.Add("otel.status_code");
138138
dedicatedFields.Add("otel.status_description");
139139

140-
#if NET8_0_OR_GREATER
140+
#if NET
141141
this.DedicatedFields = dedicatedFields.ToFrozenSet(StringComparer.Ordinal);
142142
#else
143143
this.DedicatedFields = dedicatedFields;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public unsafe override int GetChars(byte[] bytes, int byteIndex, int byteCount,
8383

8484
public override unsafe int GetBytes(char* charPtr, int charCount, byte* bytePtr, int byteCount)
8585
{
86-
#if NET8_0_OR_GREATER
86+
#if NET
8787
ArgumentOutOfRangeException.ThrowIfLessThan(byteCount, charCount);
8888
#else
8989
if (byteCount < charCount)
@@ -102,7 +102,7 @@ public override unsafe int GetBytes(char* charPtr, int charCount, byte* bytePtr,
102102

103103
public override unsafe int GetChars(byte* bytePtr, int byteCount, char* charPtr, int charCount)
104104
{
105-
#if NET8_0_OR_GREATER
105+
#if NET
106106
ArgumentOutOfRangeException.ThrowIfLessThan(charCount, byteCount);
107107
#else
108108
if (charCount < byteCount)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ protected override void Dispose(bool disposing)
116116
base.Dispose(disposing);
117117
}
118118

119-
#if NET8_0_OR_GREATER
119+
#if NET
120120
[GeneratedRegex(DisableRegexPattern)]
121121
private static partial Regex GetDisableRegexPattern();
122122
#else

‎src/OpenTelemetry.Exporter.Geneva/OpenTelemetry.Exporter.Geneva.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
<Import Project=".\Common.GenevaExporter.props"/>
44

55
<PropertyGroup>
6+
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
7+
<TargetFrameworks>net8.0;$(NetStandardMinimumSupportedVersion)</TargetFrameworks>
8+
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
69
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
7-
<Description>An OpenTelemetry .NET exporter that exports to local ETW or UDS</Description>
8-
<Authors>OpenTelemetry Authors</Authors>
10+
<Description>An OpenTelemetry .NET exporter that exports to local ETW or UDS.</Description>
911
<!-- Tweak style rules for Geneva: Allow underscores in constant names and allow regions inside code blocks -->
1012
<NoWarn>$(NoWarn);SA1123;SA1310</NoWarn>
11-
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
12-
<TargetFrameworks>net8.0;net6.0;netstandard2.0</TargetFrameworks>
13-
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
1413
<MinVerTagPrefix>Exporter.Geneva-</MinVerTagPrefix>
1514
<PackageValidationBaselineVersion>1.9.0</PackageValidationBaselineVersion>
1615
<Nullable>disable</Nullable>

‎test/OpenTelemetry.Exporter.Geneva.Stress/OpenTelemetry.Exporter.Geneva.Stress.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
54
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
6-
<TargetFrameworks>$(SupportedNetTargets)</TargetFrameworks>
5+
<TargetFrameworks>net8.0</TargetFrameworks>
76
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net48;net472;net471;net47;net462</TargetFrameworks>
8-
<NoWarn>$(NoWarn),SA1308,SA1201</NoWarn>
7+
<OutputType>Exe</OutputType>
8+
<NoWarn>$(NoWarn);SA1308;SA1201</NoWarn>
99
<Nullable>disable</Nullable>
1010
</PropertyGroup>
1111

‎test/OpenTelemetry.Exporter.Geneva.Tests/OpenTelemetry.Exporter.Geneva.Tests.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<Import Project="$(RepoRoot)\src\OpenTelemetry.Exporter.Geneva\Common.GenevaExporter.props" />
34

45
<PropertyGroup>
5-
<Description>Unit test project for Geneva Exporters for OpenTelemetry</Description>
66
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
7-
<TargetFrameworks>$(SupportedNetTargets)</TargetFrameworks>
7+
<TargetFrameworks>net8.0</TargetFrameworks>
88
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net48;net472;net471;net47;net462</TargetFrameworks>
9-
<NoWarn>$(NoWarn),SA1311,SA1312,SA1313,SA1123,SA1202,OTEL1002</NoWarn>
9+
<Description>Unit test project for Geneva Exporters for OpenTelemetry.</Description>
10+
<NoWarn>$(NoWarn);SA1311;SA1312;SA1313;SA1123;SA1202;OTEL1002</NoWarn>
1011
<Nullable>disable</Nullable>
1112
</PropertyGroup>
1213

0 commit comments

Comments
 (0)