diff --git a/build/Common.props b/build/Common.props index ccb12088f..3e5a23850 100644 --- a/build/Common.props +++ b/build/Common.props @@ -40,7 +40,7 @@ [0.12.1,0.13) 1.1.0 [2.1.58,3.0) - [1.1.118,2.0) + [1.2.0-beta.354,2.0) 1.4.0 6.0.0 4.7.0 diff --git a/build/OpenTelemetry.prod.loose.ruleset b/build/OpenTelemetry.prod.loose.ruleset index ddcf88f0b..86028efb6 100644 --- a/build/OpenTelemetry.prod.loose.ruleset +++ b/build/OpenTelemetry.prod.loose.ruleset @@ -5,8 +5,7 @@ - - + @@ -126,7 +125,7 @@ - + diff --git a/build/OpenTelemetry.prod.ruleset b/build/OpenTelemetry.prod.ruleset index 9cc34db2f..91dac9f47 100644 --- a/build/OpenTelemetry.prod.ruleset +++ b/build/OpenTelemetry.prod.ruleset @@ -5,11 +5,10 @@ - - + diff --git a/build/OpenTelemetry.test.ruleset b/build/OpenTelemetry.test.ruleset index b60189794..ae99a1778 100644 --- a/build/OpenTelemetry.test.ruleset +++ b/build/OpenTelemetry.test.ruleset @@ -6,8 +6,6 @@ - - diff --git a/examples/Console/TestOtlpExporter.cs b/examples/Console/TestOtlpExporter.cs index da28553ad..1dafc6c8d 100644 --- a/examples/Console/TestOtlpExporter.cs +++ b/examples/Console/TestOtlpExporter.cs @@ -99,7 +99,7 @@ namespace Examples.Console { "grpc" => OtlpExportProtocol.Grpc, "http/protobuf" => OtlpExportProtocol.HttpProtobuf, - _ => null + _ => null, }; } } diff --git a/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerSpanRefType.cs b/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerSpanRefType.cs index 91fa06c06..031a6d151 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerSpanRefType.cs +++ b/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerSpanRefType.cs @@ -22,12 +22,12 @@ namespace OpenTelemetry.Exporter.Jaeger.Implementation internal enum JaegerSpanRefType { /// - /// A child span + /// A child span. /// CHILD_OF = 0, /// - /// A sibling span + /// A sibling span. /// FOLLOWS_FROM = 1, } diff --git a/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerTagType.cs b/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerTagType.cs index 4d137dc49..3aeb58674 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerTagType.cs +++ b/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerTagType.cs @@ -22,27 +22,27 @@ namespace OpenTelemetry.Exporter.Jaeger.Implementation internal enum JaegerTagType { /// - /// Tag contains a string + /// Tag contains a string. /// STRING = 0, /// - /// Tag contains a double + /// Tag contains a double. /// DOUBLE = 1, /// - /// Tag contains a boolean + /// Tag contains a boolean. /// BOOL = 2, /// - /// Tag contains a long + /// Tag contains a long. /// LONG = 3, /// - /// Tag contains binary data + /// Tag contains binary data. /// BINARY = 4, } diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpExporterOptionsExtensions.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpExporterOptionsExtensions.cs index ce1ad4b7c..6ca87995e 100644 --- a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpExporterOptionsExtensions.cs +++ b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpExporterOptionsExtensions.cs @@ -92,7 +92,7 @@ namespace OpenTelemetry.Exporter { OtlpExportProtocol.Grpc => new OtlpGrpcTraceExportClient(options), OtlpExportProtocol.HttpProtobuf => new OtlpHttpTraceExportClient(options), - _ => throw new NotSupportedException($"Protocol {options.Protocol} is not supported.") + _ => throw new NotSupportedException($"Protocol {options.Protocol} is not supported."), }; public static OtlpExportProtocol? ToOtlpExportProtocol(this string protocol) => @@ -100,7 +100,7 @@ namespace OpenTelemetry.Exporter { "grpc" => OtlpExportProtocol.Grpc, "http/protobuf" => OtlpExportProtocol.HttpProtobuf, - _ => null + _ => null, }; public static Uri AppendPathIfNotPresent(this Uri uri, string path) diff --git a/src/OpenTelemetry.Exporter.Prometheus/Implementation/PrometheusExporterExtensions.cs b/src/OpenTelemetry.Exporter.Prometheus/Implementation/PrometheusExporterExtensions.cs index 8fc0c7296..39c357a59 100644 --- a/src/OpenTelemetry.Exporter.Prometheus/Implementation/PrometheusExporterExtensions.cs +++ b/src/OpenTelemetry.Exporter.Prometheus/Implementation/PrometheusExporterExtensions.cs @@ -143,20 +143,20 @@ namespace OpenTelemetry.Exporter.Prometheus if (TryGetMetric(ref enumerator, out var state)) { - await WriteMetric(stream, getUtcNowDateTimeOffset, buffer, metricInfo, metricInfo.HistogramSumUtf8, state.keys, state.values, state.sum).ConfigureAwait(false); + await WriteMetric(stream, getUtcNowDateTimeOffset, buffer, metricInfo, metricInfo.HistogramSumUtf8, state.Keys, state.Values, state.Sum).ConfigureAwait(false); - await WriteMetric(stream, getUtcNowDateTimeOffset, buffer, metricInfo, metricInfo.HistogramCountUtf8, state.keys, state.values, state.count).ConfigureAwait(false); + await WriteMetric(stream, getUtcNowDateTimeOffset, buffer, metricInfo, metricInfo.HistogramCountUtf8, state.Keys, state.Values, state.Count).ConfigureAwait(false); - if (state.explicitBounds != null) + if (state.ExplicitBounds != null) { long totalCount = 0; - for (int i = 0; i < state.explicitBounds.Length + 1; i++) + for (int i = 0; i < state.ExplicitBounds.Length + 1; i++) { - totalCount += state.bucketCounts[i]; + totalCount += state.BucketCounts[i]; - byte[] bucketValueUtf8 = i == state.explicitBounds.Length + byte[] bucketValueUtf8 = i == state.ExplicitBounds.Length ? PrometheusHistogramBucketLabelPositiveInfinityUtf8 - : metricInfo.GetBucketUtf8(state.explicitBounds[i]); + : metricInfo.GetBucketUtf8(state.ExplicitBounds[i]); await WriteMetric( stream, @@ -164,8 +164,8 @@ namespace OpenTelemetry.Exporter.Prometheus buffer, metricInfo, metricInfo.HistogramBucketUtf8, - state.keys, - state.values, + state.Keys, + state.Values, totalCount, additionalKvp: new KeyValuePair(PrometheusHistogramBucketLabelLessThanUtf8, bucketValueUtf8)).ConfigureAwait(false); } @@ -174,7 +174,7 @@ namespace OpenTelemetry.Exporter.Prometheus static bool TryGetMetric( ref BatchMetricPoint.Enumerator enumerator, - out (string[] keys, object[] values, double sum, long count, double[] explicitBounds, long[] bucketCounts) state) + out (string[] Keys, object[] Values, double Sum, long Count, double[] ExplicitBounds, long[] BucketCounts) state) { if (!enumerator.MoveNext()) { diff --git a/src/OpenTelemetry.Exporter.Prometheus/Implementation/PrometheusMetricsFormatHelper.cs b/src/OpenTelemetry.Exporter.Prometheus/Implementation/PrometheusMetricsFormatHelper.cs index 7934054d6..0be030860 100644 --- a/src/OpenTelemetry.Exporter.Prometheus/Implementation/PrometheusMetricsFormatHelper.cs +++ b/src/OpenTelemetry.Exporter.Prometheus/Implementation/PrometheusMetricsFormatHelper.cs @@ -29,12 +29,12 @@ namespace OpenTelemetry.Exporter.Prometheus { #if NETCOREAPP3_1_OR_GREATER private static readonly SpanAction)> CreateName - = (Span data, (string name, Func isCharacterAllowedFunc) state) => + = (Span data, (string Name, Func IsCharacterAllowedFunc) state) => { - for (var i = 0; i < state.name.Length; i++) + for (var i = 0; i < state.Name.Length; i++) { - var c = state.name[i]; - data[i] = state.isCharacterAllowedFunc(c, i == 0) + var c = state.Name[i]; + data[i] = state.IsCharacterAllowedFunc(c, i == 0) ? c : '_'; } diff --git a/src/OpenTelemetry.Exporter.Zipkin/Implementation/ZipkinEndpoint.cs b/src/OpenTelemetry.Exporter.Zipkin/Implementation/ZipkinEndpoint.cs index 19543618c..db850fc3f 100644 --- a/src/OpenTelemetry.Exporter.Zipkin/Implementation/ZipkinEndpoint.cs +++ b/src/OpenTelemetry.Exporter.Zipkin/Implementation/ZipkinEndpoint.cs @@ -13,6 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // + using System.Collections.Generic; using System.Text.Json; @@ -54,11 +55,11 @@ namespace OpenTelemetry.Exporter.Zipkin.Implementation return new ZipkinEndpoint(serviceName); } - public static ZipkinEndpoint Create((string name, int port) serviceNameAndPort) + public static ZipkinEndpoint Create((string Name, int Port) serviceNameAndPort) { - var serviceName = serviceNameAndPort.port == default - ? serviceNameAndPort.name - : $"{serviceNameAndPort.name}:{serviceNameAndPort.port}"; + var serviceName = serviceNameAndPort.Port == default + ? serviceNameAndPort.Name + : $"{serviceNameAndPort.Name}:{serviceNameAndPort.Port}"; return new ZipkinEndpoint(serviceName); } diff --git a/src/OpenTelemetry/Trace/TracerProviderSdk.cs b/src/OpenTelemetry/Trace/TracerProviderSdk.cs index 8c7d5fc9b..980d20287 100644 --- a/src/OpenTelemetry/Trace/TracerProviderSdk.cs +++ b/src/OpenTelemetry/Trace/TracerProviderSdk.cs @@ -403,7 +403,7 @@ namespace OpenTelemetry.Trace { SamplingDecision.RecordAndSample => ActivitySamplingResult.AllDataAndRecorded, SamplingDecision.RecordOnly => ActivitySamplingResult.AllData, - _ => ActivitySamplingResult.PropagationData + _ => ActivitySamplingResult.PropagationData, }; if (activitySamplingResult != ActivitySamplingResult.PropagationData) diff --git a/test/OpenTelemetry.Tests.Stress/Skeleton.cs b/test/OpenTelemetry.Tests.Stress/Skeleton.cs index 96f19819e..3847b5f15 100644 --- a/test/OpenTelemetry.Tests.Stress/Skeleton.cs +++ b/test/OpenTelemetry.Tests.Stress/Skeleton.cs @@ -101,7 +101,8 @@ public partial class Program output = $"Loops: {cntLoopsNew:n0}, Loops/Second: {nLoopsPerSecond:n0}, CPU Cycles/Loop: {nCpuCyclesPerLoop:n0}"; Console.Title = output; } - }, () => + }, + () => { Parallel.For(0, concurrency, (i) => { diff --git a/test/OpenTelemetry.Tests/Resources/ResourceTest.cs b/test/OpenTelemetry.Tests/Resources/ResourceTest.cs index cc5bc3bc2..98b485100 100644 --- a/test/OpenTelemetry.Tests/Resources/ResourceTest.cs +++ b/test/OpenTelemetry.Tests/Resources/ResourceTest.cs @@ -518,9 +518,7 @@ namespace OpenTelemetry.Resources.Tests var endInd = endIndex == 0 ? keyValuePairs.Length - 1 : endIndex; for (var i = startIndex; i <= endInd; ++i) { - Assert.Contains( - new KeyValuePair( - $"{KeyName}{i}", $"{ValueName}{i}"), keyValuePairs); + Assert.Contains(new KeyValuePair($"{KeyName}{i}", $"{ValueName}{i}"), keyValuePairs); } }