Merge remote-tracking branch 'up/main' into work

Author: WatchTree-19

.agents/skills/merge-ruff-120/SKILL.md

@@ -0,0 +1,88 @@
+---
+name: merge-ruff-120
+description: "Reformat code on a feature branch and merge main cleanly after the Ruff line-length increase from 79 to 120 (merged August 7, 2026, commit 0110bb1d273dbe848312d429326b844da9e86d93, PR #5514). Relevant for branches created before August 2026."
+---
+
+# Merging main and Reformatting Code (Ruff 120 Line Length)
+
+## Overview
+
+In PR #5514 (merged on August 7, 2026, commit `0110bb1d273dbe848312d429326b844da9e86d93`), OpenTelemetry Python updated its Ruff configuration in `pyproject.toml` to increase `line-length` from 79 to 120 characters and reformatted the entire codebase.
+
+Feature branches created prior to August 7, 2026 (before this commit) will encounter extensive merge conflicts if merged directly. This skill instructs an agent on how to detect this situation and perform a clean multi-step merge without formatting conflict markers.
+
+## Detection: When to Use This Skill
+
+An agent can test whether a branch needs this reformatting workflow:
+
+```bash
+# Returns non-zero (exit code 1) if the branch was created BEFORE the Ruff 120 change (August 7, 2026):
+git merge-base --is-ancestor 0110bb1d273dbe848312d429326b844da9e86d93 HEAD
+```
+
+If the commit is **not** an ancestor of `HEAD`, follow the workflow below.
+
+---
+
+## Workflow
+
+Follow these steps on the contributor's feature branch:
+
+### Step 1: Identify upstream remote, ensure workspace is clean & sync dependencies
+
+First, inspect configured remotes to identify which remote points to the upstream `open-telemetry/opentelemetry-python` repository (typically `upstream` or `origin`):
+
+```bash
+git remote -v
+```
+
+> **Note**: In a fork-based workflow, `upstream` typically points to `open-telemetry/opentelemetry-python` and `origin` points to the contributor's fork. In direct clones, `origin` points to `open-telemetry/opentelemetry-python`. In the steps below, replace `<remote>` with the name of the remote pointing to `open-telemetry/opentelemetry-python` (e.g., `upstream` or `origin`).
+
+Fetch latest changes and sync dependencies:
+
+```bash
+uv sync --frozen --all-packages
+git fetch <remote> main
+```
+
+### Step 2: Merge the commit before the line-length change
+
+Merge all changes up to the commit immediately *before* the Ruff 120 reformat:
+
+```bash
+git merge 0110bb1d273dbe848312d429326b844da9e86d93^
+```
+
+Because both sides are still 79-column code, there are zero formatting conflicts. Resolve any real semantic conflicts if present, then commit the merge.
+
+### Step 3: Merge the reformatting commit with `-X ours --no-commit`
+
+Merge the reformat commit, automatically choosing the branch's code on any formatting conflicts and pausing before creating the merge commit:
+
+```bash
+git merge -X ours --no-commit 0110bb1d273dbe848312d429326b844da9e86d93
+```
+
+### Step 4: Format and lint the branch to 120 columns
+
+Ensure `pyproject.toml` has `line-length = 120` (under `[tool.ruff]`). Use file editing tools or Python to avoid macOS vs Linux `sed -i` incompatibilities:
+
+```bash
+python3 -c "import pathlib; p = pathlib.Path('pyproject.toml'); p.write_text(p.read_text().replace('line-length = 79', 'line-length = 120'))"
+uv run ruff format
+uv run ruff check --fix
+```
+
+### Step 5: Finalize the merge commit
+
+```bash
+git commit -am "chore: merge Ruff 120 reformat and format branch"
+```
+
+### Step 6: Catch up with latest `main`
+
+Merge the rest of `main` from the upstream remote:
+
+```bash
+git merge <remote>/main
+```

.changelog/5122.added

@@ -0,0 +1 @@
+`opentelemetry-exporter-prometheus`: add support to configure Resource attributes as metric labels

.changelog/5202.added

@@ -0,0 +1 @@
+infra: add renovate

.changelog/5351.added

@@ -0,0 +1 @@
+`opentelemetry-sdk`: wire the top-level `log_level` field in declarative configuration — when set, maps the OTel `SeverityNumber` value to a Python logging level and applies it to the `opentelemetry` logger so SDK internal diagnostics respect the configured severity.

.changelog/5369.changed

@@ -0,0 +1 @@
+`opentelemetry-exporter-otlp-proto-http`: add a `max_request_size` argument to the OTLP HTTP exporters (traces, logs, metrics); serialized requests larger than the limit are dropped before sending, measured before compression. Defaults to 64 MiB (enabled); set to 0 to disable. Mirrors opentelemetry-go#8157.

.changelog/5374.added

@@ -0,0 +1 @@
+`opentelemetry-exporter-otlp-json-http`: add OTLP JSON HTTP exporter package

.changelog/5389.changed

@@ -0,0 +1 @@
+`opentelemetry-exporter-otlp-proto-http`: refactor to use shared opentelemetry-exporter-otlp-common and opentelemetry-exporter-http-transport packages and switch default HTTP backend to urllib3

.changelog/5408.fixed

@@ -0,0 +1,2 @@
+`opentelemetry-configuration`: declarative config environment variable substitution now replaces an unset variable that has no default with an empty value instead of raising an error, per the configuration spec.
+Resource attributes whose value resolves to null (an unset `${VAR}` with no default) are skipped with a warning instead of being inserted as a null value.

.changelog/5412.added

@@ -0,0 +1 @@
+`opentelemetry-exporter-otlp-json-file`: add OTLP JSON file Docker tests

.changelog/5430.fixed

@@ -0,0 +1 @@
+`opentelemetry-sdk`: fix `View` instrument-name matching so a view configured with an instrument's real (mixed-case) name is applied; matching is now case-insensitive and platform-independent instead of relying on `fnmatch`'s OS-dependent case handling