Merge branch 'main' into json-logging

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,80 @@
+name: Bug report
+description: Create a report to help us improve
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report! Please make sure to fill out the entire form below, providing as much context as you can in order to help us triage and track down your bug as quickly as possible.
+
+        Before filing a bug, please be sure you have searched through [existing bugs](https://github.com/open-telemetry/opentelemetry-dotnet/issues?q=is%3Aissue+is%3Aopen+label%3Abug) to see if an existing issue covers your bug.
+
+  - type: dropdown
+    id: area
+    attributes:
+      label: Area(s)
+      description: Which area(s) does your bug report concern? If none fits, please select `area:other`
+      multiple: false
+      options:
+        - area:other
+        - area:api
+        - area:exporter
+        - area:exporter:otlp
+        - area:exporter:prometheus
+        - area:ext:hosting
+        - area:sdk
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Package version
+      description: List of [all OpenTelemetry NuGet packages](https://www.nuget.org/profiles/OpenTelemetry) and version that you are using (e.g. `OpenTelemetry 1.0.2`)
+      value: |
+        | Package Name                          | Version |
+        | ------------------------------------- | ------- |
+        | OpenTelemetry.Api                     | 1.8.0   |
+        | OpenTelemetry                         | 1.8.0   |
+        | TBD                                   | TBD     |
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Runtime version
+      description: What .NET runtime version (e.g. `net462`, `net48`, `netcoreapp3.1`, `net6.0` etc. You can find this information from the `*.csproj` file) did you use?
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Description
+      description: What happened? Please provide as much detail as you reasonably can.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps to Reproduce
+      description: Create a self-contained project using the template of your choice, apply the minimum required code to result in the issue you are observing. We will close the issue if the repro project you share with us is complex or we cannot reproduce the behavior you are reporting. We can not investigate custom projects, so don't point us to such, please.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Expected Result
+      description: What did you expect to see? 
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Actual Result
+      description: What did you see instead?
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Any additional information you think may be relevant to this issue.

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -0,0 +1,34 @@
+name: Feature request
+description: Suggest an idea for this project
+labels: ["enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature request! Please make sure to fill out the entire form below, providing as much context as you can in order to help us triage and track down your request as quickly as possible.
+
+        Before opening a feature request, consider whether the feature should/could be implemented in the [other OpenTelemetry client libraries](https://github.com/open-telemetry/). If so, please [open an issue on opentelemetry-specification](https://github.com/open-telemetry/opentelemetry-specification/issues/new) first.
+
+  - type: textarea
+    attributes:
+      label: Is your feature request related to a problem?
+      description: If so, provide a concise description of the problem.
+
+  - type: textarea
+    attributes:
+      label: What is the expected behavior?
+      description: Describe the solution you would like.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Which alternative solutions or features have you considered?
+      description: Describe alternatives you've considered.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Any additional information you think may be relevant to this feature request.

.github/ISSUE_TEMPLATE/question.yaml

@@ -0,0 +1,21 @@
+name: Question
+description: Ask a question to help us improve our knowledge base and documentation
+labels: ["question"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        > [!NOTE]
+        > Please ask questions using [GitHub Discussions](https://github.com/open-telemetry/opentelemetry-dotnet/discussions/new) instead of GitHub Issues.
+
+  - type: textarea
+    attributes:
+      label: What is the question?
+      description: Describe the question you have.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Any additional information you think may be relevant to this question.

.github/workflows/ci.yml

@@ -87,6 +87,7 @@ jobs:
       project-name: './build/InstrumentationLibraries.proj'
       project-build-commands: '-p:RunningDotNetPack=true -p:ExposeExperimentalFeatures=false'
       code-cov-name: 'Instrumentation-Stable'
+      tfm-list: '[ "net6.0", "net7.0", "net8.0" ]'
 
   # Build instrumentation libraries using stable packages released to NuGet
   build-test-instrumentation-experimental:
@@ -100,6 +101,7 @@ jobs:
       project-name: './build/InstrumentationLibraries.proj'
       project-build-commands: '-p:RunningDotNetPack=true -p:ExposeExperimentalFeatures=true'
       code-cov-name: 'Instrumentation-Experimental'
+      tfm-list: '[ "net6.0", "net7.0", "net8.0" ]'
 
   # Build unstable core libraries using stable packages released to NuGet
   build-test-unstable-core:

.github/workflows/publish-packages-1.0.yml

@@ -19,6 +19,7 @@ on:
 
 permissions:
   contents: write
+  pull-requests: write
 
 jobs:
   build-pack-publish:
@@ -52,11 +53,14 @@ jobs:
         path: '**/bin/**/*.*nupkg'
 
     - name: Publish MyGet
+      env:
+        MYGET_TOKEN_EXISTS: ${{ secrets.MYGET_TOKEN != '' }}
+      if: env.MYGET_TOKEN_EXISTS == 'true' # Skip MyGet publish if run on a fork without the secret
       run: |
         nuget setApiKey ${{ secrets.MYGET_TOKEN }} -Source https://www.myget.org/F/opentelemetry/api/v2/package
         nuget push **/bin/**/*.nupkg -Source https://www.myget.org/F/opentelemetry/api/v2/package
 
-    - name: Create GitHub Release Draft
+    - name: Create GitHub Release draft
       if: github.ref_type == 'tag'
       shell: pwsh
       run: |
@@ -102,7 +106,7 @@ jobs:
                     {
                         $content += "  " + $line + "`r`n"
                     }
-            }
+                }
             }
 
             if ([string]::IsNullOrWhitespace($content) -eq $true)
@@ -143,3 +147,66 @@ jobs:
         }
       env:
         GH_TOKEN: ${{ github.token }}
+
+    - name: Create GitHub draft Pull Request to update stable build version in props
+      if: github.ref_type == 'tag' && startsWith(github.ref_name, 'core-') && !contains(github.ref_name, '-alpha') && !contains(github.ref_name, '-beta') && !contains(github.ref_name, '-rc')
+      shell: pwsh
+      run: |
+        git config user.name "github-actions[bot]"
+        git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+        git switch --create release/post-stable-${{ github.ref_name }}-update 2>&1 | % ToString
+        if ($LASTEXITCODE -gt 0)
+        {
+            Write-Error 'git switch failure'
+            Return
+        }
+
+        $match = [regex]::Match('${{ github.ref_name }}', '.*?-(.*)')
+        $packageVersion = $match.Groups[1].Value
+
+        (Get-Content  Directory.Packages.props) `
+            -replace '<OTelLatestStableVer>.*<\/OTelLatestStableVer>', "<OTelLatestStableVer>$packageVersion</OTelLatestStableVer>" |
+          Set-Content Directory.Packages.props
+
+        git add Directory.Packages.props 2>&1 | % ToString
+        if ($LASTEXITCODE -gt 0)
+        {
+            Write-Error 'git add failure'
+            Return
+        }
+
+        git commit -m "Update OTelLatestStableVer in Directory.Packages.props to $packageVersion." 2>&1 | % ToString
+        if ($LASTEXITCODE -gt 0)
+        {
+            Write-Error 'git commit failure'
+            Return
+        }
+
+        git push -u origin release/post-stable-${{ github.ref_name }}-update 2>&1 | % ToString
+        if ($LASTEXITCODE -gt 0)
+        {
+            Write-Error 'git push failure'
+            Return
+        }
+
+        $body =
+        @"
+        Note: This PR was opened automatically by the [package workflow](https://github.com/${{ github.repository }}/actions/workflows/publish-packages-1.0.yml).
+
+        Merge once packages are available on NuGet and the build passes.
+
+        ## Changes
+
+        * Sets `OTelLatestStableVer` in `Directory.Packages.props` to `$packageVersion`.
+        "@
+
+        gh pr create `
+          --title "[repo] Core stable release $packageVersion updates" `
+          --body $body `
+          --base main `
+          --head release/post-stable-${{ github.ref_name }}-update `
+          --label infra `
+          --draft
+      env:
+        GH_TOKEN: ${{ github.token }}

Directory.Packages.props

@@ -86,6 +86,7 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="[17.8.0,18.0.0)" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="[1.1.1,2.0)" />
     <PackageVersion Include="MinVer" Version="[5.0.0,6.0)" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="[1.8.0-beta.1,2.0)" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="[1.8.1,2.0)" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="[1.5.1,2.0)" />
     <PackageVersion Include="RabbitMQ.Client" Version="[6.6.0,7.0)" />

OpenTelemetry.sln

@@ -121,16 +121,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D2E73927-5
 		test\Directory.Packages.props = test\Directory.Packages.props
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.Grpc.Tests", "test\OpenTelemetry.Instrumentation.Grpc.Tests\OpenTelemetry.Instrumentation.Grpc.Tests.csproj", "{305E9DFD-E73B-4A28-8769-795C25551020}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.Console", "examples\Console\Examples.Console.csproj", "{FF3E6E08-E8E4-4523-B526-847CD989279F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Examples.AspNetCore", "examples\AspNetCore\Examples.AspNetCore.csproj", "{0935622B-9377-4056-8343-AE6ECDC274CF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmarks", "test\Benchmarks\Benchmarks.csproj", "{DE9130A4-F30A-49D7-8834-41DE3021218B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Instrumentation.GrpcNetClient", "src\OpenTelemetry.Instrumentation.GrpcNetClient\OpenTelemetry.Instrumentation.GrpcNetClient.csproj", "{0246BFC4-8AAF-45E1-A127-DB43D6E345BB}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{7C87CAF9-79D7-4C26-9FFB-F3F1FB6911F1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{2C7DD1DA-C229-4D9E-9AF0-BCD5CD3E4948}"
@@ -411,10 +407,6 @@ Global
 		{7C4026CA-6434-4762-8B77-D657EAEE1325}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7C4026CA-6434-4762-8B77-D657EAEE1325}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7C4026CA-6434-4762-8B77-D657EAEE1325}.Release|Any CPU.Build.0 = Release|Any CPU
-		{305E9DFD-E73B-4A28-8769-795C25551020}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{305E9DFD-E73B-4A28-8769-795C25551020}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{305E9DFD-E73B-4A28-8769-795C25551020}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{305E9DFD-E73B-4A28-8769-795C25551020}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FF3E6E08-E8E4-4523-B526-847CD989279F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FF3E6E08-E8E4-4523-B526-847CD989279F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FF3E6E08-E8E4-4523-B526-847CD989279F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -427,10 +419,6 @@ Global
 		{DE9130A4-F30A-49D7-8834-41DE3021218B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DE9130A4-F30A-49D7-8834-41DE3021218B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DE9130A4-F30A-49D7-8834-41DE3021218B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0246BFC4-8AAF-45E1-A127-DB43D6E345BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0246BFC4-8AAF-45E1-A127-DB43D6E345BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0246BFC4-8AAF-45E1-A127-DB43D6E345BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0246BFC4-8AAF-45E1-A127-DB43D6E345BB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{07336602-860B-4975-95DD-405D19C00901}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{07336602-860B-4975-95DD-405D19C00901}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{07336602-860B-4975-95DD-405D19C00901}.Release|Any CPU.ActiveCfg = Release|Any CPU

README.md

@@ -49,8 +49,6 @@ Here are the [instrumentation
 libraries](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/glossary.md#instrumentation-library):
 
 * [ASP.NET Core](./src/OpenTelemetry.Instrumentation.AspNetCore/README.md)
-* gRPC client:
-  [Grpc.Net.Client](./src/OpenTelemetry.Instrumentation.GrpcNetClient/README.md)
 
 Here are the [exporter
 libraries](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/glossary.md#exporter-library):