diff --git a/CHANGELOG.md b/CHANGELOG.md index 686d2f794cf..1c345a3b29c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ release. - Clarify composite `TextMapPropagator` method required and optional arguments. ([#1541](https://github.com/open-telemetry/opentelemetry-specification/pull/1541)) - Clarify B3 requirements and configuration. ([#1570](https://github.com/open-telemetry/opentelemetry-specification/pull/1570)) +- Added `OTEL_EXPORTER_JAEGER_TIMEOUT` environment variable. ([#1612](https://github.com/open-telemetry/opentelemetry-specification/pull/1612)) ### Traces diff --git a/spec-compliance-matrix.md b/spec-compliance-matrix.md index 2ceb754fb7e..9abd6b3d797 100644 --- a/spec-compliance-matrix.md +++ b/spec-compliance-matrix.md @@ -134,7 +134,7 @@ Note: Support for environment variables is optional. |OTEL_PROPAGATORS | - | + | | + | + | + | - | - | - | - | - | |OTEL_BSP_* | - | + | | + | + | + | - | + | - | - | - | |OTEL_EXPORTER_OTLP_* | [-](https://github.com/open-telemetry/opentelemetry-go/issues/1085) | + | | - | + | - | - | + | - | - | - | -|OTEL_EXPORTER_JAEGER_* | - | + | | + | + | - | - | + | - | - | - | +|OTEL_EXPORTER_JAEGER_* | - | | | | | - | - | | - | - | - | |OTEL_EXPORTER_ZIPKIN_* | - | + | | + | + | - | - | - | - | - | - | |OTEL_TRACES_EXPORTER | - | + | | + | + | + | | - | | | | |OTEL_METRICS_EXPORTER | - | + | | + | - | - | | - | | - | - | diff --git a/specification/protocol/exporter.md b/specification/protocol/exporter.md index 88aa8bfc4df..c3103928f9a 100644 --- a/specification/protocol/exporter.md +++ b/specification/protocol/exporter.md @@ -14,7 +14,7 @@ The following configuration options MUST be available to configure the OTLP expo | Certificate File | Path to certificate file for TLS credentials of gRPC client. Should only be used for a secure connection. | n/a | `OTEL_EXPORTER_OTLP_CERTIFICATE` `OTEL_EXPORTER_OTLP_TRACES_CERTIFICATE` `OTEL_EXPORTER_OTLP_METRICS_CERTIFICATE` | | Headers | Key-value pairs to be used as headers associated with gRPC or HTTP requests. See [Specifying headers](./exporter.md#specifying-headers-via-environment-variables) for more details. | n/a | `OTEL_EXPORTER_OTLP_HEADERS` `OTEL_EXPORTER_OTLP_TRACES_HEADERS` `OTEL_EXPORTER_OTLP_METRICS_HEADERS` | | Compression | Compression key for supported compression types. Supported compression: `gzip`| No value | `OTEL_EXPORTER_OTLP_COMPRESSION` `OTEL_EXPORTER_OTLP_TRACES_COMPRESSION` `OTEL_EXPORTER_OTLP_METRICS_COMPRESSION` | -| Timeout | Max waiting time for the backend to process each spans or metrics batch. | 10s | `OTEL_EXPORTER_OTLP_TIMEOUT` `OTEL_EXPORTER_OTLP_TRACES_TIMEOUT` `OTEL_EXPORTER_OTLP_METRICS_TIMEOUT` | +| Timeout | Maximum time the OTLP exporter will wait for each batch export. | 10s | `OTEL_EXPORTER_OTLP_TIMEOUT` `OTEL_EXPORTER_OTLP_TRACES_TIMEOUT` `OTEL_EXPORTER_OTLP_METRICS_TIMEOUT` | Supported values for `OTEL_EXPORTER_OTLP_*COMPRESSION` options: diff --git a/specification/sdk-environment-variables.md b/specification/sdk-environment-variables.md index 6a7033be3b2..729b704ad2d 100644 --- a/specification/sdk-environment-variables.md +++ b/specification/sdk-environment-variables.md @@ -91,13 +91,14 @@ See [OpenTelemetry Protocol Exporter Configuration Options](./protocol/exporter. **Status**: [Stable](document-status.md) -| Name | Description | Default | -| ------------------------------- | ------------------------------------------------- | ------------------------------------------------------------------------------------------------ | -| OTEL_EXPORTER_JAEGER_AGENT_HOST | Hostname for the Jaeger agent | "localhost" | -| OTEL_EXPORTER_JAEGER_AGENT_PORT | Port for the Jaeger agent | 6832 | -| OTEL_EXPORTER_JAEGER_ENDPOINT | HTTP endpoint for Jaeger traces | "http://localhost:14250" | -| OTEL_EXPORTER_JAEGER_USER | Username to be used for HTTP basic authentication | - | -| OTEL_EXPORTER_JAEGER_PASSWORD | Password to be used for HTTP basic authentication | - | +| Name | Description | Default | +|---------------------------------|------------------------------------------------------------------|--------------------------------------------------------------------------------------------------| +| OTEL_EXPORTER_JAEGER_AGENT_HOST | Hostname for the Jaeger agent | "localhost" | +| OTEL_EXPORTER_JAEGER_AGENT_PORT | Port for the Jaeger agent | 6832 | +| OTEL_EXPORTER_JAEGER_ENDPOINT | HTTP endpoint for Jaeger traces | "http://localhost:14250" | +| OTEL_EXPORTER_JAEGER_TIMEOUT | Maximum time the Jaeger exporter will wait for each batch export | 10s | +| OTEL_EXPORTER_JAEGER_USER | Username to be used for HTTP basic authentication | - | +| OTEL_EXPORTER_JAEGER_PASSWORD | Password to be used for HTTP basic authentication | - | ## Zipkin Exporter