Merge branch 'main' into issue/AWS-Lambda-SQS-SNS-support

open-telemetry · Apr 11, 2023 · 24ae92d · 24ae92d
2 parents 5bed7c6 + 5907573
commit 24ae92d
Show file tree

Hide file tree

Showing 84 changed files with 506 additions and 698 deletions.
diff --git a/...E_TEMPLATE/comp_instrumentation_AspNet.md → ...E_TEMPLATE/comp_instrumentation_aspnet.md b/...E_TEMPLATE/comp_instrumentation_AspNet.md → ...E_TEMPLATE/comp_instrumentation_aspnet.md
@@ -1,7 +1,7 @@
 ---
 name: OpenTelemetry.Instrumentation.AspNet
 about: Issue with OpenTelemetry.Instrumentation.AspNet
-labels: comp:instrumentation.AspNet
+labels: comp:instrumentation.aspnet
 ---
 
 # Issue with OpenTelemetry.Instrumentation.AspNet

diff --git a/...rumentation_AspNet.TelemetryHttpModule.md → ...rumentation_aspnet.telemetryhttpmodule.md b/...rumentation_AspNet.TelemetryHttpModule.md → ...rumentation_aspnet.telemetryhttpmodule.md
@@ -1,7 +1,7 @@
 ---
 name: OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule
 about: Issue with OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule
-labels: comp:instrumentation.AspNet.TelemetryHttpModule
+labels: comp:instrumentation.aspnet.telemetryhttpmodule
 ---
 
 # Issue with OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule

diff --git a/.../ISSUE_TEMPLATE/comp_extensions_docker.md → ...PLATE/comp_resourcedetectors_container.md b/.../ISSUE_TEMPLATE/comp_extensions_docker.md → ...PLATE/comp_resourcedetectors_container.md
@@ -1,10 +1,10 @@
 ---
-name: OpenTelemetry.Extensions.Docker
-about: Issue with OpenTelemetry.Extensions.Docker
-labels: comp:extensions.docker
+name: OpenTelemetry.ResourceDetectors.Container
+about: Issue with OpenTelemetry.ResourceDetectors.Container
+labels: comp:resourcedetectors.container
 ---
 
-# Issue with OpenTelemetry.Extensions.Docker
+# Issue with OpenTelemetry.ResourceDetectors.Container
 
 List of [all OpenTelemetry NuGet
 packages](https://www.nuget.org/profiles/OpenTelemetry) and version that you are

diff --git a/.github/component_owners.yml b/.github/component_owners.yml
@@ -27,8 +27,6 @@ components:
   src/OpenTelemetry.Extensions.AzureMonitor/:
     - rajkumar-rangaraj
     - vishweshbankwar
-  src/OpenTelemetry.Extensions.Docker/:
-    - iskiselev
   src/OpenTelemetry.Extensions.Enrichment/:
     - xakep139
   src/OpenTelemetry.PersistentStorage.Abstractions/:
@@ -65,6 +63,8 @@ components:
   src/OpenTelemetry.ResourceDetectors.Azure/:
     - rajkumar-rangaraj
     - vishweshbankwar
+  src/OpenTelemetry.ResourceDetectors.Container/:
+    - iskiselev
   src/OpenTelemetry.Sampler.AWS/:
     - srprash
   test/OpenTelemetry.Contrib.Extensions.AWSXRay.Tests/:
@@ -108,8 +108,6 @@ components:
   test/OpenTelemetry.Extensions.AzureMonitor.Tests/:
     - rajkumar-rangaraj
     - vishweshbankwar
-  test/OpenTelemetry.Extensions.Docker.Tests/:
-    - iskiselev
   test/OpenTelemetry.Extensions.Enrichment.Tests/:
     - xakep139
   test/OpenTelemetry.PersistentStorage.FileSystem.Tests/:
@@ -142,5 +140,7 @@ components:
   test/OpenTelemetry.ResourceDetectors.Azure.Tests/:
     - rajkumar-rangaraj
     - vishweshbankwar
+  test/OpenTelemetry.ResourceDetectors.Container.Tests/:
+    - iskiselev
   test/OpenTelemetry.Sampler.AWS.Tests/:
     - srprash
diff --git a/...b/workflows/package-Extensions.Docker.yml → ...s/package-ResourceDetectors.Container.yml b/...b/workflows/package-Extensions.Docker.yml → ...s/package-ResourceDetectors.Container.yml
@@ -1,4 +1,4 @@
-name: Pack OpenTelemetry.Extensions.Docker
+name: Pack OpenTelemetry.ResourceDetectors.Container
 
 on:
   workflow_dispatch:
@@ -9,15 +9,15 @@ on:
         default: 'warning'
   push:
     tags:
-      - 'Extensions.Docker-*' # trigger when we create a tag with prefix "Extensions.Docker-"
+      - 'ResourceDetectors.Container-*' # trigger when we create a tag with prefix "ResourceDetectors.Container-"
 
 jobs:
   build-test-pack:
     runs-on: ${{ matrix.os }}
     permissions:
       contents: write
     env:
-      PROJECT: OpenTelemetry.Extensions.Docker
+      PROJECT: OpenTelemetry.ResourceDetectors.Container
 
     strategy:
       matrix:

diff --git a/build/Common.nonprod.props b/build/Common.nonprod.props
@@ -24,14 +24,13 @@
     <CoverletCollectorPkgVer>[3.2.0,4.0.0)</CoverletCollectorPkgVer>
     <DotNetXUnitCliVer>[2.3.1,3.0)</DotNetXUnitCliVer>
     <MicrosoftExtensionsLoggingPkgVer>[5.0.0,7.0)</MicrosoftExtensionsLoggingPkgVer>
-    <MicrosoftNETTestSdkPkgVer>[17.3.2,18.0)</MicrosoftNETTestSdkPkgVer>
-    <MoqPkgVer>[4.18.3,5.0)</MoqPkgVer>
-    <MoqNet45PkgVer>[4.17.2,5.0)</MoqNet45PkgVer>
+    <MicrosoftNETTestSdkPkgVer>[17.5.0,18.0)</MicrosoftNETTestSdkPkgVer>
+    <MoqPkgVer>[4.18.4,5.0)</MoqPkgVer>
     <OpenTelemetryExporterInMemoryPkgVer>$(OpenTelemetryCoreLatestVersion)</OpenTelemetryExporterInMemoryPkgVer>
     <OpenTelemetryExporterInMemoryLatestPreReleasePkgVer>$(OpenTelemetryCoreLatestPrereleaseVersion)</OpenTelemetryExporterInMemoryLatestPreReleasePkgVer>
-    <XUnitRunnerVisualStudioPkgVer>[2.4.3,3.0)</XUnitRunnerVisualStudioPkgVer>
+    <XUnitRunnerVisualStudioPkgVer>[2.4.5,3.0)</XUnitRunnerVisualStudioPkgVer>
     <XUnitPkgVer>[2.4.2,3.0)</XUnitPkgVer>
-    <WiremockNetPkgVer>[1.5.20,2.0)</WiremockNetPkgVer>
+    <WiremockNetPkgVer>[1.5.21,2.0)</WiremockNetPkgVer>
 </PropertyGroup>
 
 </Project>
diff --git a/build/Common.props b/build/Common.props
@@ -27,7 +27,7 @@
       Refer to https://docs.microsoft.com/en-us/nuget/concepts/package-versioning for semver syntax.
     -->
     <MinVerPkgVer>[4.2.0,5.0)</MinVerPkgVer>
-    <MicrosoftCodeCoveragePkgVer>[17.3.2]</MicrosoftCodeCoveragePkgVer>
+    <MicrosoftCodeCoveragePkgVer>[17.5.0]</MicrosoftCodeCoveragePkgVer>
     <MicrosoftExtensionsHostingAbstractionsPkgVer>[2.1.0,5.0)</MicrosoftExtensionsHostingAbstractionsPkgVer>
     <MicrosoftExtensionsOptionsPkgVer>[3.1.0,)</MicrosoftExtensionsOptionsPkgVer>
     <MicrosoftNETFrameworkReferenceAssembliesPkgVer>[1.0.3,2.0)</MicrosoftNETFrameworkReferenceAssembliesPkgVer>
@@ -54,6 +54,10 @@
     <PackageReference Include="Microsoft.CodeCoverage" Version="$(MicrosoftCodeCoveragePkgVer)" Condition="'$(Configuration)'=='Release'" PrivateAssets="All" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(IncludeSharedExceptionExtensionsSource)'=='true'">
+    <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\ExceptionExtensions.cs" Link="Includes\ExceptionExtensions.cs" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(IncludeSharedInstrumentationSource)'=='true'">
     <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\DiagnosticSourceInstrumentation\ActivityInstrumentationHelper.cs" Link="Includes\ActivityInstrumentationHelper.cs" />
     <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\DiagnosticSourceInstrumentation\DiagnosticSourceListener.cs" Link="Includes\DiagnosticSourceListener.cs" />
@@ -62,11 +66,9 @@
     <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\DiagnosticSourceInstrumentation\ListenerHandler.cs" Link="Includes\ListenerHandler.cs" />
     <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\DiagnosticSourceInstrumentation\MultiTypePropertyFetcher.cs" Link="Includes\MultiTypePropertyFetcher.cs" />
     <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\DiagnosticSourceInstrumentation\PropertyFetcher.cs" Link="Includes\PropertyFetcher.cs" />
-    <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\ExceptionExtensions.cs" Link="Includes\ExceptionExtensions.cs" />
     <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\SemanticConventions.cs" Link="Includes\SemanticConventions.cs" />
     <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\SpanAttributeConstants.cs" Link="Includes\SpanAttributeConstants.cs" />
     <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\SpanHelper.cs" Link="Includes\SpanHelper.cs" />
-    <Compile Include="$(RepoRoot)\src\OpenTelemetry.Contrib.Shared\Api\StatusHelper.cs" Link="Includes\StatusHelper.cs" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(IncludeSharedTestSource)'=='true'">

diff --git a/build/process-codecoverage.ps1 b/build/process-codecoverage.ps1
@@ -6,7 +6,7 @@ $files = Get-ChildItem "TestResults" -Filter "*.coverage" -Recurse
 Write-Host $env:USERPROFILE
 foreach ($file in $files)
 {
-    $command = $env:USERPROFILE+ '\.nuget\packages\microsoft.codecoverage\' + $microsoftCodeCoveragePkgVer + '\build\netstandard1.0\CodeCoverage\CodeCoverage.exe analyze /output:' + $file.DirectoryName + '\' + $file.Name + '.xml '+ $file.FullName
+    $command = $env:USERPROFILE+ '\.nuget\packages\microsoft.codecoverage\' + $microsoftCodeCoveragePkgVer + '\build\netstandard2.0\CodeCoverage\CodeCoverage.exe analyze /output:' + $file.DirectoryName + '\' + $file.Name + '.xml '+ $file.FullName
     Write-Host $command
     Invoke-Expression $command
 }
diff --git a/examples/AspNet/Examples.AspNet.csproj b/examples/AspNet/Examples.AspNet.csproj
@@ -84,7 +84,7 @@
     <PackageReference Include="OpenTelemetry.Exporter.Console" Version="$(OpenTelemetryCoreLatestVersion)" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="$(OpenTelemetryCoreLatestVersion)" />
     <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="$(OpenTelemetryCoreLatestVersion)" />
-    <PackageReference Include="OpenTelemetry.Exporter.Prometheus" Version="1.3.0-rc.2" />
+    <PackageReference Include="OpenTelemetry.Exporter.Prometheus.HttpListener" Version="1.4.0-rc.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry.Instrumentation.AspNet\OpenTelemetry.Instrumentation.AspNet.csproj">

diff --git a/examples/AspNet/Global.asax.cs b/examples/AspNet/Global.asax.cs
@@ -77,7 +77,7 @@ protected void Application_Start()
                 });
                 break;
             case "prometheus":
-                meterBuilder.AddPrometheusExporter();
+                meterBuilder.AddPrometheusHttpListener();
                 break;
             default:
                 meterBuilder.AddConsoleExporter((exporterOptions, metricReaderOptions) =>

diff --git a/examples/AspNet/Views/Web.config b/examples/AspNet/Views/Web.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 
 <configuration>
   <configSections>
@@ -9,7 +9,7 @@
   </configSections>
 
   <system.web.webPages.razor>
-    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
     <pages pageBaseType="System.Web.Mvc.WebViewPage">
       <namespaces>
         <add namespace="System.Web.Mvc" />
@@ -34,7 +34,7 @@
   <system.web>
     <compilation>
       <assemblies>
-        <add assembly="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+        <add assembly="System.Web.Mvc, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
         <add assembly="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
       </assemblies>
     </compilation>

diff --git a/opentelemetry-dotnet-contrib.sln b/opentelemetry-dotnet-contrib.sln
@@ -177,9 +177,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions.Tests", "test\OpenTelemetry.Extensions.Tests\OpenTelemetry.Extensions.Tests.csproj", "{2117F4E3-6612-4E4D-A757-27271EEB7783}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions.Docker", "src\OpenTelemetry.Extensions.Docker\OpenTelemetry.Extensions.Docker.csproj", "{498A6808-C0DF-441F-A764-51A3BC4B8FC5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.ResourceDetectors.Container", "src\OpenTelemetry.ResourceDetectors.Container\OpenTelemetry.ResourceDetectors.Container.csproj", "{498A6808-C0DF-441F-A764-51A3BC4B8FC5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions.Docker.Tests", "test\OpenTelemetry.Extensions.Docker.Tests\OpenTelemetry.Extensions.Docker.Tests.csproj", "{FB41E19E-2682-4D07-BA59-FD5205AFA71E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.ResourceDetectors.Container.Tests", "test\OpenTelemetry.ResourceDetectors.Container.Tests\OpenTelemetry.ResourceDetectors.Container.Tests.csproj", "{FB41E19E-2682-4D07-BA59-FD5205AFA71E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.Geneva", "src\OpenTelemetry.Exporter.Geneva\OpenTelemetry.Exporter.Geneva.csproj", "{1105C814-31DA-4214-BEA8-6DB5FC12C808}"
 EndProject
@@ -235,9 +235,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "process-instrumentation", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.EventCounters", "examples\event-counters\Examples.EventCounters\Examples.EventCounters.csproj", "{BA58CC8B-F5CA-4DC7-A3A8-D01B2E10731E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTelemetry.Instrumentation.Cassandra", "src\OpenTelemetry.Instrumentation.Cassandra\OpenTelemetry.Instrumentation.Cassandra.csproj", "{3313F7DF-E3A5-4A7F-965D-86807A017131}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.Cassandra", "src\OpenTelemetry.Instrumentation.Cassandra\OpenTelemetry.Instrumentation.Cassandra.csproj", "{3313F7DF-E3A5-4A7F-965D-86807A017131}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.Cassandra.Tests", "test\OpenTelemetry.Instrumentation.Cassandra.Tests\OpenTelemetry.Instrumentation.Cassandra.Tests.csproj", "{FB48DC44-8C56-4329-9988-AEDF931E81E8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTelemetry.Instrumentation.Cassandra.Tests", "test\OpenTelemetry.Instrumentation.Cassandra.Tests\OpenTelemetry.Instrumentation.Cassandra.Tests.csproj", "{FB48DC44-8C56-4329-9988-AEDF931E81E8}"
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.ResourceDetectors.Azure", "src\OpenTelemetry.ResourceDetectors.Azure\OpenTelemetry.ResourceDetectors.Azure.csproj", "{B07DC3CB-F724-40A5-889A-DA6601F462F3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.ResourceDetectors.Azure.Tests", "test\OpenTelemetry.ResourceDetectors.Azure.Tests\OpenTelemetry.ResourceDetectors.Azure.Tests.csproj", "{DFC6A4A9-5262-4507-B747-CC6B814205E6}"
@@ -256,9 +257,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.PersistentSto
 EndProject
 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}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTelemetry.Sampler.AWS", "src\OpenTelemetry.Sampler.AWS\OpenTelemetry.Sampler.AWS.csproj", "{54002B08-F6AE-4B2B-AB0C-86E5A05926A3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Sampler.AWS", "src\OpenTelemetry.Sampler.AWS\OpenTelemetry.Sampler.AWS.csproj", "{54002B08-F6AE-4B2B-AB0C-86E5A05926A3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTelemetry.Sampler.AWS.Tests", "test\OpenTelemetry.Sampler.AWS.Tests\OpenTelemetry.Sampler.AWS.Tests.csproj", "{48C29501-3FA2-46A7-B5BA-D282EA8F1274}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Sampler.AWS.Tests", "test\OpenTelemetry.Sampler.AWS.Tests\OpenTelemetry.Sampler.AWS.Tests.csproj", "{48C29501-3FA2-46A7-B5BA-D282EA8F1274}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.OneCollector.Benchmarks", "test\OpenTelemetry.Exporter.OneCollector.Benchmarks\OpenTelemetry.Exporter.OneCollector.Benchmarks.csproj", "{C42868C8-968A-473F-AC39-AC97C5D47E84}"
 EndProject

diff --git a/src/OpenTelemetry.Contrib.Extensions.AWSXRay/AWSXRayEventSource.cs b/src/OpenTelemetry.Contrib.Extensions.AWSXRay/AWSXRayEventSource.cs
@@ -16,8 +16,7 @@
 
 using System;
 using System.Diagnostics.Tracing;
-using System.Globalization;
-using System.Threading;
+using OpenTelemetry.Internal;
 
 namespace OpenTelemetry.Contrib.Extensions.AWSXRay;
 
@@ -31,7 +30,7 @@ public void ActivityContextExtractException(string format, Exception ex)
     {
         if (this.IsEnabled(EventLevel.Warning, (EventKeywords)(-1)))
         {
-            this.FailedToExtractActivityContext(format, ToInvariantString(ex));
+            this.FailedToExtractActivityContext(format, ex.ToInvariantString());
         }
     }
 
@@ -40,7 +39,7 @@ public void ResourceAttributesExtractException(string format, Exception ex)
     {
         if (this.IsEnabled(EventLevel.Warning, (EventKeywords)(-1)))
         {
-            this.FailedToExtractResourceAttributes(format, ToInvariantString(ex));
+            this.FailedToExtractResourceAttributes(format, ex.ToInvariantString());
         }
     }
 
@@ -67,23 +66,4 @@ public void FailedToValidateCertificate(string format, string error)
     {
         this.WriteEvent(4, format, error);
     }
-
-    /// <summary>
-    /// Returns a culture-independent string representation of the given <paramref name="exception"/> object,
-    /// appropriate for diagnostics tracing.
-    /// </summary>
-    private static string ToInvariantString(Exception exception)
-    {
-        var originalUICulture = Thread.CurrentThread.CurrentUICulture;
-
-        try
-        {
-            Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
-            return exception.ToString();
-        }
-        finally
-        {
-            Thread.CurrentThread.CurrentUICulture = originalUICulture;
-        }
-    }
 }
diff --git a/src/OpenTelemetry.Contrib.Extensions.AWSXRay/OpenTelemetry.Contrib.Extensions.AWSXRay.csproj b/src/OpenTelemetry.Contrib.Extensions.AWSXRay/OpenTelemetry.Contrib.Extensions.AWSXRay.csproj
@@ -5,6 +5,7 @@
     <Description>OpenTelemetry extensions for AWS X-Ray.</Description>
     <MinVerTagPrefix>Extensions.AWSXRay-</MinVerTagPrefix>
     <Nullable>enable</Nullable>
+    <IncludeSharedExceptionExtensionsSource>true</IncludeSharedExceptionExtensionsSource>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/OpenTelemetry.Contrib.Instrumentation.AWS/.publicApi/net462/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Contrib.Instrumentation.AWS/.publicApi/net462/PublicAPI.Unshipped.txt
@@ -1 +1,3 @@
-#nullable enable
+*REMOVED*static OpenTelemetry.Trace.TracerProviderBuilderExtensions.AddAWSInstrumentation(this OpenTelemetry.Trace.TracerProviderBuilder! builder, System.Action<OpenTelemetry.Contrib.Instrumentation.AWS.AWSClientInstrumentationOptions!>? configure = null) -> OpenTelemetry.Trace.TracerProviderBuilder!
+static OpenTelemetry.Trace.TracerProviderBuilderExtensions.AddAWSInstrumentation(this OpenTelemetry.Trace.TracerProviderBuilder! builder) -> OpenTelemetry.Trace.TracerProviderBuilder!
+static OpenTelemetry.Trace.TracerProviderBuilderExtensions.AddAWSInstrumentation(this OpenTelemetry.Trace.TracerProviderBuilder! builder, System.Action<OpenTelemetry.Contrib.Instrumentation.AWS.AWSClientInstrumentationOptions!>? configure) -> OpenTelemetry.Trace.TracerProviderBuilder!
diff --git a/...enTelemetry.Contrib.Instrumentation.AWS/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt b/...enTelemetry.Contrib.Instrumentation.AWS/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1 +1,3 @@
-#nullable enable
+*REMOVED*static OpenTelemetry.Trace.TracerProviderBuilderExtensions.AddAWSInstrumentation(this OpenTelemetry.Trace.TracerProviderBuilder! builder, System.Action<OpenTelemetry.Contrib.Instrumentation.AWS.AWSClientInstrumentationOptions!>? configure = null) -> OpenTelemetry.Trace.TracerProviderBuilder!
+static OpenTelemetry.Trace.TracerProviderBuilderExtensions.AddAWSInstrumentation(this OpenTelemetry.Trace.TracerProviderBuilder! builder) -> OpenTelemetry.Trace.TracerProviderBuilder!
+static OpenTelemetry.Trace.TracerProviderBuilderExtensions.AddAWSInstrumentation(this OpenTelemetry.Trace.TracerProviderBuilder! builder, System.Action<OpenTelemetry.Contrib.Instrumentation.AWS.AWSClientInstrumentationOptions!>? configure) -> OpenTelemetry.Trace.TracerProviderBuilder!
diff --git a/src/OpenTelemetry.Contrib.Instrumentation.AWS/CHANGELOG.md b/src/OpenTelemetry.Contrib.Instrumentation.AWS/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 * Raised the minimum .NET version to `net462`
   ([#1095](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1095))
+* Removes `AddAWSInstrumentation` method with default configure default parameter.
+  ([#1117](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1117))
 
 ## 1.0.2
 

diff --git a/src/OpenTelemetry.Contrib.Instrumentation.AWS/TracerProviderBuilderExtensions.cs b/src/OpenTelemetry.Contrib.Instrumentation.AWS/TracerProviderBuilderExtensions.cs
@@ -26,6 +26,14 @@ namespace OpenTelemetry.Trace;
 /// </summary>
 public static class TracerProviderBuilderExtensions
 {
+    /// <summary>
+    /// Enables AWS Instrumentation.
+    /// </summary>
+    /// <param name="builder"><see cref="TracerProviderBuilder"/> being configured.</param>
+    /// <returns>The instance of <see cref="TracerProviderBuilder"/> to chain the calls.</returns>
+    public static TracerProviderBuilder AddAWSInstrumentation(
+        this TracerProviderBuilder builder) => AddAWSInstrumentation(builder, configure: null);
+
     /// <summary>
     /// Enables AWS Instrumentation.
     /// </summary>
@@ -34,7 +42,7 @@ public static class TracerProviderBuilderExtensions
     /// <returns>The instance of <see cref="TracerProviderBuilder"/> to chain the calls.</returns>
     public static TracerProviderBuilder AddAWSInstrumentation(
         this TracerProviderBuilder builder,
-        Action<AWSClientInstrumentationOptions>? configure = null)
+        Action<AWSClientInstrumentationOptions>? configure)
     {
         Guard.ThrowIfNull(builder);