Merge branch 'main' into signing_with_cosign

Author: ThomsonTan

.editorconfig

@@ -41,7 +41,7 @@ csharp_indent_labels = flush_left
 
 # Modifier preferences
 csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async:suggestion
-dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
 
 # this. preferences
 dotnet_style_qualification_for_field = true:suggestion
@@ -53,8 +53,8 @@ dotnet_style_qualification_for_event = true:suggestion
 csharp_style_var_for_built_in_types = true:silent
 csharp_style_var_when_type_is_apparent = true:silent
 csharp_style_var_elsewhere = true:silent
-dotnet_style_predefined_type_for_locals_parameters_members = true:silent
-dotnet_style_predefined_type_for_member_access = true:silent
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = true:suggestion
 
 # name all constant fields using PascalCase
 dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
@@ -75,28 +75,31 @@ dotnet_style_readonly_field = true:suggestion
 csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
 dotnet_style_prefer_simplified_interpolation = true:suggestion
 dotnet_style_object_initializer = true:suggestion
+csharp_style_prefer_primary_constructors = false:none
 
 # Expression-level preferences
 dotnet_style_object_initializer = true:suggestion
 dotnet_style_collection_initializer = true:suggestion
 dotnet_style_explicit_tuple_names = true:suggestion
 dotnet_style_coalesce_expression = true:suggestion
 dotnet_style_null_propagation = true:suggestion
-dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
 dotnet_style_prefer_inferred_tuple_names = true:suggestion
 dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
-dotnet_style_prefer_auto_properties = true:silent
-dotnet_style_prefer_conditional_expression_over_assignment = true:silent
-dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_prefer_auto_properties = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = true:suggestion
+dotnet_style_prefer_conditional_expression_over_return = true:suggestion
 csharp_prefer_simple_default_expression = true:suggestion
+csharp_style_unused_value_expression_statement_preference = discard_variable:none
 
 # Expression-bodied members
-csharp_style_expression_bodied_methods = false:silent
-csharp_style_expression_bodied_constructors = false:silent
-csharp_style_expression_bodied_operators = false:silent
-csharp_style_expression_bodied_properties = true:silent
-csharp_style_expression_bodied_indexers = true:silent
-csharp_style_expression_bodied_accessors = true:silent
+csharp_style_expression_bodied_methods = true:suggestion
+dotnet_diagnostic.IDE0022.severity = suggestion # dotnet format doesn't respect the suggestion in the line above
+csharp_style_expression_bodied_constructors = false:warning
+csharp_style_expression_bodied_operators = true:suggestion
+csharp_style_expression_bodied_properties = true:suggestion
+csharp_style_expression_bodied_indexers = true:suggestion
+csharp_style_expression_bodied_accessors = true:suggestion
 
 # Pattern matching
 csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
@@ -113,6 +116,7 @@ csharp_style_prefer_range_operator = false:none
 csharp_style_pattern_local_over_anonymous_function = true:suggestion
 csharp_style_deconstructed_variable_declaration = true:suggestion
 csharp_style_namespace_declarations = file_scoped:warning
+dotnet_style_namespace_match_folder = false:none
 
 # Space preferences
 csharp_space_after_cast = false
@@ -128,10 +132,10 @@ csharp_space_between_method_declaration_parameter_list_parentheses = false
 csharp_space_between_parentheses = false
 
 # Parentheses preferences
-dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
-dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
-dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
-dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:suggestion
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:suggestion
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:suggestion
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:suggestion
 
 # Code analyzers
 # CA1031: Do not catch general exception types

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -48,7 +48,7 @@ body:
   - type: input
     attributes:
       label: Runtime Version
-      description: What .NET runtime version did you use? (e.g. `net462`, `net48`, `netcoreapp3.1`, `net6.0` etc. You can find this information from the `*.csproj` file)
+      description: What .NET runtime version did you use? (e.g. `net462`, `net48`, `net8.0`, etc. You can find this information from the `*.csproj` file)
     validations:
       required: true
 

.github/workflows/Component.BuildTest.yml

@@ -24,7 +24,7 @@ on:
         required: false
         type: string
       tfm-list:
-        default: '[ "net462", "net6.0", "net8.0" ]'
+        default: '[ "net462", "net8.0", "net9.0" ]'
         required: false
         type: string
 
@@ -42,7 +42,7 @@ jobs:
         - os: otel-linux-arm64
           version: net462
         - os: otel-linux-arm64
-          version: net6.0
+          version: net8.0
 
     runs-on: ${{ matrix.os }}
     steps:

.github/workflows/ci.yml

@@ -111,7 +111,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [ net6.0, net8.0 ]
+        version: [ net8.0, net9.0 ]
     steps:
       - uses: actions/checkout@v4
       - name: Run OTLP Exporter docker compose
@@ -129,7 +129,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [ net6.0, net8.0 ]
+        version: [ net8.0, net9.0 ]
     steps:
       - uses: actions/checkout@v4
       - name: Run W3C Trace Context docker compose

.github/workflows/docfx.yml

@@ -13,6 +13,9 @@ jobs:
     - name: check out code
       uses: actions/checkout@v4
 
+    - name: Setup dotnet
+      uses: actions/setup-dotnet@v4
+
     - name: install docfx
       run: dotnet tool install -g docfx
 

.github/workflows/stale.yml

@@ -18,7 +18,7 @@ jobs:
           close-pr-message: 'Closed as inactive. Feel free to reopen if this PR is still being worked on.'
           operations-per-run: 400
           days-before-pr-stale: 7
-          days-before-issue-stale: 900
+          days-before-issue-stale: 600
           days-before-pr-close: 7
           days-before-issue-close: 7
           exempt-all-issue-milestones: true

.github/workflows/verifyaotcompat.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
       matrix:
         os: [ ubuntu-latest, windows-latest ]
-        version: [ net8.0 ]
+        version: [ net8.0, net9.0 ]
 
     runs-on: ${{ matrix.os }}
     steps:

CONTRIBUTING.md

@@ -10,16 +10,16 @@ for a summary description of past meetings. To request edit access, join the
 meeting or get in touch on
 [Slack](https://cloud-native.slack.com/archives/C01N3BC2W7Q).
 
-Even though, anybody can contribute, there are benefits of being a member of our
-community. See to the [community membership
+Anyone may contribute but there are benefits of being a member of our community.
+See the [community membership
 document](https://github.com/open-telemetry/community/blob/main/community-membership.md)
 on how to become a
 [**Member**](https://github.com/open-telemetry/community/blob/main/community-membership.md#member),
 [**Approver**](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
 and
 [**Maintainer**](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).
 
-## Find a Buddy and Get Started Quickly
+## Find a buddy and get started quickly
 
 If you are looking for someone to help you find a starting point and be a
 resource for your first contribution, join our Slack channel and find a buddy!
@@ -34,17 +34,24 @@ resource for your first contribution, join our Slack channel and find a buddy!
 
 Your OpenTelemetry buddy is your resource to talk to directly on all aspects of
 contributing to OpenTelemetry: providing context, reviewing PRs, and helping
-those get merged. Buddies will not be available 24/7, but is committed to
-responding during their normal contribution hours.
+those get merged. Buddies will not be available 24/7, but are committed to
+responding during their normal working hours.
 
 ## Development Environment
 
-You can contribute to this project from a Windows, macOS or Linux machine.
+You can contribute to this project from a Windows, macOS, or Linux machine.
 
 On all platforms, the minimum requirements are:
 
-* Git client and command line tools.
-* .NET 8.0
+* Git client and command line tools
+
+* [.NET SDK (latest stable version)](https://dotnet.microsoft.com/download)
+
+  > [!NOTE]
+  > At times a pre-release version of the .NET SDK may be required to build code
+    in this repository. Check
+    [global.json](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/global.json)
+    to verify the current required version.
 
 ### Linux or MacOS
 
@@ -59,7 +66,7 @@ of Windows.
 * Visual Studio 2022+ or Visual Studio Code
 * .NET Framework 4.6.2+
 
-### Public API Validation
+## Public API validation
 
 It is critical to **NOT** make breaking changes to public APIs which have been
 released in stable builds. We also strive to keep a minimal public API surface.
@@ -91,9 +98,9 @@ to validate public APIs.
   [Common.prod.props](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/build/Common.prod.props)
   (please do not check in this change).
 
-#### Working with Microsoft.CodeAnalysis.PublicApiAnalyzers
+### Working with Microsoft.CodeAnalysis.PublicApiAnalyzers
 
-##### Update public API files when writing code
+#### Update public API files when writing code
 
 [IntelliSense](https://docs.microsoft.com/visualstudio/ide/using-intellisense)
 will [suggest
@@ -116,7 +123,7 @@ do this by:
   while performing stable releases. If you need help reach out to an approver or
   maintainer on Slack or open a draft PR.
 
-##### Enable public API validation in new projects
+#### Enable public API validation in new projects
 
 1. If you are **NOT** using experimental APIs:
    * If your API is the same across all target frameworks:
@@ -144,12 +151,12 @@ do this by:
 
 ## Pull Requests
 
-### How to Send Pull Requests
+### How to create pull requests
 
 Everyone is welcome to contribute code to `opentelemetry-dotnet` via GitHub pull
 requests (PRs).
 
-To create a new PR, fork the project in GitHub and clone the upstream repo:
+To create a new PR, fork the project on GitHub and clone the upstream repo:
 
 ```sh
 git clone https://github.com/open-telemetry/opentelemetry-dotnet.git
@@ -180,7 +187,7 @@ If you made changes to the Markdown documents (`*.md` files), install the latest
 markdownlint .
 ```
 
-Check out a new branch, make modifications and push the branch to your fork:
+Check out a new branch, make modifications, and push the branch to your fork:
 
 ```sh
 $ git checkout -b feature
@@ -191,7 +198,7 @@ $ git push fork feature
 
 Open a pull request against the main `opentelemetry-dotnet` repo.
 
-### How to Receive Comments
+#### Tips and best practices for pull requests
 
 * If the PR is not ready for review, please mark it as
   [`draft`](https://github.blog/2019-02-14-introducing-draft-pull-requests/).
@@ -204,26 +211,29 @@ Open a pull request against the main `opentelemetry-dotnet` repo.
 * Include benchmarks (before/after) in the summary, for contributions that are
   performance enhancements.
 
-### How to Get PRs Merged
+### How to get pull requests merged
 
 A PR is considered to be **ready to merge** when:
 
 * It has received approval from
   [Approvers](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).
   /
   [Maintainers](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).
-* Major feedbacks are resolved.
+* Major feedback/comments are resolved.
 * It has been open for review for at least one working day. This gives people
   reasonable time to review.
-* Trivial change (typo, cosmetic, doc, etc.) doesn't have to wait for one day.
-* Urgent fix can take exception as long as it has been actively communicated.
+  * Trivial change (typo, cosmetic, doc, etc.) doesn't have to wait for one day.
+  * Urgent fix can take exception as long as it has been actively communicated.
 
-Any Maintainer can merge the PR once it is **ready to merge**. Note, that some
-PRs may not be merged immediately if the repo is in the process of a release and
-the maintainers decided to defer the PR to the next release train.
+Any maintainer can merge PRs once they are **ready to merge** however
+maintainers might decide to wait on merging changes until there are more
+approvals and/or dicussion, or based on other factors such as release timing and
+risk to users. For example if a stable release is planned and a new change is
+introduced adding public API(s) or behavioral changes it might be held until the
+next alpha/beta release.
 
-If a PR has been stuck (e.g. there are lots of debates and people couldn't agree
-on each other), the owner should try to get people aligned by:
+If a PR has become stuck (e.g. there is a lot of debate and people couldn't
+agree on the direction), the owner should try to get people aligned by:
 
 * Consolidating the perspectives and putting a summary in the PR. It is
   recommended to add a link into the PR description, which points to a comment
@@ -238,15 +248,15 @@ on each other), the owner should try to get people aligned by:
   the owner should bring it to the OpenTelemetry .NET SIG
   [meeting](README.md#contributing).
 
-## Design Choices
+## Design choices
 
 As with other OpenTelemetry clients, opentelemetry-dotnet follows the
 [opentelemetry-specification](https://github.com/open-telemetry/opentelemetry-specification).
 
 It's especially valuable to read through the [library
 guidelines](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/library-guidelines.md).
 
-### Focus on Capabilities, Not Structure Compliance
+### Focus on capabilities not structural compliance
 
 OpenTelemetry is an evolving specification, one where the desires and use cases
 are clear, but the method to satisfy those uses cases are not.
@@ -260,10 +270,10 @@ than conform to specific API names or argument patterns in the spec.
 For a deeper discussion, see [this spec
 issue](https://github.com/open-telemetry/opentelemetry-specification/issues/165).
 
-## Style Guide
+## Style guide
 
 This project includes a [`.editorconfig`](./.editorconfig) file which is
-supported by all the IDEs/editor mentioned above. It works with the IDE/editor
+supported by all the IDEs/editors mentioned above. It works with the IDE/editor
 only and does not affect the actual build of the project.
 
 This repository also includes StyleCop ruleset files under the `./build` folder.