Skip to content

Commit 7105876

Browse files
[release/v1.21.x] Prepare release 1.21.0 (#5035)
* Prepare release 1.21.0 * Fix version-dependent test Co-authored-by: Jack Berg <[email protected]>
1 parent ca18354 commit 7105876

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changelog
22

3-
## Unreleased
3+
## Version 1.21.0 (2022-12-09)
44

55
### API
66

sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerProviderTest.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ class SdkLoggerProviderTest {
5555
@BeforeEach
5656
void setup() {
5757
sdkLoggerProvider =
58-
SdkLoggerProvider.builder().addLogRecordProcessor(logRecordProcessor).build();
58+
SdkLoggerProvider.builder()
59+
.setResource(Resource.empty().toBuilder().put("key", "value").build())
60+
.addLogRecordProcessor(logRecordProcessor)
61+
.build();
5962
when(logRecordProcessor.forceFlush()).thenReturn(CompletableResultCode.ofSuccess());
6063
when(logRecordProcessor.shutdown()).thenReturn(CompletableResultCode.ofSuccess());
6164
}
@@ -354,7 +357,7 @@ void toString_Valid() {
354357
.isEqualTo(
355358
"SdkLoggerProvider{"
356359
+ "clock=SystemClock{}, "
357-
+ "resource=Resource{schemaUrl=null, attributes={service.name=\"unknown_service:java\", telemetry.sdk.language=\"java\", telemetry.sdk.name=\"opentelemetry\", telemetry.sdk.version=\"1.21.0-SNAPSHOT\"}}, "
360+
+ "resource=Resource{schemaUrl=null, attributes={key=\"value\"}}, "
358361
+ "logLimits=LogLimits{maxNumberOfAttributes=128, maxAttributeValueLength=2147483647}, "
359362
+ "logRecordProcessor=MockLogRecordProcessor"
360363
+ "}");

version.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
val snapshot = true
1+
val snapshot = false
22

33
allprojects {
44
var ver = "1.21.0"

0 commit comments

Comments
 (0)