diff --git a/.editorconfig b/.editorconfig index fcbf24f9..6281a19e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,6 +5,7 @@ # All files [*] charset = utf-8 +end_of_line = crlf indent_style = space indent_size = 2 insert_final_newline = true @@ -106,7 +107,7 @@ csharp_style_prefer_index_operator = false:none csharp_style_prefer_range_operator = false:none csharp_style_pattern_local_over_anonymous_function = true:suggestion csharp_style_deconstructed_variable_declaration = true:suggestion -csharp_style_namespace_declarations = file_scoped:warning +csharp_style_namespace_declarations = file_scoped:suggestion # Space preferences csharp_space_after_cast = false diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..176a458f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml index 0bee9005..edd5fbfb 100644 --- a/.github/workflows/dotnet-format.yml +++ b/.github/workflows/dotnet-format.yml @@ -23,8 +23,5 @@ jobs: with: persist-credentials: false - - name: Install format tool - run: dotnet tool install -g dotnet-format - - name: dotnet format - run: dotnet-format --folder --check + run: dotnet format --verify-no-changes diff --git a/src/Grafana.OpenTelemetry.Base/ExporterSettings/OtlpExporter.cs b/src/Grafana.OpenTelemetry.Base/ExporterSettings/OtlpExporter.cs index 2a023bf4..85be7dd6 100644 --- a/src/Grafana.OpenTelemetry.Base/ExporterSettings/OtlpExporter.cs +++ b/src/Grafana.OpenTelemetry.Base/ExporterSettings/OtlpExporter.cs @@ -4,7 +4,6 @@ // using System; -using Microsoft.Extensions.Configuration; using OpenTelemetry.Exporter; using OpenTelemetry.Logs; using OpenTelemetry.Metrics; diff --git a/src/Grafana.OpenTelemetry.Base/GrafanaOpenTelemetryResourceDetector.cs b/src/Grafana.OpenTelemetry.Base/GrafanaOpenTelemetryResourceDetector.cs index 5da1e4e4..ecce1d05 100644 --- a/src/Grafana.OpenTelemetry.Base/GrafanaOpenTelemetryResourceDetector.cs +++ b/src/Grafana.OpenTelemetry.Base/GrafanaOpenTelemetryResourceDetector.cs @@ -3,9 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 // -using System; using System.Collections.Generic; -using System.Diagnostics; using System.Reflection; using OpenTelemetry.Resources; diff --git a/src/Grafana.OpenTelemetry.Base/GrafanaOpenTelemetrySettings.cs b/src/Grafana.OpenTelemetry.Base/GrafanaOpenTelemetrySettings.cs index 96c1723f..da2292e2 100644 --- a/src/Grafana.OpenTelemetry.Base/GrafanaOpenTelemetrySettings.cs +++ b/src/Grafana.OpenTelemetry.Base/GrafanaOpenTelemetrySettings.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Reflection; using Microsoft.Extensions.Configuration; diff --git a/src/Grafana.OpenTelemetry.Base/Instrumentations/OwinInitializer.cs b/src/Grafana.OpenTelemetry.Base/Instrumentations/OwinInitializer.cs index a0bd3dfd..c557c7a7 100644 --- a/src/Grafana.OpenTelemetry.Base/Instrumentations/OwinInitializer.cs +++ b/src/Grafana.OpenTelemetry.Base/Instrumentations/OwinInitializer.cs @@ -3,7 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 // -using System; using OpenTelemetry.Trace; namespace Grafana.OpenTelemetry diff --git a/src/Grafana.OpenTelemetry.Base/ReflectionHelper.cs b/src/Grafana.OpenTelemetry.Base/ReflectionHelper.cs index 4e214068..ce4ac384 100644 --- a/src/Grafana.OpenTelemetry.Base/ReflectionHelper.cs +++ b/src/Grafana.OpenTelemetry.Base/ReflectionHelper.cs @@ -3,7 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 // -using System; using System.Linq; using System.Reflection; diff --git a/src/Grafana.OpenTelemetry.Base/ResourceDetectors/ContainerResource.cs b/src/Grafana.OpenTelemetry.Base/ResourceDetectors/ContainerResource.cs index f8110fee..d61f9c99 100644 --- a/src/Grafana.OpenTelemetry.Base/ResourceDetectors/ContainerResource.cs +++ b/src/Grafana.OpenTelemetry.Base/ResourceDetectors/ContainerResource.cs @@ -3,10 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 // -using OpenTelemetry.Resources; - #if NET8_0_OR_GREATER +using OpenTelemetry.Resources; + namespace Grafana.OpenTelemetry { internal class ContainerResourceInitializer : ResourceDetectorInitializer diff --git a/tests/Grafana.OpenTelemetry.Tests/GrafanaCloudConfigurationHelperTest.cs b/tests/Grafana.OpenTelemetry.Tests/GrafanaCloudConfigurationHelperTest.cs index a4d3face..6980c15b 100644 --- a/tests/Grafana.OpenTelemetry.Tests/GrafanaCloudConfigurationHelperTest.cs +++ b/tests/Grafana.OpenTelemetry.Tests/GrafanaCloudConfigurationHelperTest.cs @@ -4,7 +4,6 @@ // using System; -using Grafana.OpenTelemetry; using Xunit; namespace Grafana.OpenTelemetry.Tests diff --git a/tests/Grafana.OpenTelemetry.Tests/GrafanaOpenTelemetrySettingsTest.cs b/tests/Grafana.OpenTelemetry.Tests/GrafanaOpenTelemetrySettingsTest.cs index 0f8df988..b761d110 100644 --- a/tests/Grafana.OpenTelemetry.Tests/GrafanaOpenTelemetrySettingsTest.cs +++ b/tests/Grafana.OpenTelemetry.Tests/GrafanaOpenTelemetrySettingsTest.cs @@ -6,7 +6,6 @@ using System; using System.Collections.Generic; using System.Reflection; -using Grafana.OpenTelemetry; using Xunit; namespace Grafana.OpenTelemetry.Tests diff --git a/tests/Grafana.OpenTelemetry.Tests/InMemoryResourceExporter.cs b/tests/Grafana.OpenTelemetry.Tests/InMemoryResourceExporter.cs index 40e8c896..2bd05eeb 100644 --- a/tests/Grafana.OpenTelemetry.Tests/InMemoryResourceExporter.cs +++ b/tests/Grafana.OpenTelemetry.Tests/InMemoryResourceExporter.cs @@ -6,7 +6,6 @@ using System; using System.Collections.Generic; using OpenTelemetry; -using OpenTelemetry.Exporter; using OpenTelemetry.Resources; namespace Grafana.OpenTelemetry.Tests diff --git a/tests/Grafana.OpenTelemetry.Tests/MeterProviderExtensionsTest.cs b/tests/Grafana.OpenTelemetry.Tests/MeterProviderExtensionsTest.cs index 54ad06fa..95e17f1e 100644 --- a/tests/Grafana.OpenTelemetry.Tests/MeterProviderExtensionsTest.cs +++ b/tests/Grafana.OpenTelemetry.Tests/MeterProviderExtensionsTest.cs @@ -3,7 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 // -using Grafana.OpenTelemetry; using OpenTelemetry; using OpenTelemetry.Metrics; using Xunit; diff --git a/tests/Grafana.OpenTelemetry.Tests/OpenTelemetryLoggerOptionsExtensionsTest.cs b/tests/Grafana.OpenTelemetry.Tests/OpenTelemetryLoggerOptionsExtensionsTest.cs index 28828100..627b286d 100644 --- a/tests/Grafana.OpenTelemetry.Tests/OpenTelemetryLoggerOptionsExtensionsTest.cs +++ b/tests/Grafana.OpenTelemetry.Tests/OpenTelemetryLoggerOptionsExtensionsTest.cs @@ -3,9 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 // -using Grafana.OpenTelemetry; using Microsoft.Extensions.Logging; -using OpenTelemetry.Logs; using Xunit; namespace Grafana.OpenTelemetry.Tests diff --git a/tests/Grafana.OpenTelemetry.Tests/ReflectionHelperTest.cs b/tests/Grafana.OpenTelemetry.Tests/ReflectionHelperTest.cs index c2c3d93a..5878e990 100644 --- a/tests/Grafana.OpenTelemetry.Tests/ReflectionHelperTest.cs +++ b/tests/Grafana.OpenTelemetry.Tests/ReflectionHelperTest.cs @@ -4,7 +4,6 @@ // using System; -using Grafana.OpenTelemetry; using Xunit; namespace Grafana.OpenTelemetry.Tests diff --git a/tests/Grafana.OpenTelemetry.Tests/TracerProviderExtensionsTest.cs b/tests/Grafana.OpenTelemetry.Tests/TracerProviderExtensionsTest.cs index beb56928..7c1a59ec 100644 --- a/tests/Grafana.OpenTelemetry.Tests/TracerProviderExtensionsTest.cs +++ b/tests/Grafana.OpenTelemetry.Tests/TracerProviderExtensionsTest.cs @@ -6,7 +6,6 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using Grafana.OpenTelemetry; using OpenTelemetry; using OpenTelemetry.Resources; using OpenTelemetry.Trace;