Skip to content

Commit 0c3ded8

Browse files
CodeBlanchCodeBlanch
authored
[repo] Update CI for AWS projects sharing a tag (open-telemetry#2214)
1 parent 3010b5f commit 0c3ded8

File tree

4 files changed

+63
-32
lines changed

4 files changed

+63
-32
lines changed

‎.github/codecov.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,13 @@ flags:
6363
paths:
6464
- src/OpenTelemetry.Instrumentation.AspNetCore
6565

66+
unittests-Instrumentation.AWS:
67+
carryforward: true
68+
paths:
69+
- src/OpenTelemetry.Extensions.AWS
70+
- src/OpenTelemetry.Instrumentation.AWS
71+
- src/OpenTelemetry.Instrumentation.AWSLambda
72+
6673
unittests-Instrumentation.ConfluentKafka:
6774
carryforward: true
6875
paths:
@@ -119,6 +126,11 @@ flags:
119126
- src/OpenTelemetry.PersistentStorage.Abstractions
120127
- src/OpenTelemetry.PersistentStorage.FileSystem
121128

129+
unittests-Resources.AWS:
130+
carryforward: true
131+
paths:
132+
- src/OpenTelemetry.Resources.AWS
133+
122134
unittests-Resources.Azure:
123135
carryforward: true
124136
paths:
@@ -149,6 +161,11 @@ flags:
149161
paths:
150162
- src/OpenTelemetry.Resources.ProcessRuntime
151163

164+
unittests-Sampler.AWS:
165+
carryforward: true
166+
paths:
167+
- src/OpenTelemetry.Sampler.AWS
168+
152169
unittests-SemanticConventions:
153170
carryforward: true
154171
paths:

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,10 @@ jobs:
3030
exporter-onecollector: ['*/OpenTelemetry.Exporter.OneCollector*/**', '!**/*.md']
3131
exporter-stackdriver: ['*/OpenTelemetry.Exporter.Stackdriver*/**', '!**/*.md']
3232
extensions: ['*/OpenTelemetry.Extensions/**', '*/OpenTelemetry.Extensions.Tests/**', '!**/*.md']
33-
extensions-aws: ['*/OpenTelemetry.Extensions.AWS*/**', '!**/*.md']
3433
extensions-enrichment: ['*/OpenTelemetry.Extensions.Enrichment*/**', '!**/*.md']
3534
instrumentation-aspnet: ['*/OpenTelemetry.Instrumentation.AspNet/**', '*/OpenTelemetry.Instrumentation.AspNet.Tests/**', '*/OpenTelemetry.Instrumentation.OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.*/**', 'examples/AspNet/**', '!**/*.md']
3635
instrumentation-aspnetcore: ['*/OpenTelemetry.Instrumentation.AspNetCore*/**', '!**/*.md']
37-
instrumentation-aws: ['*/OpenTelemetry.Instrumentation.AWS/**', '*/OpenTelemetry.Instrumentation.AWS.Tests/**', '!**/*.md']
38-
instrumentation-aws-lambda: ['*/OpenTelemetry.Instrumentation.AWSLambda/**', '*/OpenTelemetry.Instrumentation.AWSLambda.Tests/**', '!**/*.md']
36+
instrumentation-aws: ['*/OpenTelemetry.Extensions.AWS*/**', '*/OpenTelemetry.Instrumentation.AWS*/**', '!**/*.md']
3937
instrumentation-cassandra: ['*/OpenTelemetry.Instrumentation.Cassandra*/**', '!**/*.md']
4038
instrumentation-confluentkafka: ['*/OpenTelemetry.Instrumentation.ConfluentKafka*/**', 'examples/kafka/**', '!**/*.md']
4139
instrumentation-elasticsearchclient: ['*/OpenTelemetry.Instrumentation.ElasticsearchClient*/**', '!**/*.md']
@@ -61,7 +59,7 @@ jobs:
6159
resources-operatingsystem: ['*/OpenTelemetry.Resources.OperatingSystem/**', '*/OpenTelemetry.Resources.OperatingSystem.Tests/**', '!**/*.md']
6260
resources-process: ['*/OpenTelemetry.Resources.Process/**', '*/OpenTelemetry.Resources.Process.Tests/**', '!**/*.md']
6361
resources-processruntime: ['*/OpenTelemetry.Resources.ProcessRuntime/**', '*/OpenTelemetry.Resources.ProcessRuntime.Tests/**', '!**/*.md']
64-
sampler-aws: ['*/OpenTelemetry.Sampler.AWS**/**', '!**/*.md']
62+
sampler-aws: ['*/OpenTelemetry.Sampler.AWS*/**', '!**/*.md']
6563
semanticconventions: ['*/OpenTelemetry.SemanticConventions*/**', '!**/*.md']
6664
6765
lint-md:
@@ -151,17 +149,6 @@ jobs:
151149
project-name: Component[OpenTelemetry.Extensions]
152150
code-cov-name: Extensions
153151

154-
build-test-extensions-aws:
155-
needs: detect-changes
156-
if: |
157-
contains(needs.detect-changes.outputs.changes, 'extensions-aws')
158-
|| contains(needs.detect-changes.outputs.changes, 'build')
159-
|| contains(needs.detect-changes.outputs.changes, 'shared')
160-
uses: ./.github/workflows/Component.BuildTest.yml
161-
with:
162-
project-name: Component[OpenTelemetry.Extensions.AWS]
163-
code-cov-name: Extensions.AWS
164-
165152
build-test-extensions-enrichment:
166153
needs: detect-changes
167154
if: |
@@ -206,21 +193,9 @@ jobs:
206193
|| contains(needs.detect-changes.outputs.changes, 'shared')
207194
uses: ./.github/workflows/Component.BuildTest.yml
208195
with:
209-
project-name: Component[OpenTelemetry.Instrumentation.AWS]
196+
project-name: OpenTelemetry.Instrumentation.AWS
210197
code-cov-name: Instrumentation.AWS
211198

212-
build-test-instrumentation-awslambda:
213-
needs: detect-changes
214-
if: |
215-
contains(needs.detect-changes.outputs.changes, 'instrumentation-awslambda')
216-
|| contains(needs.detect-changes.outputs.changes, 'build')
217-
|| contains(needs.detect-changes.outputs.changes, 'shared')
218-
uses: ./.github/workflows/Component.BuildTest.yml
219-
with:
220-
project-name: Component[OpenTelemetry.Instrumentation.AWSLambda]
221-
code-cov-name: Instrumentation.AWSLambda
222-
tfm-list: '[ "net8.0" ]'
223-
224199
build-test-instrumentation-cassandra:
225200
needs: detect-changes
226201
if: |
@@ -524,7 +499,7 @@ jobs:
524499
build-test-sampler-aws:
525500
needs: detect-changes
526501
if: |
527-
contains(needs.detect-changes.outputs.changes, 'resources-sampler-aws')
502+
contains(needs.detect-changes.outputs.changes, 'sampler-aws')
528503
|| contains(needs.detect-changes.outputs.changes, 'build')
529504
|| contains(needs.detect-changes.outputs.changes, 'shared')
530505
uses: ./.github/workflows/Component.BuildTest.yml
@@ -563,7 +538,6 @@ jobs:
563538
|| contains(needs.detect-changes.outputs.changes, 'extensions-enrichment')
564539
|| contains(needs.detect-changes.outputs.changes, 'instrumentation-aspnetcore')
565540
|| contains(needs.detect-changes.outputs.changes, 'instrumentation-aws')
566-
|| contains(needs.detect-changes.outputs.changes, 'instrumentation-awslambda')
567541
|| contains(needs.detect-changes.outputs.changes, 'instrumentation-confluentkafka')
568542
|| contains(needs.detect-changes.outputs.changes, 'instrumentation-eventcounters')
569543
|| contains(needs.detect-changes.outputs.changes, 'instrumentation-grpcnetclient')
@@ -598,12 +572,10 @@ jobs:
598572
build-test-exporter-onecollector,
599573
build-test-exporter-stackdriver,
600574
build-test-extensions,
601-
build-test-extensions-aws,
602575
build-test-extensions-enrichment,
603576
build-test-instrumentation-aspnet,
604577
build-test-instrumentation-aspnetcore,
605578
build-test-instrumentation-aws,
606-
build-test-instrumentation-awslambda,
607579
build-test-instrumentation-cassandra,
608580
build-test-instrumentation-confluentkafka,
609581
build-test-instrumentation-elasticsearchclient,

‎build/Projects/OpenTelemetry.Instrumentation.AWS.proj‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<RepoRoot>$([System.IO.Directory]::GetParent($(MSBuildThisFileDirectory)).Parent.Parent.FullName)</RepoRoot>
5+
<MinVerTagPrefix>Instrumentation.AWS-</MinVerTagPrefix>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<SolutionProjects Include="$(RepoRoot)\src\OpenTelemetry.Extensions.AWS\OpenTelemetry.Extensions.AWS.csproj" />
10+
<SolutionProjects Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.AWS\OpenTelemetry.Instrumentation.AWS.csproj" />
11+
<SolutionProjects Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.AWSLambda\OpenTelemetry.Instrumentation.AWSLambda.csproj" />
12+
<SolutionProjects Include="$(RepoRoot)\test\OpenTelemetry.Extensions.AWS.Tests\OpenTelemetry.Extensions.AWS.Tests.csproj" />
13+
<SolutionProjects Include="$(RepoRoot)\test\OpenTelemetry.Instrumentation.AWS.Tests\OpenTelemetry.Instrumentation.AWS.Tests.csproj" />
14+
<SolutionProjects Include="$(RepoRoot)\test\OpenTelemetry.Instrumentation.AWSLambda.Tests\OpenTelemetry.Instrumentation.AWSLambda.Tests.csproj" />
15+
16+
<PackProjects Include="$(RepoRoot)\src\OpenTelemetry.Extensions.AWS\OpenTelemetry.Extensions.AWS.csproj" />
17+
<PackProjects Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.AWS\OpenTelemetry.Instrumentation.AWS.csproj" />
18+
<PackProjects Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.AWSLambda\OpenTelemetry.Instrumentation.AWSLambda.csproj" />
19+
20+
<TestProjects Include="$(RepoRoot)\test\OpenTelemetry.Extensions.AWS.Tests\OpenTelemetry.Extensions.AWS.Tests.csproj" />
21+
<TestProjects Include="$(RepoRoot)\test\OpenTelemetry.Instrumentation.AWS.Tests\OpenTelemetry.Instrumentation.AWS.Tests.csproj" />
22+
<TestProjects Include="$(RepoRoot)\test\OpenTelemetry.Instrumentation.AWSLambda.Tests\OpenTelemetry.Instrumentation.AWSLambda.Tests.csproj" />
23+
</ItemGroup>
24+
25+
<Target Name="Build">
26+
<MSBuild Projects="@(SolutionProjects)" Targets="Build" ContinueOnError="ErrorAndStop" />
27+
</Target>
28+
29+
<Target Name="Restore">
30+
<MSBuild Projects="@(SolutionProjects)" Targets="Restore" ContinueOnError="ErrorAndStop" />
31+
</Target>
32+
33+
<Target Name="Pack">
34+
<MSBuild Projects="@(PackProjects)" Targets="Pack" ContinueOnError="ErrorAndStop" />
35+
</Target>
36+
37+
<Target Name="VSTest">
38+
<MSBuild Projects="@(TestProjects)" Targets="VSTest" ContinueOnError="ErrorAndStop" />
39+
</Target>
40+
41+
</Project>

‎opentelemetry-dotnet-contrib.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Projects", "Projects", "{04
292292
build\Projects\OpenTelemetry.Extensions.Enrichment.proj = build\Projects\OpenTelemetry.Extensions.Enrichment.proj
293293
build\Projects\OpenTelemetry.Instrumentation.AspNet.proj = build\Projects\OpenTelemetry.Instrumentation.AspNet.proj
294294
build\Projects\OpenTelemetry.Instrumentation.AspNetCore.proj = build\Projects\OpenTelemetry.Instrumentation.AspNetCore.proj
295+
build\Projects\OpenTelemetry.Instrumentation.AWS.proj = build\Projects\OpenTelemetry.Instrumentation.AWS.proj
295296
build\Projects\OpenTelemetry.Instrumentation.ConfluentKafka.proj = build\Projects\OpenTelemetry.Instrumentation.ConfluentKafka.proj
296297
build\Projects\OpenTelemetry.Instrumentation.EventCounters.proj = build\Projects\OpenTelemetry.Instrumentation.EventCounters.proj
297298
build\Projects\OpenTelemetry.Instrumentation.GrpcCore.proj = build\Projects\OpenTelemetry.Instrumentation.GrpcCore.proj

0 commit comments

Comments
 (0)