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.

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

Merge net7 branch to main: Updates DiagnosticSource to 7.0.0 + net7 instrumentation improvements #3539

Merged
merged 4 commits into from
Aug 4, 2022
Merged

Merge net7 branch to main: Updates DiagnosticSource to 7.0.0 + net7 instrumentation improvements #3539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c87e44
Restore the net7.0 branch
alanwest Aug 3, 2022
7207609
Merge branch 'main' into net7.0
alanwest Aug 4, 2022
2024b18
Remove netcoreapp3.1 from OpenTelemetry.Tests.Stress.Traces.csproj
alanwest Aug 4, 2022
a243a4e
Fix apicompatibility.yml
alanwest Aug 4, 2022
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
8 changes: 7 additions & 1 deletion .github/workflows/apicompatibility.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: API Compatibility

on:
pull_request:
branches: [ main ]
branches: [ main, net7.0 ]
alanwest marked this conversation as resolved.
Show resolved Hide resolved
paths-ignore:
- '**.md'

Expand All @@ -11,10 +11,16 @@ jobs:
runs-on: windows-latest
env:
CheckAPICompatibility: true
# https://github.com/actions/setup-dotnet/issues/122
DOTNET_MULTILEVEL_LOOKUP: 1
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # fetching all
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.0.x'
include-prerelease: true

- name: Install dependencies
run: dotnet restore
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/code-coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: Code Coverage

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

Expand All @@ -20,11 +20,17 @@ jobs:
os: [windows-latest]
env:
OS: ${{ matrix.os }}
# https://github.com/actions/setup-dotnet/issues/122
DOTNET_MULTILEVEL_LOOKUP: 1

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # fetching all
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.0.x'
include-prerelease: true

- name: Install dependencies
run: dotnet restore
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docfx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: docfx

on:
push:
branches: [ main ]
branches: [ main, net7.0 ]
pull_request:
branches: [ main ]
branches: [ main, net7.0 ]

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-format-md.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name: dotnet format

on:
pull_request:
branches: [ main ]
branches: [ main, net7.0 ]
paths:
- '**.md'

Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/dotnet-format.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ name: dotnet format

on:
push:
branches: [ main ]
branches: [ main, net7.0 ]
paths:
- '**.cs'
- '.editorconfig'
pull_request:
branches: [ main ]
branches: [ main, net7.0 ]
paths:
- '**.cs'
- '.editorconfig'
Expand All @@ -25,6 +25,12 @@ jobs:
with:
dotnet-version: 6.0.x

- name: Setup .NET Core 7.0
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.0.x'
include-prerelease: true

- name: Install format tool
run: dotnet tool install -g dotnet-format

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/integration-md.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name: Integration Tests

on:
pull_request:
branches: [ main ]
branches: [ main, net7.0 ]
paths:
- '**.md'

Expand All @@ -18,22 +18,22 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
version: [netcoreapp3.1,net6.0]
version: [net6.0]
steps:
- run: 'echo "No build required"'

w3c-trace-context-test:
runs-on: ubuntu-latest
strategy:
matrix:
version: [netcoreapp3.1,net6.0]
version: [net6.0]
steps:
- run: 'echo "No build required"'

otlp-exporter-test:
runs-on: ubuntu-latest
strategy:
matrix:
version: [netcoreapp3.1,net6.0]
version: [net6.0]
steps:
- run: 'echo "No build required"'
10 changes: 5 additions & 5 deletions .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: Integration Tests

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

Expand All @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [netcoreapp3.1,net6.0]
version: [net6.0]
steps:
- uses: actions/checkout@v3

Expand All @@ -28,7 +28,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [netcoreapp3.1,net6.0]
version: [net6.0]
steps:
- uses: actions/checkout@v3

Expand All @@ -40,7 +40,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [netcoreapp3.1,net6.0]
version: [net6.0]
steps:
- uses: actions/checkout@v3

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux-ci-md.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name: Linux

on:
pull_request:
branches: [ main ]
branches: [ main, net7.0 ]
paths:
- '**.md'

Expand All @@ -19,7 +19,7 @@ jobs:

strategy:
matrix:
version: [netcoreapp3.1,net6.0]
version: [net6.0]

steps:
- run: 'echo "No build required"'
16 changes: 13 additions & 3 deletions .github/workflows/linux-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: Linux

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

Expand All @@ -16,13 +16,23 @@ jobs:

strategy:
matrix:
version: [netcoreapp3.1,net6.0]
version: [net6.0, net7.0]

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # fetching all

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.x'

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.0.x'
include-prerelease: true


- name: Install dependencies
run: dotnet restore

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/markdownlint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: markdownlint

on:
push:
branches: [ main ]
branches: [ main, net7.0 ]
paths:
- '**.md'
pull_request:
branches: [ main ]
branches: [ main, net7.0 ]
paths:
- '**.md'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sanitycheck.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: sanitycheck

on:
push:
branches: [ main ]
branches: [ main, net7.0 ]
pull_request:
branches: [ main ]
branches: [ main, net7.0 ]

jobs:
misspell:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows-ci-md.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name: Windows

on:
pull_request:
branches: [ main ]
branches: [ main, net7.0 ]
paths:
- '**.md'

Expand All @@ -19,7 +19,7 @@ jobs:

strategy:
matrix:
version: [net462,netcoreapp3.1,net6.0]
version: [net462,net6.0]

steps:
- run: 'echo "No build required"'
14 changes: 11 additions & 3 deletions .github/workflows/windows-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,35 @@ name: Windows

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

jobs:
build-test:
runs-on: windows-latest
env:
# https://github.com/actions/setup-dotnet/issues/122
DOTNET_MULTILEVEL_LOOKUP: 1

strategy:
matrix:
version: [net462,netcoreapp3.1,net6.0]
version: [net462,net6.0,net7.0]

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # fetching all

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.0.x'
include-prerelease: true

- name: Install dependencies
run: dotnet restore

Expand Down
7 changes: 0 additions & 7 deletions OpenTelemetry.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentati
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testdata", "testdata", "{77C7929A-2EED-4AA6-8705-B5C443C8AA0F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp.AspNetCore.3.1", "test\TestApp.AspNetCore.3.1\TestApp.AspNetCore.3.1.csproj", "{F2F81E76-6A0E-466B-B673-EBBF1A9ED075}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{E359BB2B-9AEC-497D-B321-7DF2450C3B8E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.Jaeger", "src\OpenTelemetry.Exporter.Jaeger\OpenTelemetry.Exporter.Jaeger.csproj", "{8D47E3CF-9AE3-42FE-9084-FEB72D9AD769}"
Expand Down Expand Up @@ -275,10 +273,6 @@ Global
{2A47F6A8-63E5-4237-8046-94CAF321E797}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2A47F6A8-63E5-4237-8046-94CAF321E797}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2A47F6A8-63E5-4237-8046-94CAF321E797}.Release|Any CPU.Build.0 = Release|Any CPU
{F2F81E76-6A0E-466B-B673-EBBF1A9ED075}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F2F81E76-6A0E-466B-B673-EBBF1A9ED075}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F2F81E76-6A0E-466B-B673-EBBF1A9ED075}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F2F81E76-6A0E-466B-B673-EBBF1A9ED075}.Release|Any CPU.Build.0 = Release|Any CPU
{8D47E3CF-9AE3-42FE-9084-FEB72D9AD769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8D47E3CF-9AE3-42FE-9084-FEB72D9AD769}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8D47E3CF-9AE3-42FE-9084-FEB72D9AD769}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -516,7 +510,6 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{F2F81E76-6A0E-466B-B673-EBBF1A9ED075} = {77C7929A-2EED-4AA6-8705-B5C443C8AA0F}
{A533C800-3DC3-4D04-90A7-0CE7A1E6BDB3} = {F1D0972B-38CF-49C2-9F4B-4C5DE02FB71D}
{E69578EB-B456-4062-A645-877CD964528B} = {F1D0972B-38CF-49C2-9F4B-4C5DE02FB71D}
{C1542297-8763-4DF4-957C-489ED771C21D} = {7CB2F02E-03FA-4FFF-89A5-C51F107623FD}
Expand Down
2 changes: 1 addition & 1 deletion build/Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<SerilogPkgVer>[2.8.0,3.0)</SerilogPkgVer>
<StyleCopAnalyzersPkgVer>[1.2.0-beta.354,2.0)</StyleCopAnalyzersPkgVer>
<SystemCollectionsImmutablePkgVer>1.4.0</SystemCollectionsImmutablePkgVer>
<SystemDiagnosticSourcePkgVer>6.0.0</SystemDiagnosticSourcePkgVer>
<SystemDiagnosticSourcePkgVer>7.0.0-preview.4.22229.4</SystemDiagnosticSourcePkgVer>
<SystemReflectionEmitLightweightPkgVer>4.7.0</SystemReflectionEmitLightweightPkgVer>
<SystemTextJsonPkgVer>4.7.0</SystemTextJsonPkgVer>
<SystemThreadingTasksExtensionsPkgVer>4.5.3</SystemThreadingTasksExtensionsPkgVer>
Expand Down
2 changes: 1 addition & 1 deletion docs/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<OutputType>Exe</OutputType>
<!-- https://dotnet.microsoft.com/download/dotnet-core -->
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
<TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<!-- https://dotnet.microsoft.com/download/dotnet-framework -->
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net462;net47;net471;net472;net48</TargetFrameworks>
</PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"sdk": {
"rollForward": "latestFeature",
"version": "6.0.100"
"version": "6.0.100",
"allowPrerelease": "true"
}
}
0 ...icApi/netcoreapp3.1/PublicAPI.Shipped.txt → ...e/.publicApi/net6.0/PublicAPI.Shipped.txt
View file
Open in desktop
File renamed without changes.
0 ...Api/netcoreapp3.1/PublicAPI.Unshipped.txt → ....publicApi/net6.0/PublicAPI.Unshipped.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...emetry.Exporter.Prometheus.AspNetCore/OpenTelemetry.Exporter.Prometheus.AspNetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<Description>ASP.NET Core middleware for hosting OpenTelemetry .NET Prometheus Exporter</Description>
<PackageTags>$(PackageTags);prometheus;metrics</PackageTags>
<MinVerTagPrefix>core-</MinVerTagPrefix>
Expand Down
Empty file added src/OpenTelemetry.Instrumentation.AspNetCore/.publicApi/net7.0/PublicAPI.Shipped.txt
View file
Open in desktop
Empty file.
Loading