Merge branch 'main' into spanstartmetrics

Author: xrmx

CHANGELOG.md

@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- `opentelemetry-sdk`: Drop unused Jaeger exporter environment variables (exporter removed in 1.22.0)
+  ([#4918](https://github.com/open-telemetry/opentelemetry-python/issues/4918))
 - `opentelemetry-sdk`: Clarify timeout units in environment variable documentation
   ([#4906](https://github.com/open-telemetry/opentelemetry-python/pull/4906))
 - `opentelemetry-exporter-otlp-proto-grpc`: Fix re-initialization of gRPC channel on UNAVAILABLE error

docs/examples/opencensus-shim/app.py

@@ -31,7 +31,7 @@
 
 # Set up OpenTelemetry
 tracer_provider = TracerProvider(
-    resource=Resource(
+    resource=Resource.create(
         {
             "service.name": "opencensus-shim-example-flask",
         }

docs/exporter/prometheus/prometheus.rst

@@ -27,7 +27,7 @@ Prometheus text format on request::
     from opentelemetry.sdk.resources import SERVICE_NAME, Resource
 
     # Service name is required for most backends
-    resource = Resource(attributes={
+    resource = Resource.create(attributes={
         SERVICE_NAME: "your-service-name"
     })
 

exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/__init__.py

@@ -50,7 +50,7 @@
 
     # Resource can be required for some backends, e.g. Jaeger
     # If resource wouldn't be set - traces wouldn't appears in Jaeger
-    resource = Resource(attributes={
+    resource = Resource.create({
         "service.name": "service"
     })
 

exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/__init__.py

@@ -50,7 +50,7 @@
 
     # Resource can be required for some backends, e.g. Jaeger
     # If resource wouldn't be set - traces wouldn't appears in Jaeger
-    resource = Resource(attributes={
+    resource = Resource.create({
         "service.name": "service"
     })
 

opentelemetry-sdk/src/opentelemetry/sdk/environment_variables/__init__.py

@@ -205,52 +205,6 @@
 Default: 128
 """
 
-OTEL_EXPORTER_JAEGER_AGENT_HOST = "OTEL_EXPORTER_JAEGER_AGENT_HOST"
-"""
-.. envvar:: OTEL_EXPORTER_JAEGER_AGENT_HOST
-
-The :envvar:`OTEL_EXPORTER_JAEGER_AGENT_HOST` represents the hostname for the Jaeger agent.
-Default: "localhost"
-"""
-
-OTEL_EXPORTER_JAEGER_AGENT_PORT = "OTEL_EXPORTER_JAEGER_AGENT_PORT"
-"""
-.. envvar:: OTEL_EXPORTER_JAEGER_AGENT_PORT
-
-The :envvar:`OTEL_EXPORTER_JAEGER_AGENT_PORT` represents the port for the Jaeger agent.
-Default: 6831
-"""
-
-OTEL_EXPORTER_JAEGER_ENDPOINT = "OTEL_EXPORTER_JAEGER_ENDPOINT"
-"""
-.. envvar:: OTEL_EXPORTER_JAEGER_ENDPOINT
-
-The :envvar:`OTEL_EXPORTER_JAEGER_ENDPOINT` represents the HTTP endpoint for Jaeger traces.
-Default: "http://localhost:14250"
-"""
-
-OTEL_EXPORTER_JAEGER_USER = "OTEL_EXPORTER_JAEGER_USER"
-"""
-.. envvar:: OTEL_EXPORTER_JAEGER_USER
-
-The :envvar:`OTEL_EXPORTER_JAEGER_USER` represents the username to be used for HTTP basic authentication.
-"""
-
-OTEL_EXPORTER_JAEGER_PASSWORD = "OTEL_EXPORTER_JAEGER_PASSWORD"
-"""
-.. envvar:: OTEL_EXPORTER_JAEGER_PASSWORD
-
-The :envvar:`OTEL_EXPORTER_JAEGER_PASSWORD` represents the password to be used for HTTP basic authentication.
-"""
-
-OTEL_EXPORTER_JAEGER_TIMEOUT = "OTEL_EXPORTER_JAEGER_TIMEOUT"
-"""
-.. envvar:: OTEL_EXPORTER_JAEGER_TIMEOUT
-
-Maximum time (in seconds) the Jaeger exporter will wait for each batch export.
-Default: 10
-"""
-
 OTEL_EXPORTER_ZIPKIN_ENDPOINT = "OTEL_EXPORTER_ZIPKIN_ENDPOINT"
 """
 .. envvar:: OTEL_EXPORTER_ZIPKIN_ENDPOINT
@@ -731,24 +685,6 @@ def channel_credential_provider() -> grpc.ChannelCredentials:
 Default: 10
 """
 
-OTEL_EXPORTER_JAEGER_CERTIFICATE = "OTEL_EXPORTER_JAEGER_CERTIFICATE"
-"""
-.. envvar:: OTEL_EXPORTER_JAEGER_CERTIFICATE
-
-The :envvar:`OTEL_EXPORTER_JAEGER_CERTIFICATE` stores the path to the certificate file for
-TLS credentials of gRPC client for Jaeger. Should only be used for a secure connection with Jaeger.
-"""
-
-OTEL_EXPORTER_JAEGER_AGENT_SPLIT_OVERSIZED_BATCHES = (
-    "OTEL_EXPORTER_JAEGER_AGENT_SPLIT_OVERSIZED_BATCHES"
-)
-"""
-.. envvar:: OTEL_EXPORTER_JAEGER_AGENT_SPLIT_OVERSIZED_BATCHES
-
-The :envvar:`OTEL_EXPORTER_JAEGER_AGENT_SPLIT_OVERSIZED_BATCHES` is a boolean flag to determine whether
-to split a large span batch to admire the udp packet size limit.
-"""
-
 OTEL_SERVICE_NAME = "OTEL_SERVICE_NAME"
 """
 .. envvar:: OTEL_SERVICE_NAME
@@ -798,13 +734,6 @@ def channel_credential_provider() -> grpc.ChannelCredentials:
 Use ``CUMULATIVE`` aggregation temporality for ``UpDownCounter``, ``AsynchronousCounter`` and ``Asynchronous UpDownCounter``.
 """
 
-OTEL_EXPORTER_JAEGER_GRPC_INSECURE = "OTEL_EXPORTER_JAEGER_GRPC_INSECURE"
-"""
-.. envvar:: OTEL_EXPORTER_JAEGER_GRPC_INSECURE
-
-The :envvar:`OTEL_EXPORTER_JAEGER_GRPC_INSECURE` is a boolean flag to True if collector has no encryption or authentication.
-"""
-
 OTEL_METRIC_EXPORT_INTERVAL = "OTEL_METRIC_EXPORT_INTERVAL"
 """
 .. envvar:: OTEL_METRIC_EXPORT_INTERVAL