Skip to content

Commit 54fc09e

Browse files
Merge branch 'main' into vibankwa/update-ilogger-event-attribute-names
2 parents 2563cf6 + 594d130 commit 54fc09e

File tree

46 files changed

+702
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+702
-79
lines changed

.github/workflows/apicompatibility.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ jobs:
1717
with:
1818
fetch-depth: 0 # fetching all
1919

20+
- name: Setup dotnet
21+
uses: actions/setup-dotnet@v3
22+
2023
- name: Install dependencies
2124
run: dotnet restore
2225

.github/workflows/ci-aot.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ jobs:
2424
with:
2525
fetch-depth: 0 # fetching all
2626

27+
- name: Setup dotnet
28+
uses: actions/setup-dotnet@v3
29+
2730
- name: publish AOT testApp, assert static analysis warning count, and run the app
2831
shell: pwsh
2932
run: .\build\test-aot-compatibility.ps1 ${{ matrix.version }}

.github/workflows/ci-instrumentation-libraries.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ jobs:
3131
with:
3232
fetch-depth: 0 # fetching all
3333

34+
- name: Setup dotnet
35+
uses: actions/setup-dotnet@v3
36+
3437
- name: Install dependencies
3538
run: dotnet restore ./build/InstrumentationLibraries.proj
3639

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ jobs:
2727
with:
2828
fetch-depth: 0 # fetching all
2929

30+
- name: Setup dotnet
31+
uses: actions/setup-dotnet@v3
32+
3033
- name: Install dependencies
3134
run: dotnet restore
3235

.github/workflows/code-coverage.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ jobs:
2424
with:
2525
fetch-depth: 0 # fetching all
2626

27+
- name: Setup dotnet
28+
uses: actions/setup-dotnet@v3
29+
2730
- name: Install dependencies
2831
run: dotnet restore
2932

.github/workflows/dotnet-format.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ jobs:
2020
- name: check out code
2121
uses: actions/checkout@v3
2222

23+
- name: Setup dotnet
24+
uses: actions/setup-dotnet@v3
25+
2326
- name: Install format tool
2427
run: dotnet tool install -g dotnet-format
2528

OpenTelemetry.sln

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7CB2F02E
4444
build\process-codecoverage.ps1 = build\process-codecoverage.ps1
4545
build\RELEASING.md = build\RELEASING.md
4646
build\stylecop.json = build\stylecop.json
47-
build\xunit.runner.json = build\xunit.runner.json
4847
build\test-aot-compatibility.ps1 = build\test-aot-compatibility.ps1
48+
build\xunit.runner.json = build\xunit.runner.json
4949
EndProjectSection
5050
EndProject
5151
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.Zipkin", "src\OpenTelemetry.Exporter.Zipkin\OpenTelemetry.Exporter.Zipkin.csproj", "{7EDAE7FA-B44E-42CA-80FA-7DF2FAA2C5DD}"
@@ -97,6 +97,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
9797
ProjectSection(SolutionItems) = preProject
9898
.github\workflows\apicompatibility.yml = .github\workflows\apicompatibility.yml
9999
.github\workflows\ci-aot.yml = .github\workflows\ci-aot.yml
100+
.github\workflows\ci-instrumentation-libraries-md.yml = .github\workflows\ci-instrumentation-libraries-md.yml
101+
.github\workflows\ci-instrumentation-libraries.yml = .github\workflows\ci-instrumentation-libraries.yml
100102
.github\workflows\ci-md.yml = .github\workflows\ci-md.yml
101103
.github\workflows\ci.yml = .github\workflows\ci.yml
102104
.github\workflows\code-coverage.yml = .github\workflows\code-coverage.yml

build/Common.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)debug.snk</AssemblyOriginatorKeyFile>
77
<DefineConstants>$(DefineConstants);SIGNED</DefineConstants>
88
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
9+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
910
<Nullable>enable</Nullable>
1011
<ImplicitUsings>enable</ImplicitUsings>
1112
<!--temporarily disable. See 3958-->

docs/metrics/getting-started-aspnetcore/Program.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
// limitations under the License.
1515
// </copyright>
1616

17-
using System.Diagnostics;
1817
using OpenTelemetry.Metrics;
1918
using OpenTelemetry.Resources;
2019

docs/trace/getting-started-jaeger/Program.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,8 @@
1414
// limitations under the License.
1515
// </copyright>
1616

17-
using System;
1817
using System.Diagnostics;
19-
using System.Net.Http;
20-
using System.Threading.Tasks;
2118
using OpenTelemetry;
22-
using OpenTelemetry.Exporter;
2319
using OpenTelemetry.Resources;
2420
using OpenTelemetry.Trace;
2521

0 commit comments

Comments
 (0)