Merge branch 'main' into extensions-awsxray-target-net6.0

.github/ISSUE_TEMPLATE/comp_contrib_extensions_awsxray.md → .github/ISSUE_TEMPLATE/comp_extensions_aws.md

@@ -1,10 +1,10 @@
 ---
-name: OpenTelemetry.Contrib.Extensions.AWSXRay
-about: Issue with OpenTelemetry.Contrib.Extensions.AWSXRay
-labels: comp:contrib.extensions.awsxray
+name: OpenTelemetry.Extensions.AWS
+about: Issue with OpenTelemetry.Extensions.AWS
+labels: comp:extensions.aws
 ---
 
-# Issue with OpenTelemetry.Contrib.Extensions.AWSXRay
+# Issue with OpenTelemetry.Extensions.AWS
 
 List of [all OpenTelemetry NuGet
 packages](https://www.nuget.org/profiles/OpenTelemetry) and version that you are

.github/ISSUE_TEMPLATE/comp_contrib_instrumentation_aws.md → .github/ISSUE_TEMPLATE/comp_instrumentation_aws.md

@@ -1,10 +1,10 @@
 ---
-name: OpenTelemetry.Contrib.Instrumentation.AWS
-about: Issue with OpenTelemetry.Contrib.Instrumentation.AWS
-labels: comp:contrib.instrumentation.aws
+name: OpenTelemetry.Instrumentation.AWS
+about: Issue with OpenTelemetry.Instrumentation.AWS
+labels: comp:instrumentation.aws
 ---
 
-# Issue with OpenTelemetry.Contrib.Instrumentation.AWS
+# Issue with OpenTelemetry.Instrumentation.AWS
 
 List of [all OpenTelemetry NuGet
 packages](https://www.nuget.org/profiles/OpenTelemetry) and version that you are

.github/component_owners.yml

@@ -3,12 +3,6 @@
 # Each component identified by its path prefix has a list of users
 # Please add the entries in alphabetically sorted order
 components:
-  src/OpenTelemetry.Contrib.Extensions.AWSXRay/:
-    - srprash
-    - atshaw43
-  src/OpenTelemetry.Contrib.Instrumentation.AWS/:
-    - srprash
-    - atshaw43
   src/OpenTelemetry.Exporter.Geneva/:
     - cijothomas
     - codeblanch
@@ -26,12 +20,14 @@ components:
     - SergeyKanzhelev
   src/OpenTelemetry.Extensions/:
     - codeblanch
+  src/OpenTelemetry.Extensions.AWS/:
+    - srprash
+    - atshaw43
   src/OpenTelemetry.Extensions.Enrichment/:
     - xakep139
-  src/OpenTelemetry.PersistentStorage.Abstractions/:
-    - vishweshbankwar
-  src/OpenTelemetry.PersistentStorage.FileSystem/:
-    - vishweshbankwar
+  src/OpenTelemetry.Instrumentation.AWS/:
+    - srprash
+    - atshaw43
   src/OpenTelemetry.Instrumentation.AWSLambda/:
     - rypdal
     - Oberon00
@@ -59,6 +55,10 @@ components:
     - xiang17
   src/OpenTelemetry.Instrumentation.Wcf/:
     - codeblanch
+  src/OpenTelemetry.PersistentStorage.Abstractions/:
+    - vishweshbankwar
+  src/OpenTelemetry.PersistentStorage.FileSystem/:
+    - vishweshbankwar
   src/OpenTelemetry.ResourceDetectors.AWS/:
     - srprash
     - atshaw43
@@ -70,12 +70,6 @@ components:
   src/OpenTelemetry.Sampler.AWS/:
     - srprash
     - atshaw43
-  test/OpenTelemetry.Contrib.Extensions.AWSXRay.Tests/:
-    - srprash
-    - atshaw43
-  test/OpenTelemetry.Contrib.Instrumentation.AWS.Tests/:
-    - srprash
-    - atshaw43
   test/OpenTelemetry.Exporter.Geneva.Benchmark/:
     - cijothomas
     - codeblanch
@@ -108,10 +102,14 @@ components:
     - SergeyKanzhelev
   test/OpenTelemetry.Extensions.Tests/:
     - codeblanch
+  test/OpenTelemetry.Extensions.AWS.Tests/:
+    - srprash
+    - atshaw43
   test/OpenTelemetry.Extensions.Enrichment.Tests/:
     - xakep139
-  test/OpenTelemetry.PersistentStorage.FileSystem.Tests/:
-    - vishweshbankwar
+  test/OpenTelemetry.Instrumentation.AWS.Tests/:
+    - srprash
+    - atshaw43
   test/OpenTelemetry.Instrumentation.AWSLambda.Tests/:
     - rypdal
     - Oberon00
@@ -137,6 +135,8 @@ components:
     - xiang17
   test/OpenTelemetry.Instrumentation.Wcf.Tests/:
     - codeblanch
+  test/OpenTelemetry.PersistentStorage.FileSystem.Tests/:
+    - vishweshbankwar
   test/OpenTelemetry.ResourceDetectors.AWS.Tests/:
     - srprash
     - atshaw43

.github/workflows/package-Extensions.AWSXRay.yml → .github/workflows/package-Extensions.AWS.yml

@@ -1,4 +1,4 @@
-name: Pack OpenTelemetry.Contrib.Extensions.AWSXRay
+name: Pack OpenTelemetry.Extensions.AWS
 
 on:
   workflow_dispatch:
@@ -9,15 +9,15 @@ on:
         default: 'warning'
   push:
     tags:
-      - 'Extensions.AWSXRay-*' # trigger when we create a tag with prefix "Extensions.AWSXRay-"
+      - 'Extensions.AWS-*' # trigger when we create a tag with prefix "Extensions.AWS-"
 
 jobs:
   build-test-pack:
     runs-on: ${{ matrix.os }}
     permissions:
       contents: write
     env:
-      PROJECT: OpenTelemetry.Contrib.Extensions.AWSXRay
+      PROJECT: OpenTelemetry.Extensions.AWS
 
     strategy:
       matrix:

.github/workflows/package-Instrumentation.AWS.yml

@@ -1,4 +1,4 @@
-name: Pack OpenTelemetry.Contrib.Instrumentation.AWS
+name: Pack OpenTelemetry.Instrumentation.AWS
 
 on:
   workflow_dispatch:
@@ -17,7 +17,7 @@ jobs:
     permissions:
       contents: write
     env:
-      PROJECT: OpenTelemetry.Contrib.Instrumentation.AWS
+      PROJECT: OpenTelemetry.Instrumentation.AWS
 
     strategy:
       matrix:

build/Common.prod.props

@@ -8,6 +8,7 @@
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageIcon>opentelemetry-icon-color.png</PackageIcon>
     <Authors>OpenTelemetry authors</Authors>
+    <Copyright>Copyright The OpenTelemetry Authors</Copyright>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)/OpenTelemetryContrib.prod.ruleset</CodeAnalysisRuleSet>
     <NoWarn>$(NoWarn),1573,1712</NoWarn>

opentelemetry-dotnet-contrib.sln

@@ -111,13 +111,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.Wcf.Client.NetFram
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.Wcf.Server.NetFramework", "examples\wcf\server-netframework\Examples.Wcf.Server.NetFramework.csproj", "{E205AA70-36BD-461D-8B87-909ED1BCA721}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Contrib.Extensions.AWSXRay", "src\OpenTelemetry.Contrib.Extensions.AWSXRay\OpenTelemetry.Contrib.Extensions.AWSXRay.csproj", "{D8C9AD2A-5C6A-46F5-A216-3D67E6C0FA94}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions.AWS", "src\OpenTelemetry.Extensions.AWS\OpenTelemetry.Extensions.AWS.csproj", "{D8C9AD2A-5C6A-46F5-A216-3D67E6C0FA94}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Contrib.Extensions.AWSXRay.Tests", "test\OpenTelemetry.Contrib.Extensions.AWSXRay.Tests\OpenTelemetry.Contrib.Extensions.AWSXRay.Tests.csproj", "{9CE513AC-CFC5-4DD1-9F16-8719EDCE9BF9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Extensions.AWS.Tests", "test\OpenTelemetry.Extensions.AWS.Tests\OpenTelemetry.Extensions.AWS.Tests.csproj", "{9CE513AC-CFC5-4DD1-9F16-8719EDCE9BF9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Contrib.Instrumentation.AWS", "src\OpenTelemetry.Contrib.Instrumentation.AWS\OpenTelemetry.Contrib.Instrumentation.AWS.csproj", "{970673DA-F308-4960-A58D-ECCEA44CEF6B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.AWS", "src\OpenTelemetry.Instrumentation.AWS\OpenTelemetry.Instrumentation.AWS.csproj", "{970673DA-F308-4960-A58D-ECCEA44CEF6B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Contrib.Instrumentation.AWS.Tests", "test\OpenTelemetry.Contrib.Instrumentation.AWS.Tests\OpenTelemetry.Contrib.Instrumentation.AWS.Tests.csproj", "{CAB66B50-DAB6-49B8-83F9-6CCF520C4A36}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.AWS.Tests", "test\OpenTelemetry.Instrumentation.AWS.Tests\OpenTelemetry.Instrumentation.AWS.Tests.csproj", "{CAB66B50-DAB6-49B8-83F9-6CCF520C4A36}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.Wcf.Tests", "test\OpenTelemetry.Instrumentation.Wcf.Tests\OpenTelemetry.Instrumentation.Wcf.Tests.csproj", "{76BAB24F-85DB-4FCE-89D0-EFB4185004C9}"
 EndProject