Skip to content

Commit d606872

Browse files
danifitzdanifitz
committed
Merge branch 'feature/nlog-instrumentation' of https://github.com/danifitz/opentelemetry-dotnet-instrumentation into feature/nlog-instrumentation
2 parents 90d51b1 + bd36cab commit d606872

File tree

109 files changed

+1573
-341
lines changed

Some content is hidden

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

109 files changed

+1573
-341
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"nuke.globaltool": {
6-
"version": "9.0.4",
6+
"version": "10.0.0",
77
"commands": [
88
"nuke"
99
]

‎.cspell/dot-net.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ aspnet
22
ASPNETCORE
33
ASSERTE
44
autoinstrumentation
5+
Blazor
56
Bootstrapper
67
buildtasks
78
callq

‎.github/workflows/build-container.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
steps:
3030

3131
- name: Checkout
32-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # tag: v5.0.1
32+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag: v6.0.0
3333
with:
3434
fetch-depth: 0 # fetching all, needed to correctly calculate version
3535

‎.github/workflows/build-nuget-packages.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ jobs:
2525
steps:
2626

2727
- name: Checkout
28-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # tag: v5.0.1
28+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag: v6.0.0
2929
with:
3030
fetch-depth: 0 # fetching all, needed to correctly calculate version
3131

3232
- name: Setup .NET
33-
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # tag: v5.0.0
33+
uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # tag: v5.0.1
3434
with:
3535
dotnet-version: |
3636
8.0.416
37-
9.0.307
37+
9.0.308
3838
10.0.100
3939
4040
- name: Check for NuGet packages cache

‎.github/workflows/build-ubuntu1604-native-container.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818

1919
- name: Checkout
20-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # tag: v5.0.1
20+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag: v6.0.0
2121
with:
2222
fetch-depth: 0 # fetching all, needed to correctly calculate version
2323

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ jobs:
2828
steps:
2929

3030
- name: Checkout
31-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # tag: v5.0.1
31+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag: v6.0.0
3232
with:
3333
fetch-depth: 0 # fetching all, needed to correctly calculate version
3434

3535
- name: Setup .NET
36-
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # tag: v5.0.0
36+
uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # tag: v5.0.1
3737
with:
3838
dotnet-version: |
3939
8.0.416
40-
9.0.307
40+
9.0.308
4141
10.0.100
4242
4343
- name: Check for NuGet packages cache

‎.github/workflows/check-sdk-versions.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
steps:
1717

1818
- name: Checkout
19-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # tag: v5.0.1
19+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag: v6.0.0
2020

2121
- name: Setup .NET
22-
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # tag: v5.0.0
22+
uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # tag: v5.0.1
2323
with:
2424
dotnet-version: 10.0.100
2525

‎.github/workflows/ci.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@ jobs:
6363
steps:
6464

6565
- name: Checkout
66-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # tag: v5.0.1
66+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag: v6.0.0
6767
with:
6868
fetch-depth: 0 # fetching all, needed to correctly calculate version
6969

7070
- name: Setup .NET
71-
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # tag: v5.0.0
71+
uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # tag: v5.0.1
7272
with:
7373
dotnet-version: |
7474
8.0.416
75-
9.0.307
75+
9.0.308
7676
10.0.100
7777
7878
- name: Check for NuGet packages cache
@@ -123,16 +123,16 @@ jobs:
123123
steps:
124124

125125
- name: Checkout
126-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # tag: v5.0.1
126+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag: v6.0.0
127127
with:
128128
fetch-depth: 0 # fetching all, needed to correctly calculate version
129129

130130
- name: Setup .NET
131-
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # tag: v5.0.0
131+
uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # tag: v5.0.1
132132
with:
133133
dotnet-version: |
134134
8.0.416
135-
9.0.307
135+
9.0.308
136136
10.0.100
137137
138138
- name: Check for NuGet packages cache
@@ -167,16 +167,16 @@ jobs:
167167
steps:
168168

169169
- name: Checkout
170-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # tag: v5.0.1
170+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag: v6.0.0
171171
with:
172172
fetch-depth: 0 # fetching all, needed to correctly calculate version
173173

174174
- name: Setup .NET
175-
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # tag: v5.0.0
175+
uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # tag: v5.0.1
176176
with:
177177
dotnet-version: |
178178
8.0.416
179-
9.0.307
179+
9.0.308
180180
10.0.100
181181
182182
- name: Check for NuGet packages cache
@@ -236,7 +236,7 @@ jobs:
236236
steps:
237237

238238
- name: Checkout
239-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # tag: v5.0.1
239+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag: v6.0.0
240240
with:
241241
fetch-depth: 0 # fetching all, needed to correctly calculate version
242242

@@ -275,16 +275,16 @@ jobs:
275275
steps:
276276

277277
- name: Checkout
278-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # tag: v5.0.1
278+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag: v6.0.0
279279
with:
280280
fetch-depth: 0 # fetching all, needed to correctly calculate version
281281

282282
- name: Setup .NET
283-
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # tag: v5.0.0
283+
uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # tag: v5.0.1
284284
with:
285285
dotnet-version: |
286286
8.0.416
287-
9.0.307
287+
9.0.308
288288
10.0.100
289289
290290
- name: Check for NuGet packages cache

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
disk-root: "D:"
5454

5555
- name: Checkout repository
56-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # tag: v5.0.1
56+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag: v6.0.0
5757

5858
# Add any setup steps before running the `github/codeql-action/init` action.
5959
# This includes steps like installing compilers or runtimes (`actions/setup-node`
@@ -63,7 +63,7 @@ jobs:
6363

6464
# Initializes the CodeQL tools for scanning.
6565
- name: Initialize CodeQL
66-
uses: github/codeql-action/init@014f16e7ab1402f30e7c3329d33797e7948572db # tag: v4.31.3
66+
uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2 # tag: v4.31.5
6767
with:
6868
languages: ${{ matrix.language }}
6969
build-mode: ${{ matrix.build-mode }}
@@ -75,11 +75,11 @@ jobs:
7575
# queries: security-extended,security-and-quality
7676

7777
- name: Setup dotnet
78-
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # tag: v5.0.0
78+
uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # tag: v5.0.1
7979
with:
8080
dotnet-version: |
8181
8.0.416
82-
9.0.307
82+
9.0.308
8383
10.0.100
8484
8585
# If the analyze step fails for one of the languages you are analyzing with
@@ -93,6 +93,6 @@ jobs:
9393
run: ./build.cmd BuildTracer
9494

9595
- name: Perform CodeQL Analysis
96-
uses: github/codeql-action/analyze@014f16e7ab1402f30e7c3329d33797e7948572db # tag: v4.31.3
96+
uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2 # tag: v4.31.5
9797
with:
9898
category: "/language:${{matrix.language}}"

‎.github/workflows/demo.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626

2727
- name: Checkout
28-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # tag: v5.0.1
28+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag: v6.0.0
2929

3030
- name: Test demo
3131
run: make test

0 commit comments

Comments
 (0)