Merge branch 'main' into manual-autoinstrumentation

Author: xrmx

.github/workflows/fossa.yml

@@ -0,0 +1,20 @@
+name: FOSSA scanning
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+jobs:
+  fossa:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
+        with:
+          api-key: ${{secrets.FOSSA_API_KEY}}
+          team: OpenTelemetry

.github/workflows/package-prepare-patch-release.yml

@@ -9,6 +9,7 @@ on:
         - opentelemetry-resource-detector-azure
         - opentelemetry-sdk-extension-aws
         - opentelemetry-instrumentation-openai-v2
+        - opentelemetry-instrumentation-vertexai
         description: 'Package to be released'
         required: true
 jobs:

.github/workflows/package-prepare-release.yml

@@ -9,6 +9,7 @@ on:
         - opentelemetry-resource-detector-azure
         - opentelemetry-sdk-extension-aws
         - opentelemetry-instrumentation-openai-v2
+        - opentelemetry-instrumentation-vertexai
         description: 'Package to be released'
         required: true
 

.github/workflows/package-release.yml

@@ -9,6 +9,7 @@ on:
         - opentelemetry-resource-detector-azure
         - opentelemetry-sdk-extension-aws
         - opentelemetry-instrumentation-openai-v2
+        - opentelemetry-instrumentation-vertexai
         description: 'Package to be released'
         required: true
 jobs:

.pre-commit-config.yaml

@@ -1,10 +1,15 @@
 repos:
-- repo: https://github.com/astral-sh/ruff-pre-commit
-  # Ruff version.
-  rev: v0.6.9
-  hooks:
-    # Run the linter.
-    - id: ruff
-      args: ["--fix", "--show-fixes"]
-    # Run the formatter.
-    - id: ruff-format
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.6.9
+    hooks:
+      # Run the linter.
+      - id: ruff
+        args: ["--fix", "--show-fixes"]
+      # Run the formatter.
+      - id: ruff-format
+  - repo: https://github.com/astral-sh/uv-pre-commit
+    # uv version.
+    rev: 0.6.0
+    hooks:
+      - id: uv-lock

CHANGELOG.md

@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- `opentelemetry-instrumentation-system-metrics` Add `process` metrics and deprecated `process.runtime` prefixed ones 
+  ([#3250](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3250))
 - `opentelemetry-instrumentation-botocore` Add support for GenAI user events and lazy initialize tracer
   ([#3258](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3258))
 - `opentelemetry-instrumentation-botocore` Add support for GenAI system events

CONTRIBUTING.md

@@ -19,23 +19,31 @@ Please also read the [OpenTelemetry Contributor Guide](https://github.com/open-t
 
 ## Index
 
-* [Find a Buddy and get Started Quickly](#find-a-buddy-and-get-started-quickly)
-* [Development](#development)
-  * [Troubleshooting](#troubleshooting)
-  * [Benchmarks](#benchmarks)
-* [Pull requests](#pull-requests)
-  * [How to Send Pull Requests](#how-to-send-pull-requests)
-  * [How to Receive Comments](#how-to-receive-comments)
-  * [How to Get PRs Reviewed](#how-to-get-prs-reviewed)
-  * [How to Get PRs Merged](#how-to-get-prs-merged)
-* [Design Choices](#design-choices)
-  * [Focus on Capabilities, Not Structure Compliance](#focus-on-capabilities-not-structure-compliance)
-* [Running Tests Locally](#running-tests-locally)
-  * [Testing against a different Core repo branch/commit](#testing-against-a-different-core-repo-branchcommit)
-* [Style Guide](#style-guide)
-* [Guideline for instrumentations](#guideline-for-instrumentations)
-* [Guideline for GenAI instrumentations](#guideline-for-genai-instrumentations)
-* [Expectations from contributors](#expectations-from-contributors)
+- [Contributing to opentelemetry-python-contrib](#contributing-to-opentelemetry-python-contrib)
+  - [Index](#index)
+  - [Find a Buddy and get Started Quickly](#find-a-buddy-and-get-started-quickly)
+  - [Development](#development)
+    - [Virtual Environment](#virtual-environment)
+    - [Troubleshooting](#troubleshooting)
+    - [Benchmarks](#benchmarks)
+  - [Pull Requests](#pull-requests)
+    - [How to Send Pull Requests](#how-to-send-pull-requests)
+    - [How to Receive Comments](#how-to-receive-comments)
+    - [How to Get PRs Reviewed](#how-to-get-prs-reviewed)
+    - [How to Get PRs Merged](#how-to-get-prs-merged)
+  - [Design Choices](#design-choices)
+    - [Focus on Capabilities, Not Structure Compliance](#focus-on-capabilities-not-structure-compliance)
+  - [Running Tests Locally](#running-tests-locally)
+    - [Testing against a different Core repo branch/commit](#testing-against-a-different-core-repo-branchcommit)
+  - [Style Guide](#style-guide)
+  - [Guideline for instrumentations](#guideline-for-instrumentations)
+    - [Update supported instrumentation package versions](#update-supported-instrumentation-package-versions)
+  - [Guideline for GenAI instrumentations](#guideline-for-genai-instrumentations)
+    - [Get Involved](#get-involved)
+  - [Expectations from contributors](#expectations-from-contributors)
+  - [Updating supported Python versions](#updating-supported-python-versions)
+    - [Bumping the Python baseline](#bumping-the-python-baseline)
+    - [Adding support for a new Python release](#adding-support-for-a-new-python-release)
 
 ## Find a Buddy and get Started Quickly
 
@@ -93,6 +101,20 @@ See
 [`tox.ini`](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/tox.ini)
 for more detail on available tox commands.
 
+### Virtual Environment
+
+You can also create a single virtual environment to make it easier to run local tests.
+
+For that, you'll need to install [`uv`](https://docs.astral.sh/uv/getting-started/installation/).
+
+After installing `uv`, you can run the following command:
+
+```sh
+uv sync
+```
+
+This will create a virtual environment in the `.venv` directory and install all the necessary dependencies.
+
 ### Troubleshooting
 
 Some packages may require additional system-wide dependencies to be installed. For example, you may need to install `libpq-dev` to run the postgresql client libraries instrumentation tests or `libsnappy-dev` to run the prometheus exporter tests. If you encounter a build error, please check the installation instructions for the package you are trying to run tests for.

RELEASING.md

@@ -21,7 +21,7 @@
 > - opentelemetry-resource-detector-azure
 > - opentelemetry-sdk-extension-aws
 > - opentelemetry-instrumentation-openai-v2
->
+> - opentelemetry-instrumentation-vertexai
 > These libraries are also excluded from the general release.
 
 Package release preparation is handled by the [`[Package] Prepare release`](./.github/workflows/package-prepare-release.yml) workflow that allows

instrumentation-genai/opentelemetry-instrumentation-openai-v2/examples/manual/README.rst

@@ -11,16 +11,14 @@ your OpenAI requests.
 
 Note: `.env <.env>`_ file configures additional environment variables:
 
-- `OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT=true` configures
-OpenAI instrumentation to capture prompt and completion contents on
-events.
+- ``OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT=true`` configures OpenAI instrumentation to capture prompt and completion contents on events.
 
 Setup
 -----
 
-Minimally, update the `.env <.env>`_ file with your "OPENAI_API_KEY". An
+Minimally, update the `.env <.env>`_ file with your ``OPENAI_API_KEY``. An
 OTLP compatible endpoint should be listening for traces and logs on
-http://localhost:4317. If not, update "OTEL_EXPORTER_OTLP_ENDPOINT" as well.
+http://localhost:4317. If not, update ``OTEL_EXPORTER_OTLP_ENDPOINT`` as well.
 
 Next, set up a virtual environment like this:
 

instrumentation-genai/opentelemetry-instrumentation-openai-v2/examples/zero-code/README.rst

@@ -12,19 +12,16 @@ your OpenAI requests.
 
 Note: `.env <.env>`_ file configures additional environment variables:
 
-- `OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED=true` configures
-OpenTelemetry SDK to export logs and events.
-- `OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT=true` configures
-OpenAI instrumentation to capture prompt and completion contents on
-events.
-- `OTEL_LOGS_EXPORTER=otlp` to specify exporter type.
+- ``OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED=true`` configures OpenTelemetry SDK to export logs and events.
+- ``OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT=true`` configures OpenAI instrumentation to capture prompt and completion contents on events.
+- ``OTEL_LOGS_EXPORTER=otlp`` to specify exporter type.
 
 Setup
 -----
 
-Minimally, update the `.env <.env>`_ file with your "OPENAI_API_KEY". An
+Minimally, update the `.env <.env>`_ file with your ``OPENAI_API_KEY``. An
 OTLP compatible endpoint should be listening for traces and logs on
-http://localhost:4317. If not, update "OTEL_EXPORTER_OTLP_ENDPOINT" as well.
+http://localhost:4317. If not, update ``OTEL_EXPORTER_OTLP_ENDPOINT`` as well.
 
 Next, set up a virtual environment like this: