Merge branch 'main' into codeboten/rm-semconv

Author: codeboten

.chloggen/add-resource-scope.yaml

@@ -4,13 +4,13 @@
 change_type: enhancement
 
 # The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
-component: confmap
+component: configoptional
 
 # A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Support running Unmarshal hooks on nil values.
+note: "Make unmarshaling into `None[T]` work the same as unmarshaling into `(*T)(nil)`."
 
 # One or more tracking issues or pull requests related to the change
-issues: [12981]
+issues: [13168]
 
 # (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.

.chloggen/codeboten_mark-semconv-deprecated.yaml

@@ -4,13 +4,13 @@
 change_type: breaking
 
 # The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
-component: otlpreceiver
+component: configgrpc,confighttp
 
 # A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Use wrapper type for URL paths
+note: Unify return type of `NewDefault*Config` functions to return a struct instead of a pointer.
 
 # One or more tracking issues or pull requests related to the change
-issues: [13046]
+issues: [13169]
 
 # (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.

.chloggen/context-in-sinks.yaml

@@ -0,0 +1,39 @@
+name: Automation - Release Branch
+
+on:
+  workflow_dispatch:
+    inputs:
+      release-series:
+        description: 'Release series (e.g., v0.85.x).'
+        required: true
+      prepare-release-commit-hash:
+        description: 'Commit hash for "Prepare release" commit (e.g., a1b2c3d4)'
+        required: true
+
+jobs:
+  release-branch:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          fetch-depth: 0
+
+      - name: Setup Go
+        uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
+        with:
+          go-version: 1.23.9
+
+      - name: Setup Git config
+        run: |
+          git config --global user.name "opentelemetrybot"
+          git config --global user.email "[email protected]"
+
+      - name: Run release-branch.sh
+        run: |
+          ./.github/workflows/scripts/release-branch.sh "${{ inputs.release-series }}" "${{ inputs.prepare-release-commit-hash }}"
+        env:
+          UPSTREAM_REMOTE_NAME: "origin"
+          MAIN_BRANCH_NAME: "main"

.chloggen/mdatagen-events-doc.yaml

@@ -0,0 +1,83 @@
+#!/bin/bash -ex
+#
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+# --- Configuration ---
+RELEASE_SERIES="$1" # e.g., v0.85.x
+PREPARE_RELEASE_COMMIT_HASH="$2" # Optional: Specific commit hash for "Prepare release"
+UPSTREAM_REMOTE_NAME=${UPSTREAM_REMOTE_NAME:-"upstream"} # Your upstream remote name for open-telemetry/opentelemetry-collector
+MAIN_BRANCH_NAME=${MAIN_BRANCH_NAME:-"main"}
+LOCAL_MAIN_BRANCH_NAME=${LOCAL_MAIN_BRANCH_NAME:-"${MAIN_BRANCH_NAME}"}
+# These variables are only used if git user.name and git user.email are not configured
+GIT_CONFIG_USER_NAME=${GIT_CONFIG_USER_NAME:-"opentelemetrybot"}
+GIT_CONFIG_USER_EMAIL=${GIT_CONFIG_USER_EMAIL:-"[email protected]"}
+
+# --- Validate Input ---
+if [[ -z "$RELEASE_SERIES" || -z "$PREPARE_RELEASE_COMMIT_HASH" ]]; then
+  echo "Error: Both release series and prepare release commit hash must be provided."
+  echo "Usage: $0 <release-series> <prepare-release-commit-hash>"
+  echo "Example: $0 v0.85.x a1b2c3d4"
+  exit 1
+fi
+
+RELEASE_BRANCH_NAME="release/${RELEASE_SERIES}"
+
+echo "Automating Release Steps for: ${RELEASE_SERIES}"
+echo "Release Branch Name: ${RELEASE_BRANCH_NAME}"
+echo "'Prepare release' commit hash: ${PREPARE_RELEASE_COMMIT_HASH}"
+echo "Upstream Remote: ${UPSTREAM_REMOTE_NAME}"
+echo "--------------------------------------------------"
+
+# --- Step 4: Checkout main, Pull, Create/Update and Push Release Branch ---
+echo ""
+echo "=== Step 4: Preparing and Pushing Release Branch ==="
+
+# 1. Checkout main
+git checkout "${LOCAL_MAIN_BRANCH_NAME}"
+
+# 2. Fetch from upstream (updates remote-tracking branches including potential existing release branch)
+git fetch "${UPSTREAM_REMOTE_NAME}"
+
+# 3. Rebase local main with upstream/main
+git rebase "${UPSTREAM_REMOTE_NAME}/${MAIN_BRANCH_NAME}"
+echo "'${LOCAL_MAIN_BRANCH_NAME}' branch is now up-to-date."
+
+# Verify the commit exists (it should be reachable from main after fetch)
+if ! git cat-file -e "${PREPARE_RELEASE_COMMIT_HASH}^{commit}" 2>/dev/null; then
+  echo "Error: Provided 'Prepare release' commit hash '${PREPARE_RELEASE_COMMIT_HASH}' not found."
+  exit 1
+fi
+# 4. Handle Release Branch: Check existence, create or switch, and merge/base
+BRANCH_EXISTS_LOCALLY=$(git branch --list "${RELEASE_BRANCH_NAME}")
+# Check remote by looking for the remote tracking branch ref after fetch
+if git rev-parse --verify --quiet "${UPSTREAM_REMOTE_NAME}/${RELEASE_BRANCH_NAME}" > /dev/null 2>&1; then
+  BRANCH_EXISTS_REMOTELY=true
+fi
+
+if [[ -n "$BRANCH_EXISTS_LOCALLY" ]]; then
+  echo "Release branch '${RELEASE_BRANCH_NAME}' found locally."
+  echo "Please delete local release branch using 'git branch -D ${RELEASE_BRANCH_NAME}' and run the script again."
+  exit 1
+elif [[ -n "$BRANCH_EXISTS_REMOTELY" ]]; then
+  echo "Release branch '${RELEASE_BRANCH_NAME}' found on remote '${UPSTREAM_REMOTE_NAME}'."
+  echo "Nothing to do, exiting."
+  exit 0
+else
+  echo "Release branch '${RELEASE_BRANCH_NAME}' not found locally or on remote."
+  git switch -c "${RELEASE_BRANCH_NAME}" "${PREPARE_RELEASE_COMMIT_HASH}"
+fi
+
+echo "Current branch is now '${RELEASE_BRANCH_NAME}'."
+git --no-pager log -1 --pretty=oneline # Show the commit at the tip of the release branch
+
+# 5. Push the release branch to upstream
+git push -u "${UPSTREAM_REMOTE_NAME}" "${RELEASE_BRANCH_NAME}"
+echo "Branch '${RELEASE_BRANCH_NAME}' pushed (or updated) on '${UPSTREAM_REMOTE_NAME}'."
+echo "Step 4 completed."
+echo "--------------------------------------------------"
+
+echo ""
+echo "Automation for your Step 4 (push release/<release-series> branch) complete."
+echo "Next, you would typically proceed to your Step 5 on your local machine."
+echo "You will need to check out the release branch locally and push beta/stable tags."