Skip to content

feat: 更新opentelemetry sdk版本至1.15.3 #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Qinyouzeng merged 1 commit into from
May 29, 2026
Merged

feat: 更新opentelemetry sdk版本至1.15.3 #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,19 @@
<Project>
<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0;</TargetFrameworks>
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net6.0'">6.*</MicrosoftPackageVersion>
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net7.0'">7.*</MicrosoftPackageVersion>
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net8.0'">8.*</MicrosoftPackageVersion>
<MicrosoftPackageVersion Condition="'$(TargetFramework)' == 'net10.0'">10.*</MicrosoftPackageVersion>

<MSTestPackageVersion Condition="'$(TargetFramework)' == 'net6.0'">2.2.3</MSTestPackageVersion>
<MSTestPackageVersion Condition="'$(TargetFramework)' == 'net7.0'">2.2.3</MSTestPackageVersion>
<MSTestPackageVersion Condition="'$(TargetFramework)' == 'net8.0'">3.6.2</MSTestPackageVersion>
<MSTestPackageVersion Condition="'$(TargetFramework)' == 'net8.0'">4.2.3</MSTestPackageVersion>
<MSTestPackageVersion Condition="'$(TargetFramework)' == 'net10.0'">4.2.3</MSTestPackageVersion>

<MicrosoftTeskSdkPackageVersion Condition="'$(TargetFramework)' == 'net6.0'">16.9.4</MicrosoftTeskSdkPackageVersion>
<MicrosoftTeskSdkPackageVersion Condition="'$(TargetFramework)' == 'net7.0'">16.9.4</MicrosoftTeskSdkPackageVersion>
<MicrosoftTeskSdkPackageVersion Condition="'$(TargetFramework)' == 'net8.0'">17.12.0</MicrosoftTeskSdkPackageVersion>
<MicrosoftTeskSdkPackageVersion Condition="'$(TargetFramework)' == 'net8.0'">18.5.1</MicrosoftTeskSdkPackageVersion>
<MicrosoftTeskSdkPackageVersion Condition="'$(TargetFramework)' == 'net10.0'">18.5.1</MicrosoftTeskSdkPackageVersion>

<CoverletPackageVersion Condition="'$(TargetFramework)' == 'net6.0'">3.0.2</CoverletPackageVersion>
<CoverletPackageVersion Condition="'$(TargetFramework)' == 'net7.0'">3.0.2</CoverletPackageVersion>
<CoverletPackageVersion Condition="'$(TargetFramework)' == 'net8.0'">3.1.2</CoverletPackageVersion>
<CoverletPackageVersion Condition="'$(TargetFramework)' == 'net8.0'">10.0.1</CoverletPackageVersion>
<CoverletPackageVersion Condition="'$(TargetFramework)' == 'net10.0'">10.0.1</CoverletPackageVersion>

<MasaFrameworkPackageVersion>1.2.0-preview.*</MasaFrameworkPackageVersion>
<OpenTelemetryVersion>1.9.0</OpenTelemetryVersion>
<OpenTelemetryContribVersion>1.9.0</OpenTelemetryContribVersion>
<FluentValidationPackageVersion>11.1.0</FluentValidationPackageVersion>
<IdentityModelPackageVersion>6.0.0</IdentityModelPackageVersion>
<NESTPackageVersion>7.17.4</NESTPackageVersion>
Expand Down
18 changes: 9 additions & 9 deletions .../Masa.Contrib.StackSdks.Tsc.OpenTelemetry/Masa.Contrib.StackSdks.Tsc.OpenTelemetry.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OpenTelemetry" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.ElasticsearchClient" Version="1.0.0-beta.5" />
<PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.12" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.9.0-beta.1" />
<PackageReference Include="OpenTelemetry" Version="1.15.3" />
<PackageReference Include="OpenTelemetry.Instrumentation.ElasticsearchClient" Version="1.15.1-beta.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.15.1-beta.1" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.15.1-beta.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion .../Masa.Contrib.StackSdks.Tsc.OpenTelemetry/Traceing/OpenTelemetryInstrumentationOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public OpenTelemetryInstrumentationOptions(IServiceProvider serviceProvider)
/// </summary>
public Action<EntityFrameworkInstrumentationOptions> EntityFrameworkInstrumentationOptions { get; set; } = options =>
{
options.SetDbStatementForText = true;
//options.en = true;
};

public Action<ElasticsearchClientInstrumentationOptions> ElasticsearchClientInstrumentationOptions { get; set; } = options =>
Expand Down
4 changes: 2 additions & 2 deletions src/Contrib/Tests/Masa.Contrib.StackSdks.Alert.Tests/AlertClientTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ public void TestAddAlertClient()
public void TestAddAlertClientShouldThrowArgumentNullException()
{
var services = new ServiceCollection();
Assert.ThrowsException<MasaArgumentException>(() => services.AddAlertClient(alertServiceBaseAddress: null!));
Assert.Throws<MasaArgumentException>(() => services.AddAlertClient(alertServiceBaseAddress: null!));
}

[TestMethod]
public void TestAddAlertClientShouldThrowArgumentNullException2()
{
var services = new ServiceCollection();
Assert.ThrowsException<MasaArgumentException>(() => services.AddAlertClient(callerBuilder: null!));
Assert.Throws<MasaArgumentException>(() => services.AddAlertClient(callerBuilder: null!));
}
}
4 changes: 2 additions & 2 deletions src/Contrib/Tests/Masa.Contrib.StackSdks.Auth.Tests/AuthClientTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ public void TestAddAuthClient()
public void TestAddAuthClientNoAddMasaIdentity()
{
var services = new ServiceCollection();
Assert.ThrowsException<Exception>(() => services.AddAuthClient("https://localhost:18102", new()),
Assert.Throws<Exception>(() => services.AddAuthClient("https://localhost:18102", new()),
"Please add IMultiEnvironmentUserContext first.");
}

[TestMethod]
public void TestAddAuthClientShouldThrowArgumentNullException()
{
var services = new ServiceCollection();
Assert.ThrowsException<MasaArgumentException>(() => services.AddAuthClient(authServiceBaseAddress: null!, new()));
Assert.Throws<MasaArgumentException>(() => services.AddAuthClient(authServiceBaseAddress: null!, new()));
}
}

4 changes: 2 additions & 2 deletions src/Contrib/Tests/Masa.Contrib.StackSdks.Mc.Tests/McClientTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ public void TestAddMcClient()
public void TestAddMcClientShouldThrowArgumentNullException()
{
var services = new ServiceCollection();
Assert.ThrowsException<MasaArgumentException>(() => services.AddMcClient(mcServiceBaseAddress: null!));
Assert.Throws<MasaArgumentException>(() => services.AddMcClient(mcServiceBaseAddress: null!));
}

[TestMethod]
public void TestAddMcClientShouldThrowArgumentNullException2()
{
var services = new ServiceCollection();
Assert.ThrowsException<MasaArgumentException>(() => services.AddMcClient(callerBuilder: null!));
Assert.Throws<MasaArgumentException>(() => services.AddMcClient(callerBuilder: null!));
}
}
4 changes: 2 additions & 2 deletions src/Contrib/Tests/Masa.Contrib.StackSdks.Middleware.Tests/EventMiddlewareTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ public EventMiddlewareTest()
}

[TestMethod]
public void TestCommand()
public async Task TestCommand()
{
var command = new TestCommand();
Assert.ThrowsExceptionAsync<UserFriendlyException>(async () => await _eventBus.PublishAsync(command), "DISABLED_OPERATE");
await Assert.ThrowsAsync<UserFriendlyException>(async () => await _eventBus.PublishAsync(command), "DISABLED_OPERATE");
}

[TestMethod]
Expand Down
6 changes: 3 additions & 3 deletions src/Contrib/Tests/Masa.Contrib.StackSdks.Middleware.Tests/RequestMiddlewareTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@ await requestMiddleware.InvokeAsync(defaultContext, (innerHttpContext) =>
}

[TestMethod]
public void TestDisabledRequestMiddleware()
public async Task TestDisabledRequestMiddleware()
{
DefaultHttpContext defaultContext = new DefaultHttpContext();
defaultContext.SetEndpoint(new Endpoint(c => Task.CompletedTask, new EndpointMetadataCollection(new DisabledRouteAttribute()), "myapp"));

var requestMiddleware = _serviceProvider.GetRequiredService<DisabledRequestMiddleware>();

Assert.ThrowsExceptionAsync<UserFriendlyException>(async () =>
await requestMiddleware.InvokeAsync(defaultContext, (innerHttpContext) =>
await Assert.ThrowsAsync<UserFriendlyException>(async () =>
await requestMiddleware.InvokeAsync(defaultContext, (innerHttpContext) =>
{
return Task.CompletedTask;
}));
Expand Down
2 changes: 1 addition & 1 deletion src/Contrib/Tests/Masa.Contrib.StackSdks.Pm.Tests/PmClientTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public void TestAddPmClientShouldThrowArgumentNullException()
{
var services = new ServiceCollection();

Assert.ThrowsException<MasaArgumentException>(() => services.AddPmClient(""));
Assert.Throws<MasaArgumentException>(() => services.AddPmClient(""));
}

[TestMethod]
Expand Down
2 changes: 1 addition & 1 deletion src/Contrib/Tests/Masa.Contrib.StackSdks.Sapp.Tests/SappClientTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public void TestAddSappClientShouldThrowArgumentNullException()
{
var services = new ServiceCollection();

Assert.ThrowsException<MasaArgumentException>(() => services.AddSappClient(""));
Assert.Throws<MasaArgumentException>(() => services.AddSappClient(""));
}

[TestMethod]
Expand Down
4 changes: 2 additions & 2 deletions src/Contrib/Tests/Masa.Contrib.StackSdks.Scheduler.Tests/SchedulerClientTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ public void TestAddSchedulerClientShouldThrowArgumentNullException()
{
var services = new ServiceCollection();

Assert.ThrowsException<ArgumentNullException>(() => services.AddSchedulerClient(""));
Assert.Throws<ArgumentNullException>(() => services.AddSchedulerClient(""));
}

[TestMethod]
public void TestAddSchedulerClientShouldThrowArgumentNullException2()
{
var services = new ServiceCollection();

Assert.ThrowsException<ArgumentNullException>(() => services.AddSchedulerClient(callerBuilder: null!));
Assert.Throws<ArgumentNullException>(() => services.AddSchedulerClient(callerBuilder: null!));
}

}
8 changes: 4 additions & 4 deletions src/Contrib/Tests/Masa.Contrib.StackSdks.Scheduler.Tests/SchedulerJobServiceTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ public async Task TestAddSchedulerJobArgumentNullException()
var caller = new Mock<ICaller>();
caller.Setup(provider => provider.PostAsync<UpsertSchedulerJobRequest, Guid>(requestUri, requestData, default)).ReturnsAsync(Guid.NewGuid()).Verifiable();
var schedulerClient = new SchedulerClient(caller.Object);
await Assert.ThrowsExceptionAsync<MasaArgumentException>(async () => await schedulerClient.SchedulerJobService.AddAsync(requestData));
await Assert.ThrowsAsync<MasaArgumentException>(async () => await schedulerClient.SchedulerJobService.AddAsync(requestData));
}

[TestMethod]
Expand All @@ -170,7 +170,7 @@ public async Task TestAddSchedulerHttpJobArgumentNullException()
var caller = new Mock<ICaller>();
caller.Setup(provider => provider.PostAsync<UpsertSchedulerJobRequest, Guid>(requestUri, requestData, default)).ReturnsAsync(Guid.NewGuid()).Verifiable();
var schedulerClient = new SchedulerClient(caller.Object);
await Assert.ThrowsExceptionAsync<MasaArgumentException>(async () => await schedulerClient.SchedulerJobService.AddAsync(requestData));
await Assert.ThrowsAsync<MasaArgumentException>(async () => await schedulerClient.SchedulerJobService.AddAsync(requestData));
}

[TestMethod]
Expand All @@ -188,7 +188,7 @@ public async Task TestAddSchedulerJobAppArgumentNullException()
var caller = new Mock<ICaller>();
caller.Setup(provider => provider.PostAsync<UpsertSchedulerJobRequest, Guid>(requestUri, requestData, default)).ReturnsAsync(Guid.NewGuid()).Verifiable();
var schedulerClient = new SchedulerClient(caller.Object);
await Assert.ThrowsExceptionAsync<MasaArgumentException>(async () => await schedulerClient.SchedulerJobService.AddAsync(requestData));
await Assert.ThrowsAsync<MasaArgumentException>(async () => await schedulerClient.SchedulerJobService.AddAsync(requestData));
}

[TestMethod]
Expand All @@ -206,7 +206,7 @@ public async Task TestAddSchedulerDaprInvocationJobArgumentNullException()
var caller = new Mock<ICaller>();
caller.Setup(provider => provider.PostAsync<UpsertSchedulerJobRequest, Guid>(requestUri, requestData, default)).ReturnsAsync(Guid.NewGuid()).Verifiable();
var schedulerClient = new SchedulerClient(caller.Object);
await Assert.ThrowsExceptionAsync<MasaArgumentException>(async () => await schedulerClient.SchedulerJobService.AddAsync(requestData));
await Assert.ThrowsAsync<MasaArgumentException>(async () => await schedulerClient.SchedulerJobService.AddAsync(requestData));
}

[TestMethod]
Expand Down
Loading