Skip to content

Commit f7dc1dc

Browse files
authored
Prepare for 1.29.0 release (#5698)
1 parent 7ee92eb commit f7dc1dc

File tree

11 files changed

+118
-33
lines changed

11 files changed

+118
-33
lines changed

CHANGELOG.md

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,74 @@
22

33
## Unreleased
44

5+
### API
6+
7+
* Update Span javadoc to allow null/empty attr values
8+
([#5616](https://github.com/open-telemetry/opentelemetry-java/pull/5616))
9+
10+
### SDK
11+
12+
* Add Sdk{Signal}ProviderBuilder#addResource(Resource) method to merge Resource
13+
with current
14+
([#5619](https://github.com/open-telemetry/opentelemetry-java/pull/5619))
15+
16+
#### Metrics
17+
18+
* Add LongHistogramAdviceConfigurer to improve api surface types
19+
([#5689](https://github.com/open-telemetry/opentelemetry-java/pull/5689))
20+
* Instruments with names which are case-insensitive equal contribute to same
21+
metric, advice is not part of instrument identity.
22+
([#5701](https://github.com/open-telemetry/opentelemetry-java/pull/5701))
23+
24+
#### Exporter
25+
26+
* Add OtlpHttp{Signal}Exporter#toBuilder() methods
27+
([#5652](https://github.com/open-telemetry/opentelemetry-java/pull/5652))
28+
* Add OtlpGrpc{Signal}Exporter#toBuilder() methods
29+
([#5680](https://github.com/open-telemetry/opentelemetry-java/pull/5680))
30+
* Add #toString to OTLP exporters
31+
([#5686](https://github.com/open-telemetry/opentelemetry-java/pull/5686))
32+
* Break out GrpcSender, GrpcSenderProvider
33+
([#5617](https://github.com/open-telemetry/opentelemetry-java/pull/5617))
34+
35+
#### SDK Extensions
36+
37+
* BREAKING: Delete zpages
38+
([#5611](https://github.com/open-telemetry/opentelemetry-java/pull/5611))
39+
* Initialize file configuration with generated model classes and parse method
40+
([#5399](https://github.com/open-telemetry/opentelemetry-java/pull/5399))
41+
* Refactor SpiUtil to improve mocking
42+
([#5679](https://github.com/open-telemetry/opentelemetry-java/pull/5679))
43+
* Switch from snakeyaml to snakeyaml engine
44+
([#5691](https://github.com/open-telemetry/opentelemetry-java/pull/5691))
45+
* Add experimental autoconfigure support for customizing cardinality limit
46+
([#5659](https://github.com/open-telemetry/opentelemetry-java/pull/5659))
47+
* Reorganize autoconfigure docs by signal
48+
([#5665](https://github.com/open-telemetry/opentelemetry-java/pull/5665))
49+
50+
#### Testing
51+
52+
* Add hasResourceSatisfying to LogRecordDataAssert
53+
([#5690](https://github.com/open-telemetry/opentelemetry-java/pull/5690))
54+
55+
### OpenCensus Shim
56+
57+
* Change OpenCensus shim default sampling to defer to OpenTelemetry
58+
([#5604](https://github.com/open-telemetry/opentelemetry-java/pull/5604))
59+
60+
### Project Tooling
61+
62+
* Update Gradle Wrapper from 8.2 to 8.2.1
63+
([#5618](https://github.com/open-telemetry/opentelemetry-java/pull/5618))
64+
* Fix gradle java version requirement warning
65+
([#5624](https://github.com/open-telemetry/opentelemetry-java/pull/5624))
66+
* Refer to Adoptium/Temurin instead of AdoptOpenJDK
67+
([#5636](https://github.com/open-telemetry/opentelemetry-java/pull/5636))
68+
* Use OtelVersionClassPlugin instead of reading version from resource
69+
([#5622](https://github.com/open-telemetry/opentelemetry-java/pull/5622))
70+
* Enforce build-graal success in required status check
71+
([#5696](https://github.com/open-telemetry/opentelemetry-java/pull/5696))
72+
573
## Version 1.28.0 (2023-07-07)
674

775
[opentelemetry-sdk-extension-autoconfigure](./sdk-extensions/autoconfigure) is now stable! See "SDK

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogRecordExporter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ public static OtlpHttpLogRecordExporterBuilder builder() {
5757
* Returns a builder with configuration values equal to those for this exporter.
5858
*
5959
* <p>IMPORTANT: Be sure to {@link #shutdown()} this instance if it will no longer be used.
60+
*
61+
* @since 1.29.0
6062
*/
6163
public OtlpHttpLogRecordExporterBuilder toBuilder() {
6264
return new OtlpHttpLogRecordExporterBuilder(builder.copy());

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ public static OtlpHttpMetricExporterBuilder builder() {
6868
* Returns a builder with configuration values equal to those for this exporter.
6969
*
7070
* <p>IMPORTANT: Be sure to {@link #shutdown()} this instance if it will no longer be used.
71+
*
72+
* @since 1.29.0
7173
*/
7274
public OtlpHttpMetricExporterBuilder toBuilder() {
7375
return new OtlpHttpMetricExporterBuilder(builder.copy());

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/trace/OtlpHttpSpanExporter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ public static OtlpHttpSpanExporterBuilder builder() {
5757
* Returns a builder with configuration values equal to those for this exporter.
5858
*
5959
* <p>IMPORTANT: Be sure to {@link #shutdown()} this instance if it will no longer be used.
60+
*
61+
* @since 1.29.0
6062
*/
6163
public OtlpHttpSpanExporterBuilder toBuilder() {
6264
return new OtlpHttpSpanExporterBuilder(builder.copy());

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogRecordExporter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ public static OtlpGrpcLogRecordExporterBuilder builder() {
5757
* Returns a builder with configuration values equal to those for this exporter.
5858
*
5959
* <p>IMPORTANT: Be sure to {@link #shutdown()} this instance if it will no longer be used.
60+
*
61+
* @since 1.29.0
6062
*/
6163
public OtlpGrpcLogRecordExporterBuilder toBuilder() {
6264
return new OtlpGrpcLogRecordExporterBuilder(builder.copy());

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ public static OtlpGrpcMetricExporterBuilder builder() {
6868
* Returns a builder with configuration values equal to those for this exporter.
6969
*
7070
* <p>IMPORTANT: Be sure to {@link #shutdown()} this instance if it will no longer be used.
71+
*
72+
* @since 1.29.0
7173
*/
7274
public OtlpGrpcMetricExporterBuilder toBuilder() {
7375
return new OtlpGrpcMetricExporterBuilder(builder.copy());

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ public static OtlpGrpcSpanExporterBuilder builder() {
5353
* Returns a builder with configuration values equal to those for this exporter.
5454
*
5555
* <p>IMPORTANT: Be sure to {@link #shutdown()} this instance if it will no longer be used.
56+
*
57+
* @since 1.29.0
5658
*/
5759
public OtlpGrpcSpanExporterBuilder toBuilder() {
5860
return new OtlpGrpcSpanExporterBuilder(builder.copy());

sdk/common/src/main/java/io/opentelemetry/sdk/common/export/RetryPolicy.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ public static RetryPolicyBuilder builder() {
4949
/**
5050
* Returns a {@link RetryPolicyBuilder} reflecting configuration values for this {@link
5151
* RetryPolicy}.
52+
*
53+
* @since 1.29.0
5254
*/
5355
public abstract RetryPolicyBuilder toBuilder();
5456

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLoggerProviderBuilder.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,18 @@ public SdkLoggerProviderBuilder setResource(Resource resource) {
4545
return this;
4646
}
4747

48+
/**
49+
* Merge a {@link Resource} with the current.
50+
*
51+
* @param resource {@link Resource} to merge with current.
52+
* @since 1.29.0
53+
*/
54+
public SdkLoggerProviderBuilder addResource(Resource resource) {
55+
Objects.requireNonNull(resource, "resource");
56+
this.resource = this.resource.merge(resource);
57+
return this;
58+
}
59+
4860
/**
4961
* Assign a {@link Supplier} of {@link LogLimits}. {@link LogLimits} will be retrieved each time a
5062
* {@link Logger#logRecordBuilder()} is called.
@@ -96,15 +108,4 @@ public SdkLoggerProviderBuilder setClock(Clock clock) {
96108
public SdkLoggerProvider build() {
97109
return new SdkLoggerProvider(resource, logLimitsSupplier, logRecordProcessors, clock);
98110
}
99-
100-
/**
101-
* Merge custom resource object with the current resource object.
102-
*
103-
* @param resource {@link Resource} object to merge with current.
104-
*/
105-
public SdkLoggerProviderBuilder addResource(Resource resource) {
106-
Objects.requireNonNull(resource, "resource");
107-
this.resource = this.resource.merge(resource);
108-
return this;
109-
}
110111
}

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeterProviderBuilder.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,18 @@ public SdkMeterProviderBuilder setResource(Resource resource) {
5959
return this;
6060
}
6161

62+
/**
63+
* Merge a {@link Resource} with the current.
64+
*
65+
* @param resource {@link Resource} to merge with current.
66+
* @since 1.29.0
67+
*/
68+
public SdkMeterProviderBuilder addResource(Resource resource) {
69+
Objects.requireNonNull(resource, "resource");
70+
this.resource = this.resource.merge(resource);
71+
return this;
72+
}
73+
6274
/**
6375
* Assign an {@link ExemplarFilter} for all metrics created by Meters.
6476
*
@@ -134,15 +146,4 @@ SdkMeterProviderBuilder registerMetricReader(
134146
public SdkMeterProvider build() {
135147
return new SdkMeterProvider(registeredViews, metricReaders, clock, resource, exemplarFilter);
136148
}
137-
138-
/**
139-
* Merge custom resource object with the current resource object.
140-
*
141-
* @param resource {@link Resource} object to merge with current.
142-
*/
143-
public SdkMeterProviderBuilder addResource(Resource resource) {
144-
Objects.requireNonNull(resource, "resource");
145-
this.resource = this.resource.merge(resource);
146-
return this;
147-
}
148149
}

0 commit comments

Comments
 (0)