Skip to content

Commit e606128

Browse files
authored
[repo] Clean up codecov (open-telemetry#2216)
1 parent 0c3ded8 commit e606128

File tree

3 files changed

+79
-11
lines changed

3 files changed

+79
-11
lines changed

.github/codecov.yml

Lines changed: 65 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,34 +24,48 @@ comment:
2424

2525
ignore:
2626
- "**.md"
27-
- "src/Shared" # copied from main OTel project and has code coverage there
2827
- "test"
2928
- "examples"
3029
- "build"
3130
- ".github"
3231
- ".vscode"
3332

3433
flags:
35-
unittests-Solution:
34+
unittests-Exporter.Geneva:
3635
carryforward: true
3736
paths:
38-
- src
37+
- src/OpenTelemetry.Exporter.Geneva
3938

40-
unittests-Exporter.Geneva:
39+
unittests-Exporter.InfluxDB:
4140
carryforward: true
4241
paths:
43-
- src/OpenTelemetry.Exporter.Geneva
42+
- src/OpenTelemetry.Exporter.InfluxDB
43+
44+
unittests-Exporter.Instana:
45+
carryforward: true
46+
paths:
47+
- src/OpenTelemetry.Exporter.Instana
4448

4549
unittests-Exporter.OneCollector:
4650
carryforward: true
4751
paths:
4852
- src/OpenTelemetry.Exporter.OneCollector
4953

54+
unittests-Exporter.Stackdriver:
55+
carryforward: true
56+
paths:
57+
- src/OpenTelemetry.Exporter.Stackdriver
58+
5059
unittests-Extensions:
5160
carryforward: true
5261
paths:
5362
- src/OpenTelemetry.Extensions
5463

64+
unittests-Extensions.Enrichment:
65+
carryforward: true
66+
paths:
67+
- src/OpenTelemetry.Extensions.Enrichment
68+
5569
unittests-Instrumentation.AspNet:
5670
carryforward: true
5771
paths:
@@ -70,26 +84,52 @@ flags:
7084
- src/OpenTelemetry.Instrumentation.AWS
7185
- src/OpenTelemetry.Instrumentation.AWSLambda
7286

87+
# Note: No unit tests currently for Cassandra being run in CI.
88+
#unittests-Instrumentation.Cassandra:
89+
# carryforward: true
90+
# paths:
91+
# - src/OpenTelemetry.Instrumentation.Cassandra
92+
7393
unittests-Instrumentation.ConfluentKafka:
7494
carryforward: true
7595
paths:
7696
- src/OpenTelemetry.Instrumentation.ConfluentKafka
7797

98+
unittests-Instrumentation.ElasticsearchClient:
99+
carryforward: true
100+
paths:
101+
- src/OpenTelemetry.Instrumentation.ElasticsearchClient
102+
103+
unittests-Instrumentation.EntityFrameworkCore:
104+
carryforward: true
105+
paths:
106+
- src/OpenTelemetry.Instrumentation.EntityFrameworkCore
107+
78108
unittests-Instrumentation.EventCounters:
79109
carryforward: true
80110
paths:
81111
- src/OpenTelemetry.Instrumentation.EventCounters
82112

83-
unittests-Instrumentation.Http:
113+
unittests-Instrumentation.GrpcCore:
84114
carryforward: true
85115
paths:
86-
- src/OpenTelemetry.Instrumentation.Http
116+
- src/OpenTelemetry.Instrumentation.GrpcCore
87117

88118
unittests-Instrumentation.GrpcNetClient:
89119
carryforward: true
90120
paths:
91121
- src/OpenTelemetry.Instrumentation.GrpcNetClient
92122

123+
unittests-Instrumentation.Hangfire:
124+
carryforward: true
125+
paths:
126+
- src/OpenTelemetry.Instrumentation.Hangfire
127+
128+
unittests-Instrumentation.Http:
129+
carryforward: true
130+
paths:
131+
- src/OpenTelemetry.Instrumentation.Http
132+
93133
unittests-Instrumentation.Owin:
94134
carryforward: true
95135
paths:
@@ -100,6 +140,11 @@ flags:
100140
paths:
101141
- src/OpenTelemetry.Instrumentation.Process
102142

143+
unittests-Instrumentation.Quartz:
144+
carryforward: true
145+
paths:
146+
- src/OpenTelemetry.Instrumentation.Quartz
147+
103148
unittests-Instrumentation.Runtime:
104149
carryforward: true
105150
paths:
@@ -136,6 +181,11 @@ flags:
136181
paths:
137182
- src/OpenTelemetry.Resources.Azure
138183

184+
unittests-Resources.Container:
185+
carryforward: true
186+
paths:
187+
- src/OpenTelemetry.Resources.Container
188+
139189
unittests-Resources.Gcp:
140190
carryforward: true
141191
paths:
@@ -166,7 +216,13 @@ flags:
166216
paths:
167217
- src/OpenTelemetry.Sampler.AWS
168218

169-
unittests-SemanticConventions:
219+
# Note: No unit tests currently for SemanticConventions being run in CI.
220+
#unittests-SemanticConventions:
221+
# carryforward: true
222+
# paths:
223+
# - src/OpenTelemetry.SemanticConventions
224+
225+
unittests-Contrib.Shared.Tests:
170226
carryforward: true
171227
paths:
172-
- src/OpenTelemetry.SemanticConventions
228+
- src/Shared

.github/workflows/Component.BuildTest.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
project-name:
77
required: true
88
type: string
9+
run-tests:
10+
required: false
11+
default: true
12+
type: boolean
913
code-cov-name:
1014
required: true
1115
type: string
@@ -87,21 +91,23 @@ jobs:
8791
run: dotnet build ${{ steps.resolve-project.outputs.project }} --configuration Release --no-restore
8892

8993
- name: dotnet test ${{ steps.resolve-project.outputs.title }}
94+
if: ${{ inputs.run-tests }}
9095
run: dotnet test ${{ steps.resolve-project.outputs.project }} --collect:"Code Coverage" --results-directory:TestResults --framework ${{ matrix.version }} --configuration Release --no-restore --no-build --logger:"console;verbosity=detailed" -- RunConfiguration.DisableAppDomain=true
9196

9297
- name: dotnet pack ${{ steps.resolve-project.outputs.title }}
9398
if: ${{ matrix.os == 'windows-latest' }}
9499
run: dotnet pack ${{ steps.resolve-project.outputs.project }} --configuration Release --no-restore --no-build -p:EnablePackageValidation=true
95100

96101
- name: Install coverage tool
102+
if: ${{ inputs.run-tests }}
97103
run: dotnet tool install -g dotnet-coverage
98104

99105
- name: Merging test results
100-
if: ${{ hashFiles('./TestResults/**/*.coverage') != '' }}
106+
if: ${{ inputs.run-tests && hashFiles('./TestResults/**/*.coverage') != '' }}
101107
run: dotnet-coverage merge -f cobertura -o ./TestResults/Cobertura.xml ./TestResults/**/*.coverage
102108

103109
- name: Upload code coverage ${{ inputs.code-cov-prefix }}-${{ inputs.code-cov-name }}
104-
if: ${{ hashFiles('./TestResults/Cobertura.xml') != '' }}
110+
if: ${{ inputs.run-tests && hashFiles('./TestResults/Cobertura.xml') != '' }}
105111
uses: codecov/codecov-action@v4
106112
continue-on-error: true # Note: Don't fail for upload failures
107113
env:

.github/workflows/ci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,11 @@ jobs:
206206
with:
207207
project-name: Component[OpenTelemetry.Instrumentation.Cassandra]
208208
code-cov-name: Instrumentation.Cassandra
209+
run-tests: false
210+
# Note: There is a unit test project for Cassandra but it only contains
211+
# integration tests, which get skipped. This results in empty coverage
212+
# files which messes with codecov. Enable tests if any real unit tests
213+
# get added.
209214

210215
build-test-instrumentation-confluentkafka:
211216
needs: detect-changes
@@ -517,6 +522,7 @@ jobs:
517522
with:
518523
project-name: OpenTelemetry.SemanticConventions
519524
code-cov-name: SemanticConventions
525+
run-tests: false # Note: No test project
520526

521527
build-test-contrib-shared-tests:
522528
needs: detect-changes

0 commit comments

Comments
 (0)