More cleanup

Author: jack-berg

sdk/common/src/main/java/io/opentelemetry/sdk/internal/DefaultExceptionAttributeResolver.java

@@ -27,17 +27,24 @@ public static ExceptionAttributeResolver getInstance() {
   @Override
   public void setExceptionAttributes(
       AttributeSetter attributeSetter, Throwable throwable, int maxAttributeLength) {
-    attributeSetter.setAttribute(
-        ExceptionAttributeResolver.EXCEPTION_TYPE, throwable.getClass().getCanonicalName());
-    String message = throwable.getMessage();
-    if (message != null) {
-      attributeSetter.setAttribute(ExceptionAttributeResolver.EXCEPTION_MESSAGE, message);
+    String exceptionType = throwable.getClass().getCanonicalName();
+    if (exceptionType != null) {
+      attributeSetter.setAttribute(ExceptionAttributeResolver.EXCEPTION_TYPE, exceptionType);
     }
+
+    String exceptionMessage = throwable.getMessage();
+    if (exceptionMessage != null) {
+      attributeSetter.setAttribute(ExceptionAttributeResolver.EXCEPTION_MESSAGE, exceptionMessage);
+    }
+
     StringWriter stringWriter = new StringWriter();
     try (PrintWriter printWriter = new PrintWriter(stringWriter)) {
       throwable.printStackTrace(printWriter);
     }
-    attributeSetter.setAttribute(
-        ExceptionAttributeResolver.EXCEPTION_STACKTRACE, stringWriter.toString());
+    String exceptionStacktrace = stringWriter.toString();
+    if (exceptionStacktrace != null) {
+      attributeSetter.setAttribute(
+          ExceptionAttributeResolver.EXCEPTION_STACKTRACE, exceptionStacktrace);
+    }
   }
 }

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

@@ -105,7 +105,7 @@ public <T> ExtendedSdkReadWriteLogRecord setAttribute(ExtendedAttributeKey<T> ke
             ExtendedAttributesMap.create(
                 logLimits.getMaxNumberOfAttributes(), logLimits.getMaxAttributeValueLength());
       }
-      extendedAttributes.putIfCapacity(key, value);
+      extendedAttributes.put(key, value);
     }
     return this;
   }

sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpanBuilder.java

@@ -150,7 +150,7 @@ public <T> SpanBuilder setAttribute(AttributeKey<T> key, T value) {
     if (key == null || key.getKey().isEmpty() || value == null) {
       return this;
     }
-    attributes().putIfCapacity(key, value);
+    attributes().put(key, value);
     return this;
   }
 
@@ -209,8 +209,7 @@ public Span startSpan() {
     }
     Attributes samplingAttributes = samplingResult.getAttributes();
     if (!samplingAttributes.isEmpty()) {
-      samplingAttributes.forEach(
-          (key, value) -> attributes().putIfCapacity((AttributeKey) key, value));
+      samplingAttributes.forEach((key, value) -> attributes().put((AttributeKey) key, value));
     }
 
     // Avoid any possibility to modify the attributes by adding attributes to the Builder after the

sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanTest.java

@@ -70,7 +70,6 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;