Merge branch 'main' into pytyped

open-telemetry · Jul 10, 2024 · 4486518 · 4486518
2 parents 745dbce + 49bfc29
commit 4486518
Show file tree

Hide file tree

Showing 39 changed files with 170 additions and 105 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -92,8 +92,12 @@ jobs:
     - name: Windows does not let git check out files with long names
       if: ${{ matrix.os == 'windows-2019'}}
       run: git config --system core.longpaths true
-    - name: run tox
+    - name: run pytest with --benchmark-skip
+      if: ${{ matrix.package == 'sdk' || matrix.package == 'exporter-otlp-proto-grpc' }}
       run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-skip
+    - name: run pytest without --benchmark-skip
+      if: ${{ !(matrix.package == 'sdk' || matrix.package == 'exporter-otlp-proto-grpc') }}
+      run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra
   misc:
     strategy:
       fail-fast: false

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4009](https://github.com/open-telemetry/opentelemetry-python/pull/4009))
 - Fix `start_time_unix_nano` for delta collection for sum aggregation
   ([#4011](https://github.com/open-telemetry/opentelemetry-python/pull/4011))
+- Update opentracing and opencesus docs examples to not use JaegerExporter
+  ([#4023](https://github.com/open-telemetry/opentelemetry-python/pull/4023))
 - Do not execute Flask Tests in debug mode
   ([#3956](https://github.com/open-telemetry/opentelemetry-python/pull/3956))
 - When encountering an error encoding metric attributes in the OTLP exporter, log the key that had an error.
@@ -38,6 +40,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3965](https://github.com/open-telemetry/opentelemetry-python/pull/3965))
 - Validate links at span creation
   ([#3991](https://github.com/open-telemetry/opentelemetry-python/pull/3991))
+- Add attributes field in  `MeterProvider.get_meter` and `InstrumentationScope`
+  ([#4015](https://github.com/open-telemetry/opentelemetry-python/pull/4015))
 
 ## Version 1.25.0/0.46b0 (2024-05-30)
 

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -18,6 +18,5 @@ ruamel.yaml==0.17.21
 asgiref==3.7.2
 psutil==5.9.6
 GitPython==3.1.41
-flaky==3.7.0
 pre-commit==3.7.0; python_version >= '3.9'
 pre-commit==3.5.0; python_version < '3.9'
diff --git a/docs/examples/opencensus-shim/README.rst b/docs/examples/opencensus-shim/README.rst
@@ -20,10 +20,10 @@ Start Jaeger
 .. code-block:: sh
 
     docker run --rm \
-        -p 6831:6831/udp \
-        -p 6832:6832/udp \
+        -p 4317:4317 \
+        -p 4318:4318 \
         -p 16686:16686 \
-        jaegertracing/all-in-one:1.13 \
+        jaegertracing/all-in-one:latest \
         --log-level=debug
 
 Python Dependencies
@@ -43,7 +43,7 @@ Alternatively, you can install the Python dependencies separately:
     pip install \
         opentelemetry-api \
         opentelemetry-sdk \
-        opentelemetry-exporter-jaeger \
+        opentelemetry-exporter-otlp \
         opentelemetry-opencensus-shim \
         opentelemetry-instrumentation-sqlite3 \
         opencensus \

diff --git a/docs/examples/opencensus-shim/app.py b/docs/examples/opencensus-shim/app.py
@@ -18,7 +18,9 @@
 from opencensus.ext.flask.flask_middleware import FlaskMiddleware
 
 from opentelemetry import trace
-from opentelemetry.exporter.jaeger.thrift import JaegerExporter
+from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import (
+    OTLPSpanExporter,
+)
 from opentelemetry.instrumentation.sqlite3 import SQLite3Instrumentor
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import TracerProvider
@@ -40,9 +42,8 @@
 # Configure OTel to export traces to Jaeger
 tracer_provider.add_span_processor(
     BatchSpanProcessor(
-        JaegerExporter(
-            agent_host_name="localhost",
-            agent_port=6831,
+        OTLPSpanExporter(
+            endpoint="localhost:4317",
         )
     )
 )

diff --git a/docs/examples/opencensus-shim/requirements.txt b/docs/examples/opencensus-shim/requirements.txt
@@ -1,6 +1,6 @@
 opentelemetry-api
 opentelemetry-sdk
-opentelemetry-exporter-jaeger
+opentelemetry-exporter-otlp
 opentelemetry-opencensus-shim
 opentelemetry-instrumentation-sqlite3
 opencensus

diff --git a/docs/examples/opentracing/README.rst b/docs/examples/opentracing/README.rst
@@ -26,10 +26,10 @@ Start Jaeger
 .. code-block:: sh
 
     docker run --rm \
-        -p 6831:6831/udp \
-        -p 6832:6832/udp \
+        -p 4317:4317 \
+        -p 4318:4318 \
         -p 16686:16686 \
-        jaegertracing/all-in-one:1.13 \
+        jaegertracing/all-in-one:latest \
         --log-level=debug
 
 Redis
@@ -61,7 +61,7 @@ Alternatively, you can install the Python dependencies separately:
     pip install \
         opentelemetry-api \
         opentelemetry-sdk \
-        opentelemetry-exporter-jaeger \
+        opentelemetry-exporter-otlp \
         opentelemetry-opentracing-shim \
         redis \
         redis_opentracing

diff --git a/docs/examples/opentracing/main.py b/docs/examples/opentracing/main.py
@@ -3,7 +3,9 @@
 from rediscache import RedisCache
 
 from opentelemetry import trace
-from opentelemetry.exporter.jaeger.thrift import JaegerExporter
+from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import (
+    OTLPSpanExporter,
+)
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
 from opentelemetry.shim import opentracing_shim
@@ -12,13 +14,16 @@
 trace.set_tracer_provider(TracerProvider())
 tracer_provider = trace.get_tracer_provider()
 
-# Configure the tracer to export traces to Jaeger
-jaeger_exporter = JaegerExporter(
-    agent_host_name="localhost",
-    agent_port=6831,
+# Create an OTLP gRPC span exporter
+otlp_exporter = OTLPSpanExporter(
+    endpoint="http://localhost:4317",
+    # For insecure connection, useful for testing
+    insecure=True,
+)
+# Add the exporter to the tracer provider
+trace.get_tracer_provider().add_span_processor(
+    BatchSpanProcessor(otlp_exporter)
 )
-span_processor = BatchSpanProcessor(jaeger_exporter)
-tracer_provider.add_span_processor(span_processor)
 
 # Create an OpenTracing shim. This implements the OpenTracing tracer API, but
 # forwards calls to the underlying OpenTelemetry tracer.

diff --git a/docs/examples/opentracing/requirements.txt b/docs/examples/opentracing/requirements.txt
@@ -1,6 +1,6 @@
 opentelemetry-api
 opentelemetry-sdk
-opentelemetry-exporter-jaeger
+opentelemetry-exporter-otlp
 opentelemetry-opentracing-shim
 redis
 redis_opentracing
diff --git a/docs/getting_started/tests/requirements.txt b/docs/getting_started/tests/requirements.txt
@@ -1,10 +1,9 @@
 asgiref==3.7.2
 attrs==23.1.0
-certifi==2023.7.22
+certifi==2024.7.4
 charset-normalizer==2.0.12
 click==8.1.7
 Deprecated==1.2.14
-flaky==3.7.0
 Flask==2.3.3
 idna==3.7
 importlib-metadata==6.8.0
@@ -16,14 +15,13 @@ packaging==24.0
 pluggy==1.3.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 requests==2.32.3
 tomli==2.0.1
 typing_extensions==4.8.0
 urllib3==1.26.19
 Werkzeug==3.0.3
 wrapt==1.15.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-semantic-conventions
 -e opentelemetry-api
 -e opentelemetry-sdk
diff --git a/exporter/opentelemetry-exporter-opencensus/test-requirements.txt b/exporter/opentelemetry-exporter-opencensus/test-requirements.txt
@@ -1,6 +1,5 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 grpcio==1.62.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
@@ -10,11 +9,10 @@ pluggy==1.5.0
 protobuf==3.20.3
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e opentelemetry-sdk
 -e tests/opentelemetry-test-utils

diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-0.txt b/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-0.txt
@@ -1,18 +1,16 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
 protobuf==3.20.3
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e opentelemetry-sdk
 -e opentelemetry-semantic-conventions

diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-1.txt b/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-1.txt
@@ -1,18 +1,16 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
 protobuf==4.25.3
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e opentelemetry-sdk
 -e opentelemetry-semantic-conventions

diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0.txt b/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0.txt
@@ -1,6 +1,5 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 googleapis-common-protos==1.62.0
 grpcio==1.62.0
 importlib-metadata==6.11.0
@@ -14,7 +13,7 @@ pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e tests/opentelemetry-test-utils
 -e exporter/opentelemetry-exporter-otlp-proto-common

diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-1.txt b/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-1.txt
@@ -1,6 +1,5 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 googleapis-common-protos==1.62.0
 grpcio==1.62.0
 importlib-metadata==6.11.0
@@ -14,7 +13,7 @@ pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e tests/opentelemetry-test-utils
 -e exporter/opentelemetry-exporter-otlp-proto-common

diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0.txt b/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0.txt
@@ -1,8 +1,7 @@
 asgiref==3.7.2
-certifi==2024.2.2
+certifi==2024.7.4
 charset-normalizer==3.3.2
 Deprecated==1.2.14
-flaky==3.7.0
 googleapis-common-protos==1.62.0
 idna==3.7
 importlib-metadata==6.11.0
@@ -12,15 +11,14 @@ pluggy==1.5.0
 protobuf==3.20.3
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 PyYAML==6.0.1
 requests==2.32.3
 responses==0.24.1
 tomli==2.0.1
 typing_extensions==4.10.0
 urllib3==2.2.2
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e tests/opentelemetry-test-utils
 -e exporter/opentelemetry-exporter-otlp-proto-common

diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1.txt b/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1.txt
@@ -1,8 +1,7 @@
 asgiref==3.7.2
-certifi==2024.2.2
+certifi==2024.7.4
 charset-normalizer==3.3.2
 Deprecated==1.2.14
-flaky==3.7.0
 googleapis-common-protos==1.62.0
 idna==3.7
 importlib-metadata==6.11.0
@@ -12,15 +11,14 @@ pluggy==1.5.0
 protobuf==4.25.3
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 PyYAML==6.0.1
 requests==2.32.3
 responses==0.24.1
 tomli==2.0.1
 typing_extensions==4.10.0
 urllib3==2.2.2
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e tests/opentelemetry-test-utils
 -e exporter/opentelemetry-exporter-otlp-proto-common

diff --git a/exporter/opentelemetry-exporter-otlp/test-requirements.txt b/exporter/opentelemetry-exporter-otlp/test-requirements.txt
@@ -1,17 +1,15 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e tests/opentelemetry-test-utils
 -e exporter/opentelemetry-exporter-otlp-proto-common

diff --git a/exporter/opentelemetry-exporter-prometheus/test-requirements.txt b/exporter/opentelemetry-exporter-prometheus/test-requirements.txt
@@ -1,18 +1,16 @@
 asgiref==3.7.2
 Deprecated==1.2.14
-flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
 prometheus_client==0.20.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e opentelemetry-sdk
 -e tests/opentelemetry-test-utils

diff --git a/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt b/exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt
@@ -1,22 +1,20 @@
 asgiref==3.7.2
-certifi==2024.2.2
+certifi==2024.7.4
 charset-normalizer==3.3.2
 Deprecated==1.2.14
-flaky==3.7.0
 idna==3.7
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
 py-cpuinfo==9.0.0
 pytest==7.4.4
-pytest-benchmark==4.0.0
 requests==2.32.3
 tomli==2.0.1
 typing_extensions==4.10.0
 urllib3==2.2.2
 wrapt==1.16.0
-zipp==3.17.0
+zipp==3.19.2
 -e opentelemetry-api
 -e opentelemetry-sdk
 -e opentelemetry-semantic-conventions