Merge branch 'main' into migrate_timeout_config

Author: jkoronaAtCisco

.chloggen/config.yaml

@@ -32,6 +32,7 @@ components:
     - pkg/config/confignet
     - pkg/config/configopaque
     - pkg/config/configretry
+    - pkg/config/configstorage
     - pkg/config/configtelemetry
     - pkg/config/configtls
     - pkg/confighttp

.chloggen/documentation-fix-extra-line.yaml

@@ -7,20 +7,24 @@ change_type: enhancement
 component: cmd/mdatagen
 
 # A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Generate named Go types for primitive exported config schemas.
+note: Add first-class extended type aliases (int64, duration, opaque_string, id, opaque_map, etc.) to config schemas in metadata.yaml
 
 # One or more tracking issues or pull requests related to the change
-issues: [15487]
+issues: [15513]
 
 # (Optional) One or more lines of additional information to render under the primary note.
 # These lines will be padded with 2 spaces and then inserted directly into the document.
 # Use pipe (|) for multiline entries.
 subtext: |
-  Primitive exported configs for string, integer, number, and boolean schemas now produce distinct exported types while default values and validation remain on referencing fields.
+  Authors can now write `type: int64`, `type: duration`, `type: opaque_string`, `type: id`, or
+  `type: opaque_map` directly as a property type in the `config:` section of `metadata.yaml`.
+  Each alias expands to the correct JSON Schema representation and Go type automatically.
+  Existing uses of standard JSON Schema types, `format:`, and `x-customType:` remain supported
+  without migration.
 
 # Optional: The change log or logs in which this entry should be included.
 # e.g. '[user]' or '[user, api]'
 # Include 'user' if the change is relevant to end users.
 # Include 'api' if there is a change to a library API.
 # Default: '[user]'
-change_logs: [api]
+change_logs: [user, api]

.chloggen/fix-15437-configretry-validate-when-disabled.yaml

@@ -43,6 +43,7 @@ config/confignet/                                      @open-telemetry/collector
 config/configopaque/                                   @open-telemetry/collector-approvers
 config/configoptional/                                 @open-telemetry/collector-approvers
 config/configretry/                                    @open-telemetry/collector-approvers
+config/configstorage/                                  @open-telemetry/collector-approvers
 config/configtelemetry/                                @open-telemetry/collector-approvers
 config/configtls/                                      @open-telemetry/collector-approvers
 confmap/                                               @open-telemetry/collector-approvers @mx-psi @evan-bradley

.chloggen/main.yaml

@@ -33,14 +33,14 @@ jobs:
           persist-credentials: false
 
       - name: Setup Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
         with:
           go-version: oldstable
           cache: false
 
       - name: Cache Go
         id: go-cache
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: |
             ~/go/bin
@@ -56,17 +56,15 @@ jobs:
       # Compare apidiff states of Main with PR
       - name: Compare-States
         env:
-          CI: true
-          COMPARE_OPTS: -d "../${{ github.base_ref }}/internal/data/apidiff"
+          APIDIFF_DATA_DIR: "../${{ github.base_ref }}/internal/data/apidiff"
         run: |
           cd $HEAD_REF
           make apidiff-compare
 
       # Fail GitHub Action if there are incompatible changes
       - name: Check-States
         env:
-          CI: true
-          COMPARE_OPTS: -d "../${{ github.base_ref }}/internal/data/apidiff" -c
+          APIDIFF_DATA_DIR: "../${{ github.base_ref }}/internal/data/apidiff"
         run: |
           cd $HEAD_REF
-          make apidiff-compare
+          make apidiff-check

.chloggen/simple_type_aliases.yaml .chloggen/mdatagen_extended_types.yaml.chloggen/simple_type_aliases.yaml renamed to .chloggen/mdatagen_extended_types.yaml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
         id: otelbot-token
         with:
-          app-id: ${{ vars.OTELBOT_APP_ID }}
+          client-id: ${{ vars.OTELBOT_CLIENT_ID }}
           private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
       - name: Run approve-workflows.sh
         run: ./.github/workflows/scripts/approve-workflows.sh

.chloggen/ml-status-reporting.yaml

@@ -31,14 +31,14 @@ jobs:
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
-      - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+      - uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
         with:
           go-version: oldstable
           cache: false
       - name: Cache Go
         id: go-cache
         timeout-minutes: 5
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: |
             ~/go/bin