extract extended opentelemetry only

Author: zeitlinger

api/incubator/src/main/java/io/opentelemetry/api/incubator/ExtendedOpenTelemetry.java

@@ -6,12 +6,12 @@
 package io.opentelemetry.api.incubator;
 
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.api.incubator.entities.EntityProvider;
+import io.opentelemetry.api.incubator.config.ConfigProvider;
 
-/** Extension to {@link OpenTelemetry} that adds {@link EntityProvider}. */
+/** Extension to {@link OpenTelemetry} that supports getting {@link ConfigProvider}. */
 public interface ExtendedOpenTelemetry extends OpenTelemetry {
-  /** Returns the {@link EntityProvider} for this {@link OpenTelemetry}. */
-  default EntityProvider getEntityProvider() {
-    return EntityProvider.noop();
+  /** Returns the {@link ConfigProvider} for this {@link OpenTelemetry}. */
+  default ConfigProvider getConfigProvider() {
+    return ConfigProvider.noop();
   }
 }

api/incubator/src/main/java/io/opentelemetry/api/incubator/entities/EntityBuilder.java

@@ -10,7 +10,6 @@
 import io.opentelemetry.exporter.internal.marshal.MarshalerWithSize;
 import io.opentelemetry.exporter.internal.marshal.Serializer;
 import io.opentelemetry.proto.resource.v1.internal.Resource;
-import io.opentelemetry.sdk.resources.internal.EntityUtil;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -38,10 +37,7 @@ public static ResourceMarshaler create(io.opentelemetry.sdk.resources.Resource r
 
       RealResourceMarshaler realMarshaler =
           new RealResourceMarshaler(
-              KeyValueMarshaler.createForAttributes(resource.getAttributes()),
-              EntityUtil.getEntities(resource).stream()
-                  .map(EntityRefMarshaler::createForEntity)
-                  .toArray(MarshalerWithSize[]::new));
+              KeyValueMarshaler.createForAttributes(resource.getAttributes()));
 
       ByteArrayOutputStream binaryBos =
           new ByteArrayOutputStream(realMarshaler.getBinarySerializedSize());
@@ -74,26 +70,19 @@ public void writeTo(Serializer output) throws IOException {
 
   private static final class RealResourceMarshaler extends MarshalerWithSize {
     private final KeyValueMarshaler[] attributes;
-    private final MarshalerWithSize[] entityRefs;
 
-    private RealResourceMarshaler(KeyValueMarshaler[] attributes, MarshalerWithSize[] entityRefs) {
-      super(calculateSize(attributes, entityRefs));
+    private RealResourceMarshaler(KeyValueMarshaler[] attributes) {
+      super(calculateSize(attributes));
       this.attributes = attributes;
-      this.entityRefs = entityRefs;
     }
 
     @Override
     protected void writeTo(Serializer output) throws IOException {
       output.serializeRepeatedMessage(Resource.ATTRIBUTES, attributes);
-      output.serializeRepeatedMessage(Resource.ENTITY_REFS, entityRefs);
     }
 
-    private static int calculateSize(
-        KeyValueMarshaler[] attributeMarshalers, MarshalerWithSize[] entityRefs) {
-      int size = 0;
-      size += MarshalerUtil.sizeRepeatedMessage(Resource.ATTRIBUTES, attributeMarshalers);
-      size += size += MarshalerUtil.sizeRepeatedMessage(Resource.ENTITY_REFS, entityRefs);
-      return size;
+    private static int calculateSize(KeyValueMarshaler[] attributeMarshalers) {
+      return MarshalerUtil.sizeRepeatedMessage(Resource.ATTRIBUTES, attributeMarshalers);
     }
   }
 }