From 710587680b17239d072bd3b9bc815c6ce168b09e Mon Sep 17 00:00:00 2001
From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com>
Date: Fri, 9 Dec 2022 11:54:41 -0800
Subject: [PATCH] [release/v1.21.x] Prepare release 1.21.0 (#5035)

* Prepare release 1.21.0

* Fix version-dependent test

Co-authored-by: Jack Berg <jberg@newrelic.com>
---
 CHANGELOG.md                                               | 2 +-
 .../io/opentelemetry/sdk/logs/SdkLoggerProviderTest.java   | 7 +++++--
 version.gradle.kts                                         | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 101ba009e5b..442cf24849c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## Unreleased
+## Version 1.21.0 (2022-12-09)
 
 ### API
 
diff --git a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerProviderTest.java b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerProviderTest.java
index b663d70de59..b8cafd34377 100644
--- a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerProviderTest.java
+++ b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerProviderTest.java
@@ -55,7 +55,10 @@ class SdkLoggerProviderTest {
   @BeforeEach
   void setup() {
     sdkLoggerProvider =
-        SdkLoggerProvider.builder().addLogRecordProcessor(logRecordProcessor).build();
+        SdkLoggerProvider.builder()
+            .setResource(Resource.empty().toBuilder().put("key", "value").build())
+            .addLogRecordProcessor(logRecordProcessor)
+            .build();
     when(logRecordProcessor.forceFlush()).thenReturn(CompletableResultCode.ofSuccess());
     when(logRecordProcessor.shutdown()).thenReturn(CompletableResultCode.ofSuccess());
   }
@@ -354,7 +357,7 @@ void toString_Valid() {
         .isEqualTo(
             "SdkLoggerProvider{"
                 + "clock=SystemClock{}, "
-                + "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\"}}, "
+                + "resource=Resource{schemaUrl=null, attributes={key=\"value\"}}, "
                 + "logLimits=LogLimits{maxNumberOfAttributes=128, maxAttributeValueLength=2147483647}, "
                 + "logRecordProcessor=MockLogRecordProcessor"
                 + "}");
diff --git a/version.gradle.kts b/version.gradle.kts
index 9f0ea4ac9b8..10c636439b1 100644
--- a/version.gradle.kts
+++ b/version.gradle.kts
@@ -1,4 +1,4 @@
-val snapshot = true
+val snapshot = false
 
 allprojects {
   var ver = "1.21.0"