Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,34 @@

## Unreleased

### SDK

#### Traces

* Fault in SdkSpan.events
([#6244](https://github.com/open-telemetry/opentelemetry-java/pull/6244))

#### Exporters

* Add basic proxy configuration to OtlpHttp{Signal}Exporters
([#6270](https://github.com/open-telemetry/opentelemetry-java/pull/6270))
* Add connectTimeout configuration option OtlpGrpc{Signal}Exporters
([#6079](https://github.com/open-telemetry/opentelemetry-java/pull/6079))

#### Extensions

* Add ComponentLoader to autoconfigure support more scenarios
([#6217](https://github.com/open-telemetry/opentelemetry-java/pull/6217))
* Added MetricReader customizer for AutoConfiguredOpenTelemetrySdkBuilder
([#6231](https://github.com/open-telemetry/opentelemetry-java/pull/6231))
* Return AutoConfiguredOpenTelemetrySdkBuilder instead of the base type
([#6248](https://github.com/open-telemetry/opentelemetry-java/pull/6248))

### Tooling

* Add note about draft PRs to CONTRIBUTING.md
([#6247](https://github.com/open-telemetry/opentelemetry-java/pull/6247))

## Version 1.35.0 (2024-02-09)

**NOTE:** The `opentelemetry-exporter-jaeger` and `opentelemetry-exporter-jaeger-thift` artifacts
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,11 @@ public OtlpHttpLogRecordExporterBuilder setRetryPolicy(RetryPolicy retryPolicy)
return this;
}

/** Sets the proxy options. Proxying is disabled by default. */
/**
* Sets the proxy options. Proxying is disabled by default.
*
* @since 1.36.0
*/
public OtlpHttpLogRecordExporterBuilder setProxyOptions(ProxyOptions proxyOptions) {
requireNonNull(proxyOptions, "proxyOptions");
delegate.setProxyOptions(proxyOptions);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,11 @@ public OtlpHttpMetricExporterBuilder setRetryPolicy(RetryPolicy retryPolicy) {
return this;
}

/** Sets the proxy options. Proxying is disabled by default. */
/**
* Sets the proxy options. Proxying is disabled by default.
*
* @since 1.36.0
*/
public OtlpHttpMetricExporterBuilder setProxyOptions(ProxyOptions proxyOptions) {
requireNonNull(proxyOptions, "proxyOptions");
delegate.setProxyOptions(proxyOptions);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,11 @@ public OtlpHttpSpanExporterBuilder setRetryPolicy(RetryPolicy retryPolicy) {
return this;
}

/** Sets the proxy options. Proxying is disabled by default. */
/**
* Sets the proxy options. Proxying is disabled by default.
*
* @since 1.36.0
*/
public OtlpHttpSpanExporterBuilder setProxy(ProxyOptions proxyOptions) {
requireNonNull(proxyOptions, "proxyOptions");
delegate.setProxyOptions(proxyOptions);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ public OtlpGrpcLogRecordExporterBuilder setTimeout(Duration timeout) {
/**
* Sets the maximum time to wait for new connections to be established. If unset, defaults to
* {@value GrpcExporterBuilder#DEFAULT_CONNECT_TIMEOUT_SECS}s.
*
* @since 1.36.0
*/
public OtlpGrpcLogRecordExporterBuilder setConnectTimeout(long timeout, TimeUnit unit) {
requireNonNull(unit, "unit");
Expand All @@ -115,6 +117,8 @@ public OtlpGrpcLogRecordExporterBuilder setConnectTimeout(long timeout, TimeUnit
/**
* Sets the maximum time to wait for new connections to be established. If unset, defaults to
* {@value GrpcExporterBuilder#DEFAULT_CONNECT_TIMEOUT_SECS}s.
*
* @since 1.36.0
*/
public OtlpGrpcLogRecordExporterBuilder setConnectTimeout(Duration timeout) {
requireNonNull(timeout, "timeout");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ public OtlpGrpcMetricExporterBuilder setTimeout(Duration timeout) {
/**
* Sets the maximum time to wait for new connections to be established. If unset, defaults to
* {@value GrpcExporterBuilder#DEFAULT_CONNECT_TIMEOUT_SECS}s.
*
* @since 1.36.0
*/
public OtlpGrpcMetricExporterBuilder setConnectTimeout(long timeout, TimeUnit unit) {
requireNonNull(unit, "unit");
Expand All @@ -127,6 +129,8 @@ public OtlpGrpcMetricExporterBuilder setConnectTimeout(long timeout, TimeUnit un
/**
* Sets the maximum time to wait for new connections to be established. If unset, defaults to
* {@value GrpcExporterBuilder#DEFAULT_CONNECT_TIMEOUT_SECS}s.
*
* @since 1.36.0
*/
public OtlpGrpcMetricExporterBuilder setConnectTimeout(Duration timeout) {
requireNonNull(timeout, "timeout");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ public OtlpGrpcSpanExporterBuilder setTimeout(Duration timeout) {
/**
* Sets the maximum time to wait for new connections to be established. If unset, defaults to
* {@value GrpcExporterBuilder#DEFAULT_CONNECT_TIMEOUT_SECS}s.
*
* @since 1.36.0
*/
public OtlpGrpcSpanExporterBuilder setConnectTimeout(long timeout, TimeUnit unit) {
requireNonNull(unit, "unit");
Expand All @@ -111,6 +113,8 @@ public OtlpGrpcSpanExporterBuilder setConnectTimeout(long timeout, TimeUnit unit
/**
* Sets the maximum time to wait for new connections to be established. If unset, defaults to
* {@value GrpcExporterBuilder#DEFAULT_CONNECT_TIMEOUT_SECS}s.
*
* @since 1.36.0
*/
public OtlpGrpcSpanExporterBuilder setConnectTimeout(Duration timeout) {
requireNonNull(timeout, "timeout");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ default AutoConfigurationCustomizer addMetricExporterCustomizer(
* customization. The return value of the {@link BiFunction} will replace the passed-in argument.
*
* <p>Multiple calls will execute the customizers in order.
*
* @since 1.36.0
*/
@SuppressWarnings("UnusedReturnValue")
default AutoConfigurationCustomizer addMetricReaderCustomizer(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@
import java.util.Collections;
import java.util.List;

/** Configuration for proxy settings. */
/**
* Configuration for proxy settings.
*
* @since 1.36.0
*/
public final class ProxyOptions {
private final ProxySelector proxySelector;

Expand Down