Rebase main with upstream

.editorconfig

@@ -13,6 +13,12 @@ trim_trailing_whitespace = true
 [*.{cs,cshtml,htm,html,md,py,sln,xml}]
 indent_size = 4
 
+###############################
+# Copyright header            #
+###############################
+[*.cs]
+file_header_template = Copyright The OpenTelemetry Authors\nSPDX-License-Identifier: Apache-2.0
+
 ###############################
 # .NET Coding Conventions     #
 ###############################
@@ -34,7 +40,7 @@ csharp_indent_switch_labels = true
 csharp_indent_labels = flush_left
 
 # Modifier preferences
-csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
+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
 
 # this. preferences
@@ -106,6 +112,7 @@ csharp_style_prefer_index_operator = false:none
 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
 
 # Space preferences
 csharp_space_after_cast = false

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,7 +7,7 @@ Please provide a brief description of the changes here.
 
 ## Merge requirement checklist
 
-* [ ] [CONTRIBUTING](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/CONTRIBUTING.md) guidelines followed (nullable enabled, static analysis, etc.)
+* [ ] [CONTRIBUTING](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/CONTRIBUTING.md) guidelines followed (license requirements, nullable enabled, static analysis, etc.)
 * [ ] Unit tests added/updated
 * [ ] Appropriate `CHANGELOG.md` files updated for non-trivial changes
 * [ ] Changes in public API reviewed (if applicable)

.github/codecov.yml

@@ -23,7 +23,32 @@ comment:
   require_changes: no
 
 ignore:
-  - "docs/**/*"
-  - "examples/**/*"
-  - "test/**/*"
   - "**.md"
+  - ".github"
+  - ".vscode"
+  - "build"
+  - "docs"
+  - "examples"
+  - "src/Shared"
+  - "test"
+
+flags:
+  unittests-Solution-Stable:
+    carryforward: true
+    paths:
+      - src
+
+  unittests-Solution-Experimental:
+    carryforward: true
+    paths:
+      - src
+
+  unittests-Instrumentation-Stable:
+    carryforward: true
+    paths:
+      - src
+
+  unittests-Instrumentation-Experimental:
+    carryforward: true
+    paths:
+      - src

.github/workflows/Component.BuildTest.yml

@@ -0,0 +1,82 @@
+# Called by ci.yml to build & test project files
+# See: https://docs.github.com/en/actions/using-workflows/reusing-workflows#creating-a-reusable-workflow
+name: Build Component
+
+on:
+  workflow_call:
+    inputs:
+      project-name:
+        required: true
+        type: string
+      project-build-commands:
+        default: ''
+        required: false
+        type: string
+      code-cov-name:
+        required: true
+        type: string
+      code-cov-prefix:
+        default: 'unittests'
+        required: false
+        type: string
+      os-list:
+        default: '[ "windows-latest", "ubuntu-latest" ]'
+        required: false
+        type: string
+      tfm-list:
+        default: '[ "net462", "net6.0", "net7.0", "net8.0" ]'
+        required: false
+        type: string
+
+jobs:
+  build-test:
+
+    strategy:
+      fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
+      matrix:
+        os: ${{ fromJSON(inputs.os-list) }}
+        version: ${{ fromJSON(inputs.tfm-list) }}
+        exclude:
+        - os: ubuntu-latest
+          version: net462
+
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        # Note: By default GitHub only fetches 1 commit. MinVer needs to find
+        # the version tag which is typically NOT on the first commit so we
+        # retrieve them all.
+        fetch-depth: 0
+
+    - name: Setup dotnet
+      uses: actions/setup-dotnet@v4
+
+    - name: dotnet restore ${{ inputs.project-name }}
+      run: dotnet restore ${{ inputs.project-name }} ${{ inputs.project-build-commands }}
+
+    - name: dotnet build ${{ inputs.project-name }}
+      run: dotnet build ${{ inputs.project-name }} --configuration Release --no-restore ${{ inputs.project-build-commands }}
+
+    - name: dotnet test ${{ inputs.project-name }}
+      run: dotnet test ${{ inputs.project-name }} --collect:"Code Coverage" --results-directory:TestResults --framework ${{ matrix.version }} --configuration Release --no-restore --no-build --logger:"console;verbosity=detailed" -- RunConfiguration.DisableAppDomain=true
+
+    - name: Install coverage tool
+      run: dotnet tool install -g dotnet-coverage
+
+    - name: Merging test results
+      run: dotnet-coverage merge -r -f cobertura -o ./TestResults/Cobertura.xml ./TestResults/*.coverage
+
+    - name: Upload code coverage ${{ inputs.code-cov-prefix }}-${{ inputs.code-cov-name }}
+      uses: codecov/codecov-action@v4
+      continue-on-error: true # Note: Don't fail for upload failures
+      env:
+        OS: ${{ matrix.os }}
+        TFM: ${{ matrix.version }}
+        token: ${{ secrets.CODECOV_TOKEN }}
+      with:
+        file: TestResults/Cobertura.xml
+        env_vars: OS,TFM
+        flags: ${{ inputs.code-cov-prefix }}-${{ inputs.code-cov-name }}
+        name: Code Coverage for ${{ inputs.code-cov-prefix }}-${{ inputs.code-cov-name }} on [${{ matrix.os }}.${{ matrix.version }}]
+        codecov_yml_path: .github/codecov.yml