Skip to content

Commit 4e5e577

Browse files
robertcoltheartrobertcoltheart
authored
Merge branch 'main' into feature/prometheus-scope-info
2 parents 5b5f0df + 7419d85 commit 4e5e577

File tree

84 files changed

+1047
-661
lines changed

Some content is hidden

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

84 files changed

+1047
-661
lines changed

‎.github/workflows/ci-aot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
fetch-depth: 0 # fetching all
2626

2727
- name: Setup dotnet
28-
uses: actions/setup-dotnet@v3
28+
uses: actions/setup-dotnet@v4
2929

3030
- name: publish AOT testApp, assert static analysis warning count, and run the app
3131
shell: pwsh

‎.github/workflows/ci-concurrency.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
fetch-depth: 0 # fetching all
2828

2929
- name: Setup dotnet
30-
uses: actions/setup-dotnet@v3
30+
uses: actions/setup-dotnet@v4
3131

3232
- name: Run Coyote Tests
3333
shell: pwsh

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fetch-depth: 0 # fetching all
3030

3131
- name: Setup dotnet
32-
uses: actions/setup-dotnet@v3
32+
uses: actions/setup-dotnet@v4
3333

3434
- name: dotnet restore
3535
run: dotnet restore ./build/InstrumentationLibraries.proj -p:RunningDotNetPack=true

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
fetch-depth: 0 # fetching all
2929

3030
- name: Setup dotnet
31-
uses: actions/setup-dotnet@v3
31+
uses: actions/setup-dotnet@v4
3232

3333
- name: Install dependencies
3434
run: dotnet restore
@@ -56,7 +56,7 @@ jobs:
5656
fetch-depth: 0 # fetching all
5757

5858
- name: Setup dotnet
59-
uses: actions/setup-dotnet@v3
59+
uses: actions/setup-dotnet@v4
6060

6161
- name: Install dependencies
6262
run: dotnet restore

‎.github/workflows/code-coverage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
fetch-depth: 0 # fetching all
2626

2727
- name: Setup dotnet
28-
uses: actions/setup-dotnet@v3
28+
uses: actions/setup-dotnet@v4
2929

3030
- name: Install dependencies
3131
run: dotnet restore

‎.github/workflows/dotnet-format.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/checkout@v4
2222

2323
- name: Setup dotnet
24-
uses: actions/setup-dotnet@v3
24+
uses: actions/setup-dotnet@v4
2525

2626
- name: dotnet restore
2727
run: dotnet restore
@@ -39,7 +39,7 @@ jobs:
3939
uses: actions/checkout@v4
4040

4141
- name: Setup dotnet
42-
uses: actions/setup-dotnet@v3
42+
uses: actions/setup-dotnet@v4
4343

4444
- name: dotnet restore
4545
run: dotnet restore

‎.github/workflows/package-validation.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fetch-depth: 0 # fetching all
1717

1818
- name: Setup dotnet
19-
uses: actions/setup-dotnet@v3
19+
uses: actions/setup-dotnet@v4
2020

2121
- name: Pack
2222
run: dotnet pack OpenTelemetry.proj --configuration Release /p:EnablePackageValidation=true /p:ExposeExperimentalFeatures=false
@@ -30,7 +30,7 @@ jobs:
3030
fetch-depth: 0 # fetching all
3131

3232
- name: Setup dotnet
33-
uses: actions/setup-dotnet@v3
33+
uses: actions/setup-dotnet@v4
3434

3535
- name: Pack
3636
run: dotnet pack OpenTelemetry.proj --configuration Release /p:EnablePackageValidation=true /p:ExposeExperimentalFeatures=true

‎.github/workflows/publish-packages-1.0.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
ref: ${{ github.ref || 'main' }}
2525

2626
- name: Setup dotnet
27-
uses: actions/setup-dotnet@v3
27+
uses: actions/setup-dotnet@v4
2828

2929
- name: dotnet restore
3030
run: dotnet restore OpenTelemetry.proj -p:RunningDotNetPack=true

‎Directory.Packages.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@
8585
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="[17.8.0,18.0.0)" />
8686
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="[1.1.1,2.0)" />
8787
<PackageVersion Include="MinVer" Version="[4.3.0,5.0)" />
88-
<PackageVersion Include="Moq" Version="[4.18.4,5.0)" />
8988
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="[1.5.1,2.0)" />
9089
<PackageVersion Include="RabbitMQ.Client" Version="[6.6.0,7.0)" />
9190
<PackageVersion Include="StyleCop.Analyzers" Version="[1.2.0-beta.507,2.0)" />

‎examples/AspNetCore/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
.AddAspNetCoreInstrumentation();
6464

6565
// Use IConfiguration binding for AspNetCore instrumentation options.
66-
appBuilder.Services.Configure<AspNetCoreInstrumentationOptions>(appBuilder.Configuration.GetSection("AspNetCoreInstrumentation"));
66+
appBuilder.Services.Configure<AspNetCoreTraceInstrumentationOptions>(appBuilder.Configuration.GetSection("AspNetCoreInstrumentation"));
6767

6868
switch (tracingExporter)
6969
{

0 commit comments

Comments
 (0)