Merge branch 'main' into dependabot/pip/psutil-6.1.0

Author: xrmx

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
       - run: python -m build
 
       - name: generate build provenance
-        uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
+        uses: actions/attest-build-provenance@ef244123eb79f2f7a7e75d99086184180e6d0018 # v1.4.4
         with:
           subject-path: "${{ github.workspace }}/dist/*"
 
@@ -52,7 +52,7 @@ jobs:
 
       - name: Upload pypi.org
         if: startsWith(github.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@f7600683efdcb7656dec5b29656edb7bc586e597 # v1.10.3
+        uses: pypa/gh-action-pypi-publish@15c56dba361d8335944d31a2ecd17d700fc7bcbc # v1.12.2
         with:
           repository-url: https://upload.pypi.org/legacy/
 
@@ -112,7 +112,7 @@ jobs:
             DISTRO_DIR=./dist/
 
       - name: generate build provenance (containers)
-        uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c  # v1.4.3
+        uses: actions/attest-build-provenance@ef244123eb79f2f7a7e75d99086184180e6d0018  # v1.4.4
         with:
           subject-name: "${{ env.DOCKER_IMAGE_NAME }}"
           subject-digest: ${{ steps.docker-push.outputs.digest }}

README.md

@@ -69,7 +69,7 @@ opentelemetry-instrument gunicorn main:app
 
 ## Configuration
 
-The distribution supports all the configuration variables from OpenTelemetry Python project version 1.27.0.
+The distribution supports all the configuration variables from OpenTelemetry Python project version 1.28.1.
 
 ### Default configuration variables
 
@@ -79,6 +79,7 @@ This distribution sets the following defaults:
 - `OTEL_METRICS_EXPORTER`: `otlp`
 - `OTEL_EXPORTER_OTLP_PROTOCOL`: `grpc`
 - `OTEL_EXPERIMENTAL_RESOURCE_DETECTORS`: `process_runtime,os,otel,telemetry_distro`
+- `OTEL_METRICS_EXEMPLAR_FILTER`: `always_off`
 
 ### Distribution specific configuration variables
 

dev-requirements.txt

@@ -24,7 +24,7 @@ googleapis-common-protos==1.65.0
     # via
     #   opentelemetry-exporter-otlp-proto-grpc
     #   opentelemetry-exporter-otlp-proto-http
-grpcio==1.67.0
+grpcio==1.67.1
     # via
     #   opentelemetry-exporter-otlp-proto-grpc
     #   oteltest
@@ -36,7 +36,7 @@ iniconfig==2.0.0
     # via pytest
 leb128==1.0.8
     # via elastic-opentelemetry (pyproject.toml)
-opentelemetry-api==1.27.0
+opentelemetry-api==1.28.1
     # via
     #   elastic-opentelemetry (pyproject.toml)
     #   opentelemetry-exporter-otlp-proto-grpc
@@ -46,48 +46,50 @@ opentelemetry-api==1.27.0
     #   opentelemetry-sdk
     #   opentelemetry-semantic-conventions
     #   oteltest
-opentelemetry-exporter-otlp==1.27.0
+opentelemetry-exporter-otlp==1.28.1
     # via elastic-opentelemetry (pyproject.toml)
-opentelemetry-exporter-otlp-proto-common==1.27.0
+opentelemetry-exporter-otlp-proto-common==1.28.1
     # via
     #   opentelemetry-exporter-otlp-proto-grpc
     #   opentelemetry-exporter-otlp-proto-http
-opentelemetry-exporter-otlp-proto-grpc==1.27.0
+opentelemetry-exporter-otlp-proto-grpc==1.28.1
     # via opentelemetry-exporter-otlp
-opentelemetry-exporter-otlp-proto-http==1.27.0
+opentelemetry-exporter-otlp-proto-http==1.28.1
     # via opentelemetry-exporter-otlp
-opentelemetry-instrumentation==0.48b0
+opentelemetry-instrumentation==0.49b1
     # via
     #   elastic-opentelemetry (pyproject.toml)
     #   opentelemetry-instrumentation-system-metrics
-opentelemetry-instrumentation-system-metrics==0.48b0
+opentelemetry-instrumentation-system-metrics==0.49b1
     # via elastic-opentelemetry (pyproject.toml)
-opentelemetry-proto==1.27.0
+opentelemetry-proto==1.28.1
     # via
     #   opentelemetry-exporter-otlp-proto-common
     #   opentelemetry-exporter-otlp-proto-grpc
     #   opentelemetry-exporter-otlp-proto-http
     #   oteltest
-opentelemetry-sdk==1.27.0
+opentelemetry-sdk==1.28.1
     # via
     #   elastic-opentelemetry (pyproject.toml)
     #   opentelemetry-exporter-otlp-proto-grpc
     #   opentelemetry-exporter-otlp-proto-http
-opentelemetry-semantic-conventions==0.48b0
+opentelemetry-semantic-conventions==0.49b1
     # via
     #   elastic-opentelemetry (pyproject.toml)
+    #   opentelemetry-instrumentation
     #   opentelemetry-sdk
-oteltest==0.15.0
+oteltest==0.24.0
     # via elastic-opentelemetry (pyproject.toml)
-packaging==24.1
+packaging==24.2
     # via
     #   build
+    #   opentelemetry-instrumentation
     #   pytest
 pip-tools==7.4.1
     # via elastic-opentelemetry (pyproject.toml)
 pluggy==1.5.0
     # via pytest
-protobuf==4.25.3
+protobuf==5.28.3
     # via
     #   googleapis-common-protos
     #   opentelemetry-proto

examples/flask/Dockerfile

@@ -0,0 +1,18 @@
+FROM python:3.12-slim
+
+WORKDIR /app
+
+COPY . /app
+
+RUN pip install flask elastic-opentelemetry
+
+# Install all the instrumentations available for the installed packages
+RUN opentelemetry-bootstrap -a install
+
+# default flask run port
+EXPOSE 5000
+
+# Set some resource attributes to make our service recognizable
+ENV OTEL_RESOURCE_ATTRIBUTES="service.name=FlaskService,service.version=0.0.1,deployment.environment=development"
+
+CMD ["opentelemetry-instrument", "flask", "run"]

examples/flask/README.md

@@ -0,0 +1,21 @@
+# Flask autoinstrumented application
+
+This is a barebone Flask app used for demonstrating autoinstrumentation with EDOT.
+
+You can build the application image it with:
+
+```
+docker build --load -t edot-flask:latest .
+```
+
+You can run the application with:
+
+```
+export OTEL_EXPORTER_OTLP_ENDPOINT=https://my-deployment.apm.us-west1.gcp.cloud.es.io
+export OTEL_EXPORTER_OTLP_HEADERS="Authorization=Bearer P....l"
+docker run -e OTEL_EXPORTER_OTLP_ENDPOINT="$OTEL_EXPORTER_OTLP_ENDPOINT" \
+  -e OTEL_EXPORTER_OTLP_HEADERS="$OTEL_EXPORTER_OTLP_HEADERS" \
+  -p 5000:5000 -it --rm edot-flask:latest
+```
+
+You can access the application from [http://127.0.0.1:5000](http://127.0.0.1:5000).

examples/flask/app.py

@@ -0,0 +1,24 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from flask import Flask, jsonify
+
+app = Flask(__name__)
+
+
+@app.route("/", methods=["GET"])
+def home():
+    return jsonify(message="Hello, world!")

operator/Dockerfile

@@ -28,7 +28,7 @@ ADD operator/requirements.txt .
 
 RUN mkdir workspace
 
-RUN apk add gcc python3-dev musl-dev linux-headers
+RUN apk add gcc g++ python3-dev musl-dev linux-headers
 
 RUN pip install --no-cache-dir --target workspace /opt/distro/*.whl -r requirements.txt
 

operator/requirements.txt

@@ -1,56 +1,56 @@
-opentelemetry-exporter-prometheus==0.48b0
+opentelemetry-exporter-prometheus==0.49b1
 
 opentelemetry-propagator-aws-xray==1.0.2
-opentelemetry-propagator-b3==1.27.0
-opentelemetry-propagator-jaeger==1.27.0
-opentelemetry-propagator-ot-trace==0.48b0
+opentelemetry-propagator-b3==1.28.1
+opentelemetry-propagator-jaeger==1.28.1
+opentelemetry-propagator-ot-trace==0.49b1
 
-opentelemetry-instrumentation-aio-pika==0.48b0
-opentelemetry-instrumentation-aiohttp-client==0.48b0
-opentelemetry-instrumentation-aiohttp-server==0.48b0
-opentelemetry-instrumentation-aiopg==0.48b0
-opentelemetry-instrumentation-asgi==0.48b0
-opentelemetry-instrumentation-asyncio==0.48b0
-opentelemetry-instrumentation-asyncpg==0.48b0
-opentelemetry-instrumentation-aws-lambda==0.48b0
-opentelemetry-instrumentation-boto==0.48b0
-opentelemetry-instrumentation-boto3sqs==0.48b0
-opentelemetry-instrumentation-botocore==0.48b0
-opentelemetry-instrumentation-cassandra==0.48b0
-opentelemetry-instrumentation-celery==0.48b0
-opentelemetry-instrumentation-confluent-kafka==0.48b0
-opentelemetry-instrumentation-dbapi==0.48b0
-opentelemetry-instrumentation-django==0.48b0
-opentelemetry-instrumentation-elasticsearch==0.48b0
-opentelemetry-instrumentation-falcon==0.48b0
-opentelemetry-instrumentation-fastapi==0.48b0
-opentelemetry-instrumentation-flask==0.48b0
-opentelemetry-instrumentation-grpc==0.48b0
-opentelemetry-instrumentation-httpx==0.48b0
-opentelemetry-instrumentation-jinja2==0.48b0
-opentelemetry-instrumentation-kafka-python==0.48b0
-opentelemetry-instrumentation-logging==0.48b0
-opentelemetry-instrumentation-mysql==0.48b0
-opentelemetry-instrumentation-mysqlclient==0.48b0
-opentelemetry-instrumentation-pika==0.48b0
-opentelemetry-instrumentation-psycopg==0.48b0
-opentelemetry-instrumentation-psycopg2==0.48b0
-opentelemetry-instrumentation-pymemcache==0.48b0
-opentelemetry-instrumentation-pymongo==0.48b0
-opentelemetry-instrumentation-pymysql==0.48b0
-opentelemetry-instrumentation-pyramid==0.48b0
-opentelemetry-instrumentation-redis==0.48b0
-opentelemetry-instrumentation-remoulade==0.48b0
-opentelemetry-instrumentation-requests==0.48b0
-opentelemetry-instrumentation-sqlalchemy==0.48b0
-opentelemetry-instrumentation-sqlite3==0.48b0
-opentelemetry-instrumentation-starlette==0.48b0
-opentelemetry-instrumentation-system-metrics==0.48b0
-opentelemetry-instrumentation-threading==0.48b0
-opentelemetry-instrumentation-tornado==0.48b0
-opentelemetry-instrumentation-tortoiseorm==0.48b0
-opentelemetry-instrumentation-urllib==0.48b0
-opentelemetry-instrumentation-urllib3==0.48b0
-opentelemetry-instrumentation-wsgi==0.48b0
+opentelemetry-instrumentation-aio-pika==0.49b1
+opentelemetry-instrumentation-aiohttp-client==0.49b1
+opentelemetry-instrumentation-aiohttp-server==0.49b1
+opentelemetry-instrumentation-aiokafka==0.49b1
+opentelemetry-instrumentation-aiopg==0.49b1
+opentelemetry-instrumentation-asgi==0.49b1
+opentelemetry-instrumentation-asyncio==0.49b1
+opentelemetry-instrumentation-asyncpg==0.49b1
+opentelemetry-instrumentation-boto==0.49b1
+opentelemetry-instrumentation-boto3sqs==0.49b1
+opentelemetry-instrumentation-botocore==0.49b1
+opentelemetry-instrumentation-cassandra==0.49b1
+opentelemetry-instrumentation-celery==0.49b1
+opentelemetry-instrumentation-confluent-kafka==0.49b1
+opentelemetry-instrumentation-dbapi==0.49b1
+opentelemetry-instrumentation-django==0.49b1
+opentelemetry-instrumentation-elasticsearch==0.49b1
+opentelemetry-instrumentation-falcon==0.49b1
+opentelemetry-instrumentation-fastapi==0.49b1
+opentelemetry-instrumentation-flask==0.49b1
+opentelemetry-instrumentation-grpc==0.49b1
+opentelemetry-instrumentation-httpx==0.49b1
+opentelemetry-instrumentation-jinja2==0.49b1
+opentelemetry-instrumentation-kafka-python==0.49b1
+opentelemetry-instrumentation-logging==0.49b1
+opentelemetry-instrumentation-mysql==0.49b1
+opentelemetry-instrumentation-mysqlclient==0.49b1
+opentelemetry-instrumentation-pika==0.49b1
+opentelemetry-instrumentation-psycopg==0.49b1
+opentelemetry-instrumentation-psycopg2==0.49b1
+opentelemetry-instrumentation-pymemcache==0.49b1
+opentelemetry-instrumentation-pymongo==0.49b1
+opentelemetry-instrumentation-pymysql==0.49b1
+opentelemetry-instrumentation-pyramid==0.49b1
+opentelemetry-instrumentation-redis==0.49b1
+opentelemetry-instrumentation-remoulade==0.49b1
+opentelemetry-instrumentation-requests==0.49b1
+opentelemetry-instrumentation-sqlalchemy==0.49b1
+opentelemetry-instrumentation-sqlite3==0.49b1
+opentelemetry-instrumentation-starlette==0.49b1
+opentelemetry-instrumentation-system-metrics==0.49b1
+opentelemetry-instrumentation-threading==0.49b1
+opentelemetry-instrumentation-tornado==0.49b1
+opentelemetry-instrumentation-tortoiseorm==0.49b1
+opentelemetry-instrumentation-urllib==0.49b1
+opentelemetry-instrumentation-urllib3==0.49b1
+opentelemetry-instrumentation-wsgi==0.49b1
 
 elastic-opentelemetry-instrumentation-openai==0.3.0

pyproject.toml

@@ -27,16 +27,16 @@ classifiers = [
 ]
 
 dependencies = [
-    "opentelemetry-api == 1.27.0",
-    "opentelemetry-exporter-otlp == 1.27.0",
-    "opentelemetry-instrumentation == 0.48b0",
-    "opentelemetry-instrumentation-system-metrics == 0.48b0",
-    "opentelemetry-semantic-conventions == 0.48b0",
-    "opentelemetry-sdk == 1.27.0",
+    "opentelemetry-api == 1.28.1",
+    "opentelemetry-exporter-otlp == 1.28.1",
+    "opentelemetry-instrumentation == 0.49b1",
+    "opentelemetry-instrumentation-system-metrics == 0.49b1",
+    "opentelemetry-semantic-conventions == 0.49b1",
+    "opentelemetry-sdk == 1.28.1",
 ]
 
 [project.optional-dependencies]
-dev = ["pytest", "pip-tools", "oteltest==0.15", "leb128"]
+dev = ["pytest", "pip-tools", "oteltest==0.24.0", "leb128"]
 
 [project.entry-points.opentelemetry_configurator]
 configurator = "elasticotel.distro:ElasticOpenTelemetryConfigurator"

src/elasticotel/distro/__init__.py

@@ -30,10 +30,11 @@
 )
 from opentelemetry.sdk._configuration import _OTelSDKConfigurator
 from opentelemetry.sdk.environment_variables import (
+    OTEL_METRICS_EXEMPLAR_FILTER,
     OTEL_EXPERIMENTAL_RESOURCE_DETECTORS,
     OTEL_EXPORTER_OTLP_PROTOCOL,
 )
-from pkg_resources import EntryPoint
+from opentelemetry.util._importlib_metadata import EntryPoint
 
 from elasticotel.distro.environment_variables import ELASTIC_OTEL_SYSTEM_METRICS_ENABLED
 
@@ -48,17 +49,9 @@ class ElasticOpenTelemetryConfigurator(_OTelSDKConfigurator):
 class ElasticOpenTelemetryDistro(BaseDistro):
     def load_instrumentor(self, entry_point: EntryPoint, **kwargs):
         # When running in the k8s operator loading of an instrumentor may fail because the environment
-        # in which python extensions are built does not match the one from the running container.
-        # There are at least two cases:
-        # - different python version
-        # - different kind of wheels, e.g. manylinux vs musllinux
-        # To avoid the distro loading to fail catch ImportError here, that is the kind of exception we see
-        # when loading shared objects or cython extensions fails.
-        try:
-            instrumentor_class: BaseInstrumentor = entry_point.load()
-        except ImportError:
-            logger.exception("Instrumenting of %s failed", entry_point.name)
-            return
+        # in which python extensions are built does not match the one from the running container but
+        # ImportErrors raised here are handled by the autoinstrumentation code
+        instrumentor_class: BaseInstrumentor = entry_point.load()
 
         instrumentor_kwargs = {}
         if instrumentor_class == SystemMetricsInstrumentor:
@@ -76,3 +69,5 @@ def _configure(self, **kwargs):
         os.environ.setdefault(OTEL_LOGS_EXPORTER, "otlp")
         os.environ.setdefault(OTEL_EXPORTER_OTLP_PROTOCOL, "grpc")
         os.environ.setdefault(OTEL_EXPERIMENTAL_RESOURCE_DETECTORS, "process_runtime,os,otel,telemetry_distro")
+        # disable exemplars by default for now
+        os.environ.setdefault(OTEL_METRICS_EXEMPLAR_FILTER, "always_off")