Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-java into prepare-1.60.0

Author: jack-berg

exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/ProtoSerializer.java

@@ -277,9 +277,9 @@ public void writeSerializedMessage(byte[] protoSerialized, String jsonSerialized
 
   @Override
   public void close() throws IOException {
+    idCache.clear();
     try {
       output.flush();
-      idCache.clear();
     } catch (IOException e) {
       // If close is called automatically as part of try-with-resources, it's possible that
       // output.flush() will throw the same exception. Re-throwing the same exception in a finally

sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/LegacySpanProcessorInstrumentation.java

@@ -58,7 +58,7 @@ public void dropSpans(int count) {
   @Override
   public void finishSpans(int count, @Nullable String error) {
     // Legacy metrics only record when no error.
-    if (error != null) {
+    if (error == null) {
       processedSpans().add(count, standardAttrs);
     }
   }