From 8700d5dd9b1a17c2cecacf428086309b76218226 Mon Sep 17 00:00:00 2001 From: Cijo Thomas Date: Sun, 28 Aug 2022 13:09:24 -0400 Subject: [PATCH] Update test and other tools versions (#3611) --- .vscode/settings.json | 1 + build/Common.nonprod.props | 12 +++++------ build/Common.props | 8 ++++---- .../OtlpMetricsExporterTests.cs | 20 +++++++++---------- ...OpenTelemetryEventSourceLogEmitterTests.cs | 2 +- .../OpenTelemetrySerilogSinkTests.cs | 3 ++- .../Trace/TracerProviderSdkTest.cs | 12 +++++------ 7 files changed, 30 insertions(+), 28 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index b267a513f..d50e0ea85 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -36,6 +36,7 @@ "struct", "tbody", "thead", + "tracestate", "triager", "umesan", "unencrypted", diff --git a/build/Common.nonprod.props b/build/Common.nonprod.props index 4c29be56e..5bde15718 100644 --- a/build/Common.nonprod.props +++ b/build/Common.nonprod.props @@ -34,20 +34,20 @@ [2.3.0,3.0) [2.3.1,3.0) [3.19.4,4.0) - [2.43.0,3.0) - [2.43.0, 3.0) - [2.44.0,3.0) + [2.48.0,3.0) + [2.48.0, 3.0) + [2.48.0,3.0) [3.1.6,5.0) [6.0.0,) [6.0.0,) - [16.10.0] + [17.3.0] [4.14.5,5.0) [6.1.0,7.0) [1.0.0,2.0) [6.4.0] 6.0.5 - [2.4.3,3.0) - [2.4.1,3.0) + [2.4.5,3.0) + [2.4.2,3.0) diff --git a/build/Common.props b/build/Common.props index 9461bd404..03ac93b08 100644 --- a/build/Common.props +++ b/build/Common.props @@ -22,15 +22,15 @@ Please sort alphabetically. Refer to https://docs.microsoft.com/nuget/concepts/package-versioning for semver syntax. --> - [4.1.0,5.0) + [4.2.0,5.0) [3.19.4,4.0) [2.44.0,3.0) [2.43.0,3.0) [2.44.0,3.0) [2.1.1,6.0) [2.1.1,6.0) - [3.3.1] - [16.10.0] + [3.3.3] + [17.3.0] [2.1.0,) [3.1.0,) [3.1.0,) @@ -40,7 +40,7 @@ [0.12.1,0.13) 1.3.0 [2.8.0,3.0) - [1.2.0-beta.354,2.0) + [1.2.0-beta.435,2.0) 1.4.0 7.0.0-preview.7.22375.6 4.7.0 diff --git a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OtlpMetricsExporterTests.cs b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OtlpMetricsExporterTests.cs index 4dbdeb0ba..21abf56c1 100644 --- a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OtlpMetricsExporterTests.cs +++ b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OtlpMetricsExporterTests.cs @@ -204,9 +204,9 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests } [Theory] - [InlineData("test_gauge", null, null, 123, null)] + [InlineData("test_gauge", null, null, 123L, null)] [InlineData("test_gauge", null, null, null, 123.45)] - [InlineData("test_gauge", "description", "unit", 123, null)] + [InlineData("test_gauge", "description", "unit", 123L, null)] public void TestGaugeToOtlpMetric(string name, string description, string unit, long? longValue, double? doubleValue) { var metrics = new List(); @@ -271,11 +271,11 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests } [Theory] - [InlineData("test_counter", null, null, 123, null, MetricReaderTemporalityPreference.Cumulative, true)] + [InlineData("test_counter", null, null, 123L, null, MetricReaderTemporalityPreference.Cumulative, true)] [InlineData("test_counter", null, null, null, 123.45, MetricReaderTemporalityPreference.Cumulative, true)] - [InlineData("test_counter", null, null, 123, null, MetricReaderTemporalityPreference.Delta, true)] - [InlineData("test_counter", "description", "unit", 123, null, MetricReaderTemporalityPreference.Cumulative, true)] - [InlineData("test_counter", null, null, 123, null, MetricReaderTemporalityPreference.Delta, true, "key1", "value1", "key2", 123)] + [InlineData("test_counter", null, null, 123L, null, MetricReaderTemporalityPreference.Delta, true)] + [InlineData("test_counter", "description", "unit", 123L, null, MetricReaderTemporalityPreference.Cumulative, true)] + [InlineData("test_counter", null, null, 123L, null, MetricReaderTemporalityPreference.Delta, true, "key1", "value1", "key2", 123)] public void TestCounterToOtlpMetric(string name, string description, string unit, long? longValue, double? doubleValue, MetricReaderTemporalityPreference aggregationTemporality, bool isMonotonic, params object[] keysValues) { var metrics = new List(); @@ -360,11 +360,11 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests } [Theory] - [InlineData("test_histogram", null, null, 123, null, MetricReaderTemporalityPreference.Cumulative)] + [InlineData("test_histogram", null, null, 123L, null, MetricReaderTemporalityPreference.Cumulative)] [InlineData("test_histogram", null, null, null, 123.45, MetricReaderTemporalityPreference.Cumulative)] - [InlineData("test_histogram", null, null, 123, null, MetricReaderTemporalityPreference.Delta)] - [InlineData("test_histogram", "description", "unit", 123, null, MetricReaderTemporalityPreference.Cumulative)] - [InlineData("test_histogram", null, null, 123, null, MetricReaderTemporalityPreference.Delta, "key1", "value1", "key2", 123)] + [InlineData("test_histogram", null, null, 123L, null, MetricReaderTemporalityPreference.Delta)] + [InlineData("test_histogram", "description", "unit", 123L, null, MetricReaderTemporalityPreference.Cumulative)] + [InlineData("test_histogram", null, null, 123L, null, MetricReaderTemporalityPreference.Delta, "key1", "value1", "key2", 123)] public void TestHistogramToOtlpMetric(string name, string description, string unit, long? longValue, double? doubleValue, MetricReaderTemporalityPreference aggregationTemporality, params object[] keysValues) { var metrics = new List(); diff --git a/test/OpenTelemetry.Extensions.EventSource.Tests/OpenTelemetryEventSourceLogEmitterTests.cs b/test/OpenTelemetry.Extensions.EventSource.Tests/OpenTelemetryEventSourceLogEmitterTests.cs index 1da0f6ef0..e21b60c10 100644 --- a/test/OpenTelemetry.Extensions.EventSource.Tests/OpenTelemetryEventSourceLogEmitterTests.cs +++ b/test/OpenTelemetry.Extensions.EventSource.Tests/OpenTelemetryEventSourceLogEmitterTests.cs @@ -271,7 +271,7 @@ namespace OpenTelemetry.Extensions.EventSource.Tests Assert.Equal(4, exportedItems.Count); var logRecord = exportedItems[1]; - + Assert.NotNull(logRecord.StateValues); if (enableTplListener) { Assert.Contains(logRecord.StateValues, kvp => kvp.Key == "event_source.activity_id"); diff --git a/test/OpenTelemetry.Extensions.Serilog.Tests/OpenTelemetrySerilogSinkTests.cs b/test/OpenTelemetry.Extensions.Serilog.Tests/OpenTelemetrySerilogSinkTests.cs index b1978aa5c..cee32f26b 100644 --- a/test/OpenTelemetry.Extensions.Serilog.Tests/OpenTelemetrySerilogSinkTests.cs +++ b/test/OpenTelemetry.Extensions.Serilog.Tests/OpenTelemetrySerilogSinkTests.cs @@ -227,10 +227,11 @@ namespace OpenTelemetry.Extensions.Serilog.Tests LogRecord logRecord = exportedItems[0]; + Assert.NotNull(logRecord.StateValues); Assert.Contains(logRecord.StateValues, kvp => kvp.Key == "data" && kvp.Value is int[] typedArray && intArray.SequenceEqual(typedArray)); logRecord = exportedItems[1]; - + Assert.NotNull(logRecord.StateValues); Assert.Contains(logRecord.StateValues, kvp => kvp.Key == "data" && kvp.Value is object?[] typedArray && mixedArray.SequenceEqual(typedArray)); } diff --git a/test/OpenTelemetry.Tests/Trace/TracerProviderSdkTest.cs b/test/OpenTelemetry.Tests/Trace/TracerProviderSdkTest.cs index e487d334e..ce3a8ba06 100644 --- a/test/OpenTelemetry.Tests/Trace/TracerProviderSdkTest.cs +++ b/test/OpenTelemetry.Tests/Trace/TracerProviderSdkTest.cs @@ -602,7 +602,7 @@ namespace OpenTelemetry.Trace.Tests Assert.False(emptyActivitySource.HasListeners()); // No ActivityListener for empty ActivitySource added yet var operationNameForLegacyActivity = "TestOperationName"; - var activitySourceForLegacyActvity = new ActivitySource("TestActivitySource", "1.0.0"); + var activitySourceForLegacyActivity = new ActivitySource("TestActivitySource", "1.0.0"); // AddLegacyOperationName chained to TracerProviderBuilder using var tracerProvider = Sdk.CreateTracerProviderBuilder() @@ -614,7 +614,7 @@ namespace OpenTelemetry.Trace.Tests Activity activity = new Activity(operationNameForLegacyActivity); activity.Start(); - ActivityInstrumentationHelper.SetActivitySourceProperty(activity, activitySourceForLegacyActvity); + ActivityInstrumentationHelper.SetActivitySourceProperty(activity, activitySourceForLegacyActivity); activity.Stop(); Assert.True(startCalled); // Processor.OnStart is called since we provided the legacy OperationName @@ -651,11 +651,11 @@ namespace OpenTelemetry.Trace.Tests Assert.False(emptyActivitySource.HasListeners()); // No ActivityListener for empty ActivitySource added yet var operationNameForLegacyActivity = "TestOperationName"; - var activitySourceForLegacyActvity = new ActivitySource("TestActivitySource", "1.0.0"); + var activitySourceForLegacyActivity = new ActivitySource("TestActivitySource", "1.0.0"); // AddLegacyOperationName chained to TracerProviderBuilder using var tracerProvider = Sdk.CreateTracerProviderBuilder() - .AddSource(activitySourceForLegacyActvity.Name) // Add the updated ActivitySource as a Source + .AddSource(activitySourceForLegacyActivity.Name) // Add the updated ActivitySource as a Source .AddLegacySource(operationNameForLegacyActivity) .AddProcessor(testActivityProcessor) .Build(); @@ -664,7 +664,7 @@ namespace OpenTelemetry.Trace.Tests Activity activity = new Activity(operationNameForLegacyActivity); activity.Start(); - ActivityInstrumentationHelper.SetActivitySourceProperty(activity, activitySourceForLegacyActvity); + ActivityInstrumentationHelper.SetActivitySourceProperty(activity, activitySourceForLegacyActivity); activity.Stop(); Assert.True(startCalled); // Processor.OnStart is called since we provided the legacy OperationName @@ -1042,7 +1042,7 @@ namespace OpenTelemetry.Trace.Tests Assert.NotNull(resource); Assert.NotEqual(Resource.Empty, resource); Assert.Single(resource.Attributes); - Assert.Equal(resource.Attributes.FirstOrDefault().Key, ResourceSemanticConventions.AttributeServiceName); + Assert.Equal(ResourceSemanticConventions.AttributeServiceName, resource.Attributes.FirstOrDefault().Key); Assert.Contains("unknown_service", (string)resource.Attributes.FirstOrDefault().Value); }