open-telemetry
/
opentelemetry-dotnet
mirror of https://github.com/open-telemetry/opentelemetry-dotnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update test and other tools versions (#3611)

This commit is contained in:
Cijo Thomas 2022-08-28 13:09:24 -04:00 committed by GitHub
parent 28c0bccca8
commit 8700d5dd9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.vscode/settings.json vendored
View File

@ -36,6 +36,7 @@
"struct", "struct",
"tbody", "tbody",
"thead", "thead",
"tracestate",
"triager", "triager",
"umesan", "umesan",
"unencrypted", "unencrypted",

12
build/Common.nonprod.props
View File

@ -34,20 +34,20 @@
<CommandLineParserPkgVer>[2.3.0,3.0)</CommandLineParserPkgVer> <CommandLineParserPkgVer>[2.3.0,3.0)</CommandLineParserPkgVer>
<DotNetXUnitCliVer>[2.3.1,3.0)</DotNetXUnitCliVer> <DotNetXUnitCliVer>[2.3.1,3.0)</DotNetXUnitCliVer>
<GoogleProtobufPkgVer>[3.19.4,4.0)</GoogleProtobufPkgVer> <GoogleProtobufPkgVer>[3.19.4,4.0)</GoogleProtobufPkgVer>
<GrpcAspNetCorePkgVer>[2.43.0,3.0)</GrpcAspNetCorePkgVer> <GrpcAspNetCorePkgVer>[2.48.0,3.0)</GrpcAspNetCorePkgVer>
<GrpcAspNetCoreServerPkgVer>[2.43.0, 3.0)</GrpcAspNetCoreServerPkgVer> <GrpcAspNetCoreServerPkgVer>[2.48.0, 3.0)</GrpcAspNetCoreServerPkgVer>
<GrpcToolsPkgVer>[2.44.0,3.0)</GrpcToolsPkgVer> <GrpcToolsPkgVer>[2.48.0,3.0)</GrpcToolsPkgVer>
<MicrosoftExtensionsHostingPkgVer>[3.1.6,5.0)</MicrosoftExtensionsHostingPkgVer> <MicrosoftExtensionsHostingPkgVer>[3.1.6,5.0)</MicrosoftExtensionsHostingPkgVer>
<MicrosoftExtensionsLoggingPkgVer>[6.0.0,)</MicrosoftExtensionsLoggingPkgVer> <MicrosoftExtensionsLoggingPkgVer>[6.0.0,)</MicrosoftExtensionsLoggingPkgVer>
<MicrosoftExtensionsLoggingAbstractionsPkgVer>[6.0.0,)</MicrosoftExtensionsLoggingAbstractionsPkgVer> <MicrosoftExtensionsLoggingAbstractionsPkgVer>[6.0.0,)</MicrosoftExtensionsLoggingAbstractionsPkgVer>
<MicrosoftNETTestSdkPkgVer>[16.10.0]</MicrosoftNETTestSdkPkgVer> <MicrosoftNETTestSdkPkgVer>[17.3.0]</MicrosoftNETTestSdkPkgVer>
<MoqPkgVer>[4.14.5,5.0)</MoqPkgVer> <MoqPkgVer>[4.14.5,5.0)</MoqPkgVer>
<RabbitMQClientPkgVer>[6.1.0,7.0)</RabbitMQClientPkgVer> <RabbitMQClientPkgVer>[6.1.0,7.0)</RabbitMQClientPkgVer>
<RuntimeInstrumentationPkgVer>[1.0.0,2.0)</RuntimeInstrumentationPkgVer> <RuntimeInstrumentationPkgVer>[1.0.0,2.0)</RuntimeInstrumentationPkgVer>
<SwashbuckleAspNetCorePkgVer>[6.4.0]</SwashbuckleAspNetCorePkgVer> <SwashbuckleAspNetCorePkgVer>[6.4.0]</SwashbuckleAspNetCorePkgVer>
<SystemTextJsonPkgVer>6.0.5</SystemTextJsonPkgVer> <SystemTextJsonPkgVer>6.0.5</SystemTextJsonPkgVer>
<XUnitRunnerVisualStudioPkgVer>[2.4.3,3.0)</XUnitRunnerVisualStudioPkgVer> <XUnitRunnerVisualStudioPkgVer>[2.4.5,3.0)</XUnitRunnerVisualStudioPkgVer>
<XUnitPkgVer>[2.4.1,3.0)</XUnitPkgVer> <XUnitPkgVer>[2.4.2,3.0)</XUnitPkgVer>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

8
build/Common.props
View File

@ -22,15 +22,15 @@
Please sort alphabetically. Please sort alphabetically.
Refer to https://docs.microsoft.com/nuget/concepts/package-versioning for semver syntax. Refer to https://docs.microsoft.com/nuget/concepts/package-versioning for semver syntax.
--> -->
<MinVerPkgVer>[4.1.0,5.0)</MinVerPkgVer> <MinVerPkgVer>[4.2.0,5.0)</MinVerPkgVer>
<GoogleProtobufPkgVer>[3.19.4,4.0)</GoogleProtobufPkgVer> <GoogleProtobufPkgVer>[3.19.4,4.0)</GoogleProtobufPkgVer>
<GrpcPkgVer>[2.44.0,3.0)</GrpcPkgVer> <GrpcPkgVer>[2.44.0,3.0)</GrpcPkgVer>
<GrpcNetClientPkgVer>[2.43.0,3.0)</GrpcNetClientPkgVer> <GrpcNetClientPkgVer>[2.43.0,3.0)</GrpcNetClientPkgVer>
<GrpcToolsPkgVer>[2.44.0,3.0)</GrpcToolsPkgVer> <GrpcToolsPkgVer>[2.44.0,3.0)</GrpcToolsPkgVer>
<MicrosoftAspNetCoreHttpAbstractionsPkgVer>[2.1.1,6.0)</MicrosoftAspNetCoreHttpAbstractionsPkgVer> <MicrosoftAspNetCoreHttpAbstractionsPkgVer>[2.1.1,6.0)</MicrosoftAspNetCoreHttpAbstractionsPkgVer>
<MicrosoftAspNetCoreHttpFeaturesPkgVer>[2.1.1,6.0)</MicrosoftAspNetCoreHttpFeaturesPkgVer> <MicrosoftAspNetCoreHttpFeaturesPkgVer>[2.1.1,6.0)</MicrosoftAspNetCoreHttpFeaturesPkgVer>
<MicrosoftCodeAnalysisAnalyzersPkgVer>[3.3.1]</MicrosoftCodeAnalysisAnalyzersPkgVer> <MicrosoftCodeAnalysisAnalyzersPkgVer>[3.3.3]</MicrosoftCodeAnalysisAnalyzersPkgVer>
<MicrosoftCodeCoveragePkgVer>[16.10.0]</MicrosoftCodeCoveragePkgVer> <MicrosoftCodeCoveragePkgVer>[17.3.0]</MicrosoftCodeCoveragePkgVer>
<MicrosoftExtensionsHostingAbstractionsPkgVer>[2.1.0,)</MicrosoftExtensionsHostingAbstractionsPkgVer> <MicrosoftExtensionsHostingAbstractionsPkgVer>[2.1.0,)</MicrosoftExtensionsHostingAbstractionsPkgVer>
<MicrosoftExtensionsLoggingPkgVer>[3.1.0,)</MicrosoftExtensionsLoggingPkgVer> <MicrosoftExtensionsLoggingPkgVer>[3.1.0,)</MicrosoftExtensionsLoggingPkgVer>
<MicrosoftExtensionsLoggingConfigurationPkgVer>[3.1.0,)</MicrosoftExtensionsLoggingConfigurationPkgVer> <MicrosoftExtensionsLoggingConfigurationPkgVer>[3.1.0,)</MicrosoftExtensionsLoggingConfigurationPkgVer>
@ -40,7 +40,7 @@
<OpenTracingPkgVer>[0.12.1,0.13)</OpenTracingPkgVer> <OpenTracingPkgVer>[0.12.1,0.13)</OpenTracingPkgVer>
<OTelPreviousStableVer>1.3.0</OTelPreviousStableVer> <OTelPreviousStableVer>1.3.0</OTelPreviousStableVer>
<SerilogPkgVer>[2.8.0,3.0)</SerilogPkgVer> <SerilogPkgVer>[2.8.0,3.0)</SerilogPkgVer>
<StyleCopAnalyzersPkgVer>[1.2.0-beta.354,2.0)</StyleCopAnalyzersPkgVer> <StyleCopAnalyzersPkgVer>[1.2.0-beta.435,2.0)</StyleCopAnalyzersPkgVer>
<SystemCollectionsImmutablePkgVer>1.4.0</SystemCollectionsImmutablePkgVer> <SystemCollectionsImmutablePkgVer>1.4.0</SystemCollectionsImmutablePkgVer>
<SystemDiagnosticSourcePkgVer>7.0.0-preview.7.22375.6</SystemDiagnosticSourcePkgVer> <SystemDiagnosticSourcePkgVer>7.0.0-preview.7.22375.6</SystemDiagnosticSourcePkgVer>
<SystemReflectionEmitLightweightPkgVer>4.7.0</SystemReflectionEmitLightweightPkgVer> <SystemReflectionEmitLightweightPkgVer>4.7.0</SystemReflectionEmitLightweightPkgVer>

20
test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OtlpMetricsExporterTests.cs
View File

@ -204,9 +204,9 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests
} }
[Theory] [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", 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) public void TestGaugeToOtlpMetric(string name, string description, string unit, long? longValue, double? doubleValue)
{ {
var metrics = new List<Metric>(); var metrics = new List<Metric>();
@ -271,11 +271,11 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests
} }
[Theory] [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, null, 123.45, MetricReaderTemporalityPreference.Cumulative, true)]
[InlineData("test_counter", null, null, 123, null, MetricReaderTemporalityPreference.Delta, true)] [InlineData("test_counter", null, null, 123L, null, MetricReaderTemporalityPreference.Delta, true)]
[InlineData("test_counter", "description", "unit", 123, null, MetricReaderTemporalityPreference.Cumulative, true)] [InlineData("test_counter", "description", "unit", 123L, 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, "key1", "value1", "key2", 123)]
public void TestCounterToOtlpMetric(string name, string description, string unit, long? longValue, double? doubleValue, MetricReaderTemporalityPreference aggregationTemporality, bool isMonotonic, params object[] keysValues) public void TestCounterToOtlpMetric(string name, string description, string unit, long? longValue, double? doubleValue, MetricReaderTemporalityPreference aggregationTemporality, bool isMonotonic, params object[] keysValues)
{ {
var metrics = new List<Metric>(); var metrics = new List<Metric>();
@ -360,11 +360,11 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests
} }
[Theory] [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, null, 123.45, MetricReaderTemporalityPreference.Cumulative)]
[InlineData("test_histogram", null, null, 123, null, MetricReaderTemporalityPreference.Delta)] [InlineData("test_histogram", null, null, 123L, null, MetricReaderTemporalityPreference.Delta)]
[InlineData("test_histogram", "description", "unit", 123, null, MetricReaderTemporalityPreference.Cumulative)] [InlineData("test_histogram", "description", "unit", 123L, 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, "key1", "value1", "key2", 123)]
public void TestHistogramToOtlpMetric(string name, string description, string unit, long? longValue, double? doubleValue, MetricReaderTemporalityPreference aggregationTemporality, params object[] keysValues) public void TestHistogramToOtlpMetric(string name, string description, string unit, long? longValue, double? doubleValue, MetricReaderTemporalityPreference aggregationTemporality, params object[] keysValues)
{ {
var metrics = new List<Metric>(); var metrics = new List<Metric>();

2
test/OpenTelemetry.Extensions.EventSource.Tests/OpenTelemetryEventSourceLogEmitterTests.cs
View File

@ -271,7 +271,7 @@ namespace OpenTelemetry.Extensions.EventSource.Tests
Assert.Equal(4, exportedItems.Count); Assert.Equal(4, exportedItems.Count);
var logRecord = exportedItems[1]; var logRecord = exportedItems[1];
Assert.NotNull(logRecord.StateValues);
if (enableTplListener) if (enableTplListener)
{ {
Assert.Contains(logRecord.StateValues, kvp => kvp.Key == "event_source.activity_id"); Assert.Contains(logRecord.StateValues, kvp => kvp.Key == "event_source.activity_id");

3
test/OpenTelemetry.Extensions.Serilog.Tests/OpenTelemetrySerilogSinkTests.cs
View File

@ -227,10 +227,11 @@ namespace OpenTelemetry.Extensions.Serilog.Tests
LogRecord logRecord = exportedItems[0]; LogRecord logRecord = exportedItems[0];
Assert.NotNull(logRecord.StateValues);
Assert.Contains(logRecord.StateValues, kvp => kvp.Key == "data" && kvp.Value is int[] typedArray && intArray.SequenceEqual(typedArray)); Assert.Contains(logRecord.StateValues, kvp => kvp.Key == "data" && kvp.Value is int[] typedArray && intArray.SequenceEqual(typedArray));
logRecord = exportedItems[1]; logRecord = exportedItems[1];
Assert.NotNull(logRecord.StateValues);
Assert.Contains(logRecord.StateValues, kvp => kvp.Key == "data" && kvp.Value is object?[] typedArray && mixedArray.SequenceEqual(typedArray)); Assert.Contains(logRecord.StateValues, kvp => kvp.Key == "data" && kvp.Value is object?[] typedArray && mixedArray.SequenceEqual(typedArray));
} }

12
test/OpenTelemetry.Tests/Trace/TracerProviderSdkTest.cs
View File

@ -602,7 +602,7 @@ namespace OpenTelemetry.Trace.Tests
Assert.False(emptyActivitySource.HasListeners()); // No ActivityListener for empty ActivitySource added yet Assert.False(emptyActivitySource.HasListeners()); // No ActivityListener for empty ActivitySource added yet
var operationNameForLegacyActivity = "TestOperationName"; var operationNameForLegacyActivity = "TestOperationName";
var activitySourceForLegacyActvity = new ActivitySource("TestActivitySource", "1.0.0"); var activitySourceForLegacyActivity = new ActivitySource("TestActivitySource", "1.0.0");
// AddLegacyOperationName chained to TracerProviderBuilder // AddLegacyOperationName chained to TracerProviderBuilder
using var tracerProvider = Sdk.CreateTracerProviderBuilder() using var tracerProvider = Sdk.CreateTracerProviderBuilder()
@ -614,7 +614,7 @@ namespace OpenTelemetry.Trace.Tests
Activity activity = new Activity(operationNameForLegacyActivity); Activity activity = new Activity(operationNameForLegacyActivity);
activity.Start(); activity.Start();
ActivityInstrumentationHelper.SetActivitySourceProperty(activity, activitySourceForLegacyActvity); ActivityInstrumentationHelper.SetActivitySourceProperty(activity, activitySourceForLegacyActivity);
activity.Stop(); activity.Stop();
Assert.True(startCalled); // Processor.OnStart is called since we provided the legacy OperationName 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 Assert.False(emptyActivitySource.HasListeners()); // No ActivityListener for empty ActivitySource added yet
var operationNameForLegacyActivity = "TestOperationName"; var operationNameForLegacyActivity = "TestOperationName";
var activitySourceForLegacyActvity = new ActivitySource("TestActivitySource", "1.0.0"); var activitySourceForLegacyActivity = new ActivitySource("TestActivitySource", "1.0.0");
// AddLegacyOperationName chained to TracerProviderBuilder // AddLegacyOperationName chained to TracerProviderBuilder
using var tracerProvider = Sdk.CreateTracerProviderBuilder() 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) .AddLegacySource(operationNameForLegacyActivity)
.AddProcessor(testActivityProcessor) .AddProcessor(testActivityProcessor)
.Build(); .Build();
@ -664,7 +664,7 @@ namespace OpenTelemetry.Trace.Tests
Activity activity = new Activity(operationNameForLegacyActivity); Activity activity = new Activity(operationNameForLegacyActivity);
activity.Start(); activity.Start();
ActivityInstrumentationHelper.SetActivitySourceProperty(activity, activitySourceForLegacyActvity); ActivityInstrumentationHelper.SetActivitySourceProperty(activity, activitySourceForLegacyActivity);
activity.Stop(); activity.Stop();
Assert.True(startCalled); // Processor.OnStart is called since we provided the legacy OperationName 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.NotNull(resource);
Assert.NotEqual(Resource.Empty, resource); Assert.NotEqual(Resource.Empty, resource);
Assert.Single(resource.Attributes); 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); Assert.Contains("unknown_service", (string)resource.Attributes.FirstOrDefault().Value);
} }