Skip to content

Commit

Permalink
Prepare for 1.29.0 release (#5698)
Browse files Browse the repository at this point in the history
  • Loading branch information
jack-berg authored Aug 11, 2023
1 parent 7ee92eb commit f7dc1dc
Show file tree
Hide file tree
Showing 11 changed files with 118 additions and 33 deletions.
68 changes: 68 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,74 @@

## Unreleased

### API

* Update Span javadoc to allow null/empty attr values
([#5616](https://github.com/open-telemetry/opentelemetry-java/pull/5616))

### SDK

* Add Sdk{Signal}ProviderBuilder#addResource(Resource) method to merge Resource
with current
([#5619](https://github.com/open-telemetry/opentelemetry-java/pull/5619))

#### Metrics

* Add LongHistogramAdviceConfigurer to improve api surface types
([#5689](https://github.com/open-telemetry/opentelemetry-java/pull/5689))
* Instruments with names which are case-insensitive equal contribute to same
metric, advice is not part of instrument identity.
([#5701](https://github.com/open-telemetry/opentelemetry-java/pull/5701))

#### Exporter

* Add OtlpHttp{Signal}Exporter#toBuilder() methods
([#5652](https://github.com/open-telemetry/opentelemetry-java/pull/5652))
* Add OtlpGrpc{Signal}Exporter#toBuilder() methods
([#5680](https://github.com/open-telemetry/opentelemetry-java/pull/5680))
* Add #toString to OTLP exporters
([#5686](https://github.com/open-telemetry/opentelemetry-java/pull/5686))
* Break out GrpcSender, GrpcSenderProvider
([#5617](https://github.com/open-telemetry/opentelemetry-java/pull/5617))

#### SDK Extensions

* BREAKING: Delete zpages
([#5611](https://github.com/open-telemetry/opentelemetry-java/pull/5611))
* Initialize file configuration with generated model classes and parse method
([#5399](https://github.com/open-telemetry/opentelemetry-java/pull/5399))
* Refactor SpiUtil to improve mocking
([#5679](https://github.com/open-telemetry/opentelemetry-java/pull/5679))
* Switch from snakeyaml to snakeyaml engine
([#5691](https://github.com/open-telemetry/opentelemetry-java/pull/5691))
* Add experimental autoconfigure support for customizing cardinality limit
([#5659](https://github.com/open-telemetry/opentelemetry-java/pull/5659))
* Reorganize autoconfigure docs by signal
([#5665](https://github.com/open-telemetry/opentelemetry-java/pull/5665))

#### Testing

* Add hasResourceSatisfying to LogRecordDataAssert
([#5690](https://github.com/open-telemetry/opentelemetry-java/pull/5690))

### OpenCensus Shim

* Change OpenCensus shim default sampling to defer to OpenTelemetry
([#5604](https://github.com/open-telemetry/opentelemetry-java/pull/5604))

### Project Tooling

* Update Gradle Wrapper from 8.2 to 8.2.1
([#5618](https://github.com/open-telemetry/opentelemetry-java/pull/5618))
* Fix gradle java version requirement warning
([#5624](https://github.com/open-telemetry/opentelemetry-java/pull/5624))
* Refer to Adoptium/Temurin instead of AdoptOpenJDK
([#5636](https://github.com/open-telemetry/opentelemetry-java/pull/5636))
* Use OtelVersionClassPlugin instead of reading version from resource
([#5622](https://github.com/open-telemetry/opentelemetry-java/pull/5622))
* Enforce build-graal success in required status check
([#5696](https://github.com/open-telemetry/opentelemetry-java/pull/5696))

## Version 1.28.0 (2023-07-07)

[opentelemetry-sdk-extension-autoconfigure](./sdk-extensions/autoconfigure) is now stable! See "SDK
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ public static OtlpHttpLogRecordExporterBuilder builder() {
* Returns a builder with configuration values equal to those for this exporter.
*
* <p>IMPORTANT: Be sure to {@link #shutdown()} this instance if it will no longer be used.
*
* @since 1.29.0
*/
public OtlpHttpLogRecordExporterBuilder toBuilder() {
return new OtlpHttpLogRecordExporterBuilder(builder.copy());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ public static OtlpHttpMetricExporterBuilder builder() {
* Returns a builder with configuration values equal to those for this exporter.
*
* <p>IMPORTANT: Be sure to {@link #shutdown()} this instance if it will no longer be used.
*
* @since 1.29.0
*/
public OtlpHttpMetricExporterBuilder toBuilder() {
return new OtlpHttpMetricExporterBuilder(builder.copy());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ public static OtlpHttpSpanExporterBuilder builder() {
* Returns a builder with configuration values equal to those for this exporter.
*
* <p>IMPORTANT: Be sure to {@link #shutdown()} this instance if it will no longer be used.
*
* @since 1.29.0
*/
public OtlpHttpSpanExporterBuilder toBuilder() {
return new OtlpHttpSpanExporterBuilder(builder.copy());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ public static OtlpGrpcLogRecordExporterBuilder builder() {
* Returns a builder with configuration values equal to those for this exporter.
*
* <p>IMPORTANT: Be sure to {@link #shutdown()} this instance if it will no longer be used.
*
* @since 1.29.0
*/
public OtlpGrpcLogRecordExporterBuilder toBuilder() {
return new OtlpGrpcLogRecordExporterBuilder(builder.copy());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ public static OtlpGrpcMetricExporterBuilder builder() {
* Returns a builder with configuration values equal to those for this exporter.
*
* <p>IMPORTANT: Be sure to {@link #shutdown()} this instance if it will no longer be used.
*
* @since 1.29.0
*/
public OtlpGrpcMetricExporterBuilder toBuilder() {
return new OtlpGrpcMetricExporterBuilder(builder.copy());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ public static OtlpGrpcSpanExporterBuilder builder() {
* Returns a builder with configuration values equal to those for this exporter.
*
* <p>IMPORTANT: Be sure to {@link #shutdown()} this instance if it will no longer be used.
*
* @since 1.29.0
*/
public OtlpGrpcSpanExporterBuilder toBuilder() {
return new OtlpGrpcSpanExporterBuilder(builder.copy());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ public static RetryPolicyBuilder builder() {
/**
* Returns a {@link RetryPolicyBuilder} reflecting configuration values for this {@link
* RetryPolicy}.
*
* @since 1.29.0
*/
public abstract RetryPolicyBuilder toBuilder();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,18 @@ public SdkLoggerProviderBuilder setResource(Resource resource) {
return this;
}

/**
* Merge a {@link Resource} with the current.
*
* @param resource {@link Resource} to merge with current.
* @since 1.29.0
*/
public SdkLoggerProviderBuilder addResource(Resource resource) {
Objects.requireNonNull(resource, "resource");
this.resource = this.resource.merge(resource);
return this;
}

/**
* Assign a {@link Supplier} of {@link LogLimits}. {@link LogLimits} will be retrieved each time a
* {@link Logger#logRecordBuilder()} is called.
Expand Down Expand Up @@ -96,15 +108,4 @@ public SdkLoggerProviderBuilder setClock(Clock clock) {
public SdkLoggerProvider build() {
return new SdkLoggerProvider(resource, logLimitsSupplier, logRecordProcessors, clock);
}

/**
* Merge custom resource object with the current resource object.
*
* @param resource {@link Resource} object to merge with current.
*/
public SdkLoggerProviderBuilder addResource(Resource resource) {
Objects.requireNonNull(resource, "resource");
this.resource = this.resource.merge(resource);
return this;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,18 @@ public SdkMeterProviderBuilder setResource(Resource resource) {
return this;
}

/**
* Merge a {@link Resource} with the current.
*
* @param resource {@link Resource} to merge with current.
* @since 1.29.0
*/
public SdkMeterProviderBuilder addResource(Resource resource) {
Objects.requireNonNull(resource, "resource");
this.resource = this.resource.merge(resource);
return this;
}

/**
* Assign an {@link ExemplarFilter} for all metrics created by Meters.
*
Expand Down Expand Up @@ -134,15 +146,4 @@ SdkMeterProviderBuilder registerMetricReader(
public SdkMeterProvider build() {
return new SdkMeterProvider(registeredViews, metricReaders, clock, resource, exemplarFilter);
}

/**
* Merge custom resource object with the current resource object.
*
* @param resource {@link Resource} object to merge with current.
*/
public SdkMeterProviderBuilder addResource(Resource resource) {
Objects.requireNonNull(resource, "resource");
this.resource = this.resource.merge(resource);
return this;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,18 @@ public SdkTracerProviderBuilder setResource(Resource resource) {
return this;
}

/**
* Merge a {@link Resource} with the current.
*
* @param resource {@link Resource} to merge with current.
* @since 1.29.0
*/
public SdkTracerProviderBuilder addResource(Resource resource) {
Objects.requireNonNull(resource, "resource");
this.resource = this.resource.merge(resource);
return this;
}

/**
* Assign an initial {@link SpanLimits} that should be used with this SDK.
*
Expand Down Expand Up @@ -146,15 +158,4 @@ public SdkTracerProvider build() {
}

SdkTracerProviderBuilder() {}

/**
* Merge custom resource object with the current resource object.
*
* @param resource {@link Resource} object to merge with current.
*/
public SdkTracerProviderBuilder addResource(Resource resource) {
Objects.requireNonNull(resource, "resource");
this.resource = this.resource.merge(resource);
return this;
}
}

0 comments on commit f7dc1dc

Please sign in to comment.