Merge branch 'open-telemetry:main' into add-user-agent-customization

Author: meijeran

.editorconfig

@@ -174,3 +174,13 @@ indent_size = 2
 
 [*.cshtml.cs]
 dotnet_diagnostic.SA1649.severity = none
+
+# Verify settings
+[*.{received,verified}.{json,txt,xml}]
+charset = utf-8-bom
+end_of_line = lf
+indent_size = unset
+indent_style = unset
+insert_final_newline = false
+tab_width = unset
+trim_trailing_whitespace = false

.gitattributes

@@ -1 +1,7 @@
 *.sh eol=lf
+
+# Verify settings
+*.verified.txt text eol=lf working-tree-encoding=UTF-8
+*.verified.xml text eol=lf working-tree-encoding=UTF-8
+*.verified.json text eol=lf working-tree-encoding=UTF-8
+*.verified.bin binary

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -90,5 +90,5 @@ body:
       label: Tip
       description: This element is static, used to render a helpful sub-heading for end-users and community members to help prioritize issues. Please leave as is.
       options:
-        - <sub>[React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with :+1: to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
+        - "<sub>[React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with :+1: to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>"
       default: 0

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -59,5 +59,5 @@ body:
       label: Tip
       description: This element is static, used to render a helpful sub-heading for end-users and community members to help prioritize issues. Please leave as is.
       options:
-        - <sub>[React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with :+1: to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
+        - "<sub>[React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with :+1: to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>"
       default: 0

.github/dependabot.yml

@@ -1,75 +1,10 @@
+# This file is retained solely for automated tooling to see we do automated
+# dependency updates as not all such scanners recognize the use of Renovate.
 version: 2
 updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "daily"
-    labels:
-      - "infra"
-  - package-ecosystem: "docker"
-    directory: "/examples/MicroserviceExample/WebApi"
-    schedule:
-      interval: "weekly"
-      day: "wednesday"
-    labels:
-      - "infra"
-    ignore:
-      - dependency-name: "*"
-        update-types:
-          - "version-update:semver-major"
-          - "version-update:semver-minor"
-  - package-ecosystem: "docker"
-    directory: "examples/MicroserviceExample/WorkerService"
-    schedule:
-      interval: "weekly"
-      day: "wednesday"
-    labels:
-      - "infra"
-    ignore:
-      - dependency-name: "*"
-        update-types:
-          - "version-update:semver-major"
-          - "version-update:semver-minor"
-  - package-ecosystem: "docker"
-    directory: "test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTest"
-    schedule:
-      interval: "weekly"
-      day: "wednesday"
-    labels:
-      - "infra"
-    ignore:
-      - dependency-name: "*"
-        update-types:
-          - "version-update:semver-major"
-          - "version-update:semver-minor"
-  - package-ecosystem: "docker"
-    directory: "test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests"
-    schedule:
-      interval: "weekly"
-      day: "wednesday"
-    labels:
-      - "infra"
-    ignore:
-      - dependency-name: "*"
-        update-types:
-          - "version-update:semver-major"
-          - "version-update:semver-minor"
-  - package-ecosystem: "dotnet-sdk"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-      day: "wednesday"
-    labels:
-      - "infra"
-    ignore:
-      - dependency-name: "*"
-        update-types:
-          - "version-update:semver-major"
-          - "version-update:semver-minor"
-  - package-ecosystem: "pip"
-    directory: "test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests"
-    schedule:
-      interval: "weekly"
-      day: "wednesday"
+      interval: yearly
     labels:
       - "infra"

.github/renovate.json

@@ -0,0 +1,70 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "additionalBranchPrefix": "{{manager}}/",
+  "automerge": false,
+  "commitBodyTable": true,
+  "commitMessageAction": "Bump",
+  "dependencyDashboard": false,
+  "extends": [
+    "config:best-practices",
+    "customManagers:dockerfileVersions",
+    "customManagers:githubActionsVersions",
+    ":automergeRequireAllStatusChecks",
+    ":disableRateLimiting",
+    ":enableVulnerabilityAlerts",
+    ":gitSignOff",
+    ":ignoreUnstable"
+  ],
+  "ignorePresets": [
+    ":ignoreModulesAndTests"
+  ],
+  "ignorePaths": [
+    "**/node_modules/**",
+    "**/bower_components/**",
+    "**/vendor/**",
+    "**/__tests__/**",
+    "**/__fixtures__/**"
+  ],
+  "labels": ["dependencies", "infra"],
+  "packageRules": [
+    {
+      "matchManagers": ["dockerfile"],
+      "addLabels": ["docker"]
+    },
+    {
+      "matchManagers": ["github-actions"],
+      "addLabels": ["github_actions"]
+    },
+    {
+      "matchManagers": ["nuget"],
+      "addLabels": [".NET"]
+    },
+    {
+      "matchManagers": ["pypi"],
+      "addLabels": ["python"]
+    },
+    {
+      "description": ["Skip pinned NuGet package versions"],
+      "matchManagers": ["nuget"],
+      "matchCurrentValue": "^\\[[^,]+,\\)$",
+      "enabled": false
+    },
+    {
+      "extends": ["monorepo:dotnet"],
+      "description": ["Disable major version updates for .NET"],
+      "matchUpdateTypes": ["major"],
+      "enabled": false
+    },
+    {
+      "matchDepNames": ["xunit"],
+      "description": ["Disable major version updates for xunit"],
+      "matchUpdateTypes": ["major"],
+      "enabled": false
+    }
+  ],
+  "schedule": ["* 8-17 * * 3"],
+  "timezone": "Etc/UTC",
+  "vulnerabilityAlerts": {
+    "addLabels": ["security"]
+  }
+}

.github/workflows/Component.BuildTest.yml

@@ -20,11 +20,11 @@ on:
         required: false
         type: string
       os-list:
-        default: '[ "windows-latest", "ubuntu-22.04", "ubuntu-22.04-arm" ]'
+        default: '[ "windows-latest", "windows-11-arm", "ubuntu-22.04", "ubuntu-22.04-arm" ]'
         required: false
         type: string
       tfm-list:
-        default: '[ "net462", "net8.0", "net9.0" ]'
+        default: '[ "net462", "net8.0", "net9.0", "net10.0" ]'
         required: false
         type: string
 
@@ -45,9 +45,12 @@ jobs:
         - os: ubuntu-22.04-arm
           version: net462
         - os: ubuntu-22.04-arm
-          version: net8.0
+          version: net10.0
+        - os: windows-11-arm
+          version: net10.0
 
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 30
     steps:
     - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       with:
@@ -57,13 +60,14 @@ jobs:
         fetch-depth: 0
 
     - name: Setup previous .NET runtimes
-      uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+      uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
       with:
         dotnet-version: |
           8.0.x
+          9.0.x
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+      uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
 
     - name: dotnet restore ${{ inputs.project-name }}
       run: dotnet restore ${{ inputs.project-name }} ${{ inputs.project-build-commands }}
@@ -92,7 +96,7 @@ jobs:
       run: dotnet-coverage merge -f cobertura -o ./TestResults/Cobertura.xml ./TestResults/**/*.coverage
 
     - name: Upload code coverage ${{ inputs.code-cov-prefix }}-${{ inputs.code-cov-name }}
-      uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+      uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
       continue-on-error: true # Note: Don't fail for upload failures
       env:
         OS: ${{ matrix.os }}

.github/workflows/add-labels.yml

@@ -15,7 +15,7 @@ jobs:
       issues: write
     if: github.event_name == 'issues' && !github.event.issue.pull_request
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: check out code
@@ -38,7 +38,7 @@ jobs:
       pull-requests: write
     if: github.event_name == 'pull_request_target'
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: check out code

.github/workflows/automation.yml

@@ -5,14 +5,16 @@ on:
     outputs:
       enabled:
         value: ${{ jobs.resolve-automation.outputs.enabled == 'true' }}
-      token-secret-name:
-        value: ${{ jobs.resolve-automation.outputs.token-secret-name }}
       username:
         value: ${{ vars.AUTOMATION_USERNAME }}
       email:
         value: ${{ vars.AUTOMATION_EMAIL }}
+      application-name:
+        value: ${{ vars.AUTOMATION_APPLICATION_NAME }}
+      application-username:
+        value: ${{ vars.AUTOMATION_APPLICATION_USERNAME }}
     secrets:
-      OPENTELEMETRYBOT_GITHUB_TOKEN:
+      OTELBOT_DOTNET_PRIVATE_KEY:
         required: false
 
 permissions:
@@ -21,17 +23,15 @@ permissions:
 jobs:
   resolve-automation:
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     outputs:
       enabled: ${{ steps.evaluate.outputs.enabled }}
-      token-secret-name: ${{ steps.evaluate.outputs.token-secret-name }}
 
     env:
-      OPENTELEMETRYBOT_GITHUB_TOKEN_EXISTS: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN != '' }}
+      OTELBOT_DOTNET_PRIVATE_KEY_EXISTS: ${{ secrets.OTELBOT_DOTNET_PRIVATE_KEY != '' }}
 
     steps:
     - id: evaluate
       run: |
-        echo "enabled=${{ env.OPENTELEMETRYBOT_GITHUB_TOKEN_EXISTS == 'true' }}" >> "$GITHUB_OUTPUT"
-        echo "token-secret-name=OPENTELEMETRYBOT_GITHUB_TOKEN" >> "$GITHUB_OUTPUT"
+        echo "enabled=${{ env.OTELBOT_DOTNET_PRIVATE_KEY_EXISTS == 'true' }}" >> "$GITHUB_OUTPUT"

.github/workflows/ci.yml

@@ -8,6 +8,8 @@ on:
     branches: [ 'main*' ]
   pull_request:
     branches: [ 'main*' ]
+  merge_group:
+    types: [ checks_requested ]
 
 permissions:
   contents: read
@@ -16,6 +18,13 @@ jobs:
   lint-misspell-sanitycheck:
     uses: ./.github/workflows/sanitycheck.yml
 
+  code-ql:
+    uses: ./.github/workflows/codeql-analysis-steps.yml
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
   detect-changes:
     runs-on: windows-latest
     outputs:
@@ -110,11 +119,11 @@ jobs:
       || contains(needs.detect-changes.outputs.changes, 'otlp')
       || contains(needs.detect-changes.outputs.changes, 'build')
       || contains(needs.detect-changes.outputs.changes, 'shared')
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
-        version: [ net8.0, net9.0 ]
+        version: [ net8.0, net9.0, net10.0 ]
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Run OTLP Exporter docker compose
@@ -128,11 +137,11 @@ jobs:
       || contains(needs.detect-changes.outputs.changes, 'instrumentation')
       || contains(needs.detect-changes.outputs.changes, 'build')
       || contains(needs.detect-changes.outputs.changes, 'shared')
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
-        version: [ net8.0, net9.0 ]
+        version: [ net8.0, net9.0, net10.0 ]
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Run W3C Trace Context docker compose
@@ -175,6 +184,7 @@ jobs:
   build-test:
     needs: [
       detect-changes,
+      code-ql,
       lint-misspell-sanitycheck,
       lint-md,
       lint-dotnet-format,
@@ -190,7 +200,17 @@ jobs:
       concurrency-tests
       ]
     if: always() && !cancelled()
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-    - run: |
-          if ( ${{ contains(needs.*.result, 'failure') }} == true ); then echo 'build failed'; exit 1; else echo 'build complete'; fi
+    - name: Report CI status
+      shell: bash
+      env:
+        CI_SUCCESS: ${{ !contains(needs.*.result, 'failure') }}
+      run: |
+        if [ "${CI_SUCCESS}" == "true" ]
+        then
+          echo 'Build complete'
+        else
+          echo 'Build failed'
+          exit 1
+        fi