Merge branch 'main' into otlp-http-metrics-export-max-batch

Author: tammy-baylis-swi

.github/workflows/benchmarks.yml

@@ -11,15 +11,18 @@ jobs:
   sdk-benchmarks:
     permissions:
       contents: write # required for pushing to gh-pages
-    runs-on: equinix-bare-metal
+    runs-on: oracle-bare-metal-64cpu-512gb-x86-64
+    container:
+      image: python:3.13-slim
     steps:
+    - name: Install Git # since Git isn't available in the container image used above
+      run: |
+        apt-get update
+        apt-get install -y git
+    - name: Make repo safe for Git inside container
+      run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
     - name: Checkout Core Repo @ SHA - ${{ github.sha }}
       uses: actions/checkout@v4
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: "3.13"
-        architecture: 'x64'
     - name: Install tox
       run: pip install tox-uv
     - name: Run tox

CHANGELOG.md

@@ -5,8 +5,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+**Breaking changes ongoing**
+
+> [!IMPORTANT]
+> We are working on stabilizing the Log signal that would require making deprecations and breaking changes. We will try to reduce the releases that may require an update to your code, especially for instrumentations or for sdk developers.
+
 ## Unreleased
 
+- Add experimental composite samplers
+  ([#4714](https://github.com/open-telemetry/opentelemetry-python/pull/4714))
+- Filter duplicate logs out of some internal `logger`'s logs on the export logs path that might otherwise endlessly log or cause a recursion depth exceeded issue in cases where logging itself results in an exception.
+  ([#4695](https://github.com/open-telemetry/opentelemetry-python/pull/4695)).
+- docs: linked the examples with their github source code location and added Prometheus example
+  ([#4728](https://github.com/open-telemetry/opentelemetry-python/pull/4728))
+- Permit to override default HTTP OTLP exporters headers
+  ([#4634](https://github.com/open-telemetry/opentelemetry-python/pull/4634))
+- semantic-conventions: Bump to 1.37.0
+  ([#4731](https://github.com/open-telemetry/opentelemetry-python/pull/4731))
 - Add configurable `max_export_batch_size` to OTLP HTTP metrics exporter
   ([#4576](https://github.com/open-telemetry/opentelemetry-python/pull/4576))
 

README.md

@@ -1,10 +1,10 @@
 # OpenTelemetry Python
 [![Slack](https://img.shields.io/badge/slack-@cncf/otel/python-brightgreen.svg?logo=slack)](https://cloud-native.slack.com/archives/C01PD4HUVBL)
 [![Build Status 0](https://github.com/open-telemetry/opentelemetry-python/actions/workflows/test_0.yml/badge.svg?branch=main)](https://github.com/open-telemetry/opentelemetry-python/actions/workflows/test_0.yml)
-[![Build Status 1](https://github.com/open-telemetry/opentelemetry-python/actions/workflows/test_1.yml/badge.svg?branch=main)](https://github.com/open-telemetry/opentelemetry-python/actions/workflows/test_1.yml)
 [![Minimum Python Version](https://img.shields.io/badge/python-3.9+-blue.svg)](https://www.python.org/downloads/)
 [![Release](https://img.shields.io/github/v/release/open-telemetry/opentelemetry-python?include_prereleases&style=)](https://github.com/open-telemetry/opentelemetry-python/releases/)
 [![Read the Docs](https://readthedocs.org/projects/opentelemetry-python/badge/?version=latest)](https://opentelemetry-python.readthedocs.io/en/latest/)
+[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/11060/badge)](https://www.bestpractices.dev/projects/11060)
 
 ## Project Status
 
@@ -14,10 +14,15 @@ See the [OpenTelemetry Instrumentation for Python](https://opentelemetry.io/docs
 | ------- | ------------ | ------- |
 | Traces  | Stable       | N/A     |
 | Metrics | Stable       | N/A     |
-| Logs    | Experimental | N/A     |
+| Logs    | Development* | N/A     |
 
 Project versioning information and stability guarantees can be found [here](./rationale.md#versioning-and-releasing).
 
+***Breaking Changes**
+
+> [!IMPORTANT]
+> We are working on stabilizing the Log signal which would require making deprecations and breaking changes. We will try to reduce the releases that may require an update to your code, especially for instrumentations or for SDK developers.
+
 ## Getting started
 
 You can find the getting started guide for OpenTelemetry Python [here](https://opentelemetry.io/docs/instrumentation/python/getting-started/).
@@ -98,14 +103,14 @@ Meeting notes are available as a public [Google doc](https://docs.google.com/doc
 ### Maintainers
 
 - [Aaron Abbott](https://github.com/aabmass), Google
-- [Diego Hurtado](https://github.com/ocelotl), Lightstep
 - [Leighton Chen](https://github.com/lzchen), Microsoft
 - [Riccardo Magliocchetti](https://github.com/xrmx), Elastic
 
 For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer).
 
 ### Approvers
 
+- [Dylan Russell](https://github.com/dylanrussell), Google
 - [Emídio Neto](https://github.com/emdneto), PicPay
 - [Jeremy Voss](https://github.com/jeremydvoss), Microsoft
 - [Owais Lone](https://github.com/owais), Splunk
@@ -120,6 +125,7 @@ For more information about the approver role, see the [community repository](htt
 
 - [Alex Boten](https://github.com/codeboten)
 - [Chris Kleinknecht](https://github.com/c24t)
+- [Diego Hurtado](https://github.com/ocelotl), Lightstep
 - [Owais Lone](https://github.com/owais)
 - [Reiley Yang](https://github.com/reyang)
 - [Srikanth Chekuri](https://github.com/srikanthccv)

docs/examples/auto-instrumentation/client.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from sys import argv
+import sys
 
 from requests import get
 
@@ -31,16 +31,16 @@
     BatchSpanProcessor(ConsoleSpanExporter())
 )
 
-
-assert len(argv) == 2
+# Get parameter from command line argument or use default value "testing"
+param_value = sys.argv[1] if len(sys.argv) > 1 else "testing"
 
 with tracer.start_as_current_span("client"):
     with tracer.start_as_current_span("client-server"):
         headers = {}
         inject(headers)
         requested = get(
             "http://localhost:8082/server_request",
-            params={"param": argv[1]},
+            params={"param": param_value},
             headers=headers,
         )
 

docs/examples/django/README.rst

@@ -4,7 +4,7 @@ Django Instrumentation
 This shows how to use ``opentelemetry-instrumentation-django`` to automatically instrument a
 Django app.
 
-For more user convenience, a Django app is already provided in this directory.
+The source files of these examples are available :scm_web:`here <docs/examples/django/>`.
 
 Preparation
 -----------

docs/examples/error_handler/README.rst

@@ -6,6 +6,7 @@ Overview
 
 This example shows how to use the global error handler.
 
+The source files of these examples are available :scm_web:`here <docs/examples/error_handler/>`.
 
 Preparation
 -----------

docs/examples/fork-process-model/README.rst

@@ -10,6 +10,8 @@ get around this limitation of the span processor.
 Please see http://bugs.python.org/issue6721 for the problems about Python locks in (multi)threaded
 context with fork.
 
+The source code for the examples with Flask app are available :scm_web:`here <docs/examples/fork-process-model/>`.
+
 Gunicorn post_fork hook
 -----------------------
 
@@ -61,6 +63,3 @@ uWSGI postfork decorator
             OTLPSpanExporter(endpoint="http://localhost:4317")
         )
         trace.get_tracer_provider().add_span_processor(span_processor)
-
-
-The source code for the examples with Flask app are available :scm_web:`here <docs/examples/fork-process-model/>`.

docs/examples/logs/README.rst

@@ -6,6 +6,8 @@ OpenTelemetry Logs SDK
    :mod:`opentelemetry.sdk._logs` are subject to change in minor/patch releases and make no
    backward compatibility guarantees at this time.
 
+The source files of these examples are available :scm_web:`here <docs/examples/logs/>`.
+
 Start the Collector locally to see data being exported. Write the following file:
 
 .. code-block:: yaml

docs/examples/metrics/instruments/README.rst

@@ -1,6 +1,8 @@
 OpenTelemetry Metrics SDK
 =========================
 
+The source files of these examples are available :scm_web:`here <docs/examples/metrics/instruments/>`.
+
 Start the Collector locally to see data being exported. Write the following file:
 
 .. code-block:: yaml

docs/examples/metrics/prometheus-grafana/README.rst

@@ -0,0 +1,63 @@
+Prometheus Instrumentation
+==========================
+
+This shows how to use ``opentelemetry-exporter-prometheus`` to automatically generate Prometheus metrics.
+
+The source files of these examples are available :scm_web:`here <docs/examples/prometheus-grafana/>`.
+
+Preparation
+-----------
+
+This example will be executed in a separate virtual environment:
+
+.. code-block::
+
+    $ mkdir prometheus_auto_instrumentation
+    $ virtualenv prometheus_auto_instrumentation
+    $ source prometheus_auto_instrumentation/bin/activate
+
+
+Installation
+------------
+
+.. code-block::
+
+    $ pip install -r requirements.txt
+
+
+Execution
+---------
+
+.. code-block::
+
+    $ python ./prometheus-monitor.py
+    $ Server is running at http://localhost:8000
+
+Now you can visit http://localhost:8000/metrics to see Prometheus metrics. 
+You should see something like:
+
+.. code-block::
+
+    # HELP python_gc_objects_collected_total Objects collected during gc
+    # TYPE python_gc_objects_collected_total counter
+    python_gc_objects_collected_total{generation="0"} 320.0
+    python_gc_objects_collected_total{generation="1"} 58.0
+    python_gc_objects_collected_total{generation="2"} 0.0
+    # HELP python_gc_objects_uncollectable_total Uncollectable objects found during GC
+    # TYPE python_gc_objects_uncollectable_total counter
+    python_gc_objects_uncollectable_total{generation="0"} 0.0
+    python_gc_objects_uncollectable_total{generation="1"} 0.0
+    python_gc_objects_uncollectable_total{generation="2"} 0.0
+    # HELP python_gc_collections_total Number of times this generation was collected
+    # TYPE python_gc_collections_total counter
+    python_gc_collections_total{generation="0"} 61.0
+    python_gc_collections_total{generation="1"} 5.0
+    python_gc_collections_total{generation="2"} 0.0
+    # HELP python_info Python platform information
+    # TYPE python_info gauge
+    python_info{implementation="CPython",major="3",minor="8",patchlevel="5",version="3.8.5"} 1.0
+    # HELP MyAppPrefix_my_counter_total 
+    # TYPE MyAppPrefix_my_counter_total counter
+    MyAppPrefix_my_counter_total 964.0
+ 
+``MyAppPrefix_my_counter_total`` is the custom counter created in the application with the custom prefix ``MyAppPrefix``.