Skip to content
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.

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

4976 improve net8 metrics tests #2

Open
wants to merge 45 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
56aa1db
UseHostBuilder to create client/server
ngruson Nov 10, 2023
1b69355
Refactored RouteInformationIsNotAddedToRequestsOutsideOfMVC
ngruson Nov 10, 2023
4f161df
Merge branch 'main' into 4976-improve-net8-metrics-tests
utpilla Nov 11, 2023
a60a8f5
Refactord BasicTests
ngruson Nov 11, 2023
79660f6
Merge branch '4976-improve-net8-metrics-tests' of https://github.com/…
ngruson Nov 11, 2023
895da60
Run tests on variable port instead of 5000
ngruson Nov 12, 2023
12aeef1
Merge branch 'main' of https://github.com/ngruson/opentelemetry-dotne…
ngruson Nov 12, 2023
cdecae3
Removed unnecessary using
ngruson Nov 12, 2023
3e7c3bf
Added back blank line before EOF
ngruson Nov 12, 2023
0bc3bdc
Fixed resource readme to reflect actual default (#5045)
cijothomas Nov 13, 2023
78ab35c
[ASP.NET Core] Remove suppression for metrics generated from promethe…
vishweshbankwar Nov 13, 2023
ecb5dc8
[sdk] Ignore event counters in SelfDiagnosticsEventListener (#5046)
CodeBlanch Nov 14, 2023
201811a
[HttpClient and ASP.NET Core] Fix failures due to changes in .NET8.0 …
vishweshbankwar Nov 14, 2023
b0f9607
Upgrade rc dependencies to net8.0 stable (#5051)
vishweshbankwar Nov 14, 2023
c337d1e
[repo] Misc changes (#5053)
utpilla Nov 15, 2023
e904994
[HttpClient & HttpWebRequest] Set network protocol version from respo…
vishweshbankwar Nov 15, 2023
bdd931e
Fix histogram for dns.lookup.duration (#5058)
Kielek Nov 16, 2023
f2c2255
Make MetricPoint reclaim an opt-in experimental feature (#5052)
utpilla Nov 16, 2023
d346196
add concurrency tests with Coyote to CI (#4879)
Yun-Ting Nov 17, 2023
2a228f9
Refactor HttpWebRequestActivitySource (#5055)
vishweshbankwar Nov 17, 2023
68eabf0
Fix Activity http.route and name (#5026)
alanwest Nov 17, 2023
6024f19
Processed review comments
ngruson Nov 17, 2023
dd15e63
Merge branch '4976-improve-net8-metrics-tests' of https://github.com/…
ngruson Nov 17, 2023
0256f87
Http Span Status - Default to Unset if not in range defined by spec (…
vishweshbankwar Nov 17, 2023
276b307
Update CHANGELOG for 1.6.0-beta.3 release of instrumentation librarie…
utpilla Nov 17, 2023
fabc1c6
Resolved merge conflicts
ngruson Nov 18, 2023
cbb5320
Solved merge conflicts
ngruson Nov 18, 2023
cf9bc01
Synced fork with main and merged conflicts
ngruson Nov 18, 2023
44639b4
Removed unnecessary usings
ngruson Nov 18, 2023
8952aca
Fixed ValidateNet8RateLimitingMetricsAsync
ngruson Nov 18, 2023
f8c43fb
Removed files that were not supposed to come along in this PR
ngruson Nov 18, 2023
7add987
Merge branch 'main' into 4976-improve-net8-metrics-tests
vishweshbankwar Nov 20, 2023
2b62e47
Add metric bucket override for OpenTelemetry.Instrumentation.AspNet (…
qhris Nov 20, 2023
7dff324
Add note about .NET8.0 metrics in readme (#5067)
vishweshbankwar Nov 21, 2023
6227ab0
Fixed DiagnosticSourceExceptionCallBackIsNotReceivedForExceptionsHand…
ngruson Nov 21, 2023
bac5a61
Merge branch '4976-improve-net8-metrics-tests' of https://github.com/…
ngruson Nov 21, 2023
a55341a
[HttpClient] Remove OTEL_SEMCONV_STABILITY_OPT_IN (#5068)
vishweshbankwar Nov 21, 2023
0c4f065
[ASP.NET Core] Remove OTEL_SEMCONV_STABILITY_OPT_IN (#5066)
vishweshbankwar Nov 21, 2023
1f7f931
[hosting] Support .NET 8 IMetricsBuilder API (#4958)
CodeBlanch Nov 22, 2023
6524198
Removed skip of unit test DiagnosticSourceExceptionCallBackIsNotRecei…
ngruson Nov 22, 2023
10c93cc
Reverted sln changes
ngruson Nov 22, 2023
ebe17a2
Resolved merge conflict in MetricTests.cs
ngruson Nov 22, 2023
2ff66d5
Conditional using directive
ngruson Nov 22, 2023
bbe10ec
Missing blank line before EOF
ngruson Nov 22, 2023
292da0f
Processed review comments
ngruson Nov 22, 2023
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
33 changes: 33 additions & 0 deletions .github/workflows/ci-concurrency-md.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Syntax: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
# See also: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks

# Description: This workflow exists to unblock documentation-only PRs.

# IMPORTANT: This workflow MUST use the same 'name' and 'matrix' as the non -md workflow.


name: Coyote Concurrency Tests

on:
push:
branches: [ 'main*' ]
paths-ignore:
- '**.md'
pull_request:
branches: [ 'main*' ]
paths:
- '**.md'

jobs:
coyote-concurrency-tests:

strategy:
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
matrix:
os: [ windows-latest, ubuntu-latest ]
version: [ net8.0 ]
project: [ OpenTelemetry.Tests, OpenTelemetry.Api.Tests ]

runs-on: ${{ matrix.os }}
steps:
- run: 'echo "No build required"'
41 changes: 41 additions & 0 deletions .github/workflows/ci-concurrency.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Coyote Concurrency Tests

on:
push:
branches: [ 'main*' ]
paths-ignore:
- '**.md'
pull_request:
branches: [ 'main*' ]
paths-ignore:
- '**.md'

jobs:
coyote-concurrency-tests:

strategy:
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
matrix:
os: [ windows-latest, ubuntu-latest ]
version: [ net8.0 ]
project: [ OpenTelemetry.Tests, OpenTelemetry.Api.Tests ]

runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # fetching all

- name: Setup dotnet
uses: actions/setup-dotnet@v3

- name: Run Coyote Tests
shell: pwsh
run: .\build\test-threadSafety.ps1 -testProjectName ${{ matrix.project }} -targetFramework ${{ matrix.version }}

- name: Publish Artifacts
if: always() && !cancelled()
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.os }}-${{ matrix.project }}-${{ matrix.version }}-coyoteoutput
path: '**/*_CoyoteOutput.*'
62 changes: 0 additions & 62 deletions .github/workflows/examples.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -348,3 +348,6 @@ ASALocalRun/

# Tempo files
tempo-data/

# Coyote Rewrite Files
rewrite.coyote.json
57 changes: 29 additions & 28 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,13 @@
these packages even during major version bumps, so compatibility is not a concern here.
-->

<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0-rc.2.23479.6" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0-rc.2.23479.6" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0-rc.2.23479.6" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0-rc.2.23479.6" />
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0-rc.2.23479.6" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.0-rc.2.23479.6" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.0" />

<PackageVersion Include="OpenTelemetry" Version="$(OTelLatestStableVer)" />
<PackageVersion Include="OpenTelemetry.Api" Version="$(OTelLatestStableVer)" />
Expand All @@ -51,7 +52,7 @@
3) The .NET runtime team provides extra backward compatibility guarantee to System.Diagnostics.DiagnosticSource
even during major version bumps, so compatibility is not a concern here.
-->
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.0-rc.2.23479.6" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />

<!-- A conservative version of System.Text.Encodings.Web must be used here since there is no backward compatibility guarantee during major version bumps. -->
<PackageVersion Include="System.Text.Encodings.Web" Version="4.7.2" />
Expand All @@ -67,32 +68,32 @@
This section covers packages that are **not** directly referenced by the NuGet packages published from this repository.
For example, these packages are used in the tests, examples or referenced as "PrivateAssets", but not in the NuGet packages themselves.
-->
<!-- 'net7.0' is the default `TargetFramework`. Use `VersionOverride` in the project to override the package versions from a different `TargetFramework` -->
<!-- 'net8.0' is the default `TargetFramework`. Use `VersionOverride` in the project to override the package versions from a different `TargetFramework` -->
<ItemGroup>
<PackageVersion Include="BenchmarkDotNet" Version="[0.13.10,0.14)" />
<PackageVersion Include="CommandLineParser" Version="[2.9.1,3.0)" />
<PackageVersion Include="Grpc.AspNetCore" Version="[2.55.0,3.0)" />
<PackageVersion Include="Grpc.AspNetCore.Server" Version="[2.55.0, 3.0)" />
<PackageVersion Include="Grpc.Tools" Version="[2.56.2,3.0)" />
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="[3.11.0-beta1.23402.2]" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="2.1.2" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0-rc.2.23479.6" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="[3.1.6,5.0)" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="3.1.20" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="[6.0.0,)" />
<PackageVersion Include="Grpc.AspNetCore" Version="[2.59.0,3.0)" />
<PackageVersion Include="Grpc.AspNetCore.Server" Version="[2.59.0, 3.0)" />
<PackageVersion Include="Grpc.Tools" Version="[2.59.0,3.0)" />
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="[3.11.0-beta1.23525.2]" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.1.2" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="[8.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="[8.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="[8.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0,)" />
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="[1.0.3,2.0)" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="[17.7.2,18.0.0)" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="[17.8.0,18.0.0)" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="[1.1.1,2.0)" />
<PackageVersion Include="MinVer" Version="[4.3.0,5.0)" />
<PackageVersion Include="Moq" Version="[4.18.4,5.0)" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="[1.5.0,2.0)" />
<PackageVersion Include="RabbitMQ.Client" Version="[6.5.0,7.0)" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="[1.5.1,2.0)" />
<PackageVersion Include="RabbitMQ.Client" Version="[6.6.0,7.0)" />
<PackageVersion Include="StyleCop.Analyzers" Version="[1.2.0-beta.507,2.0)" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="[6.4.0]" />
<PackageVersion Include="Testcontainers.MsSql" Version="3.3.0" />
<PackageVersion Include="Testcontainers.SqlEdge" Version="3.3.0" />
<PackageVersion Include="xunit" Version="[2.5.0,3.0)" />
<PackageVersion Include="xunit.runner.visualstudio" Version="[2.5.0,3.0)" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="[6.5.0,)" />
<PackageVersion Include="Testcontainers.MsSql" Version="3.6.0" />
<PackageVersion Include="Testcontainers.SqlEdge" Version="3.6.0" />
<PackageVersion Include="xunit" Version="[2.6.1,3.0)" />
<PackageVersion Include="xunit.runner.visualstudio" Version="[2.5.3,3.0)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
Expand All @@ -106,8 +107,8 @@
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.9" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.0-rc.2.23480.2" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0-rc.2.23480.2" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.0-rc.2.23480.2" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.0" />
</ItemGroup>
</Project>
Loading