fix architecture test

Author: zeitlinger

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/ExtendedOpenTelemetrySdk.java

@@ -8,12 +8,12 @@
 import io.opentelemetry.api.incubator.ExtendedOpenTelemetry;
 import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
-import io.opentelemetry.sdk.WithShutdown;
+import java.io.Closeable;
 import java.lang.reflect.Field;
 import javax.annotation.Nullable;
 
 /** A new interface for creating OpenTelemetrySdk that supports getting {@link ConfigProvider}. */
-public interface ExtendedOpenTelemetrySdk extends ExtendedOpenTelemetry, WithShutdown {
+public interface ExtendedOpenTelemetrySdk extends ExtendedOpenTelemetry, Closeable {
   /** Returns a builder for {@link ExtendedOpenTelemetrySdk}. */
   static ExtendedOpenTelemetrySdkBuilder builder() {
     return new ExtendedOpenTelemetrySdkBuilder();

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/ObfuscatedExtendedOpenTelemetrySdk.java

@@ -20,6 +20,7 @@
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 import javax.annotation.concurrent.ThreadSafe;
@@ -49,7 +50,6 @@ public ObfuscatedExtendedOpenTelemetrySdk(
     this.propagators = propagators;
   }
 
-  @Override
   public CompletableResultCode shutdown() {
     if (!isShutdown.compareAndSet(false, true)) {
       LOGGER.info("Multiple shutdown calls");
@@ -62,6 +62,11 @@ public CompletableResultCode shutdown() {
     return CompletableResultCode.ofAll(results);
   }
 
+  @Override
+  public void close() {
+    shutdown().join(10, TimeUnit.SECONDS);
+  }
+
   @Override
   public ConfigProvider getConfigProvider() {
     return configProvider;

sdk/all/src/main/java/io/opentelemetry/sdk/OpenTelemetrySdk.java

@@ -29,7 +29,7 @@
 
 /** The SDK implementation of {@link OpenTelemetry}. */
 @ThreadSafe
-public final class OpenTelemetrySdk implements OpenTelemetry, Closeable, WithShutdown {
+public final class OpenTelemetrySdk implements OpenTelemetry, Closeable {
 
   private static final Logger LOGGER = Logger.getLogger(OpenTelemetrySdk.class.getName());
 
@@ -100,7 +100,12 @@ public ContextPropagators getPropagators() {
     return propagators;
   }
 
-  @Override
+  /**
+   * Shutdown the SDK. Calls {@link SdkTracerProvider#shutdown()}, {@link
+   * SdkMeterProvider#shutdown()}, and {@link SdkLoggerProvider#shutdown()}.
+   *
+   * @return a {@link CompletableResultCode} which completes when all providers are shutdown
+   */
   public CompletableResultCode shutdown() {
     if (extendedOpenTelemetrySdk != null) {
       // If an ExtendedOpenTelemetrySdk is present, we delegate the shutdown to it.