Make EnvironmentResource.ATTRIBUTE_PROPERTY and createEnvironmentResource package-private

Both were public but only used within the autoconfigure module. ResourceFactory
(different package, same module) now uses ResourceConfiguration.createEnvironmentResource
and inlines the property name string instead.
Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>

Author: zeitlinger

sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/EnvironmentResource.java

@@ -23,20 +23,11 @@ public final class EnvironmentResource {
 
   private static final AttributeKey<String> SERVICE_NAME = AttributeKey.stringKey("service.name");
 
-  // Visible for testing
-  public static final String ATTRIBUTE_PROPERTY = "otel.resource.attributes";
+  static final String ATTRIBUTE_PROPERTY = "otel.resource.attributes";
   static final String SERVICE_NAME_PROPERTY = "otel.service.name";
 
-  /**
-   * Create a {@link Resource} from the environment. The resource contains attributes parsed from
-   * environment variables and system property keys {@code otel.resource.attributes} and {@code
-   * otel.service.name}.
-   *
-   * @param config the {@link ConfigProperties} used to obtain resource properties
-   * @return the resource.
-   */
   @SuppressWarnings("JdkObsolete") // Recommended alternative was introduced in java 10
-  public static Resource createEnvironmentResource(ConfigProperties config) {
+  static Resource createEnvironmentResource(ConfigProperties config) {
     AttributesBuilder resourceAttributes = Attributes.builder();
     for (Map.Entry<String, String> entry : config.getMap(ATTRIBUTE_PROPERTY).entrySet()) {
       resourceAttributes.put(

sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceFactory.java

@@ -5,10 +5,8 @@
 
 package io.opentelemetry.sdk.extension.incubator.fileconfig;
 
-import static io.opentelemetry.sdk.autoconfigure.EnvironmentResource.ATTRIBUTE_PROPERTY;
-import static io.opentelemetry.sdk.autoconfigure.EnvironmentResource.createEnvironmentResource;
-
 import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.sdk.autoconfigure.ResourceConfiguration;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
 import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeNameValueModel;
@@ -62,9 +60,9 @@ public Resource create(ResourceModel model, DeclarativeConfigContext context) {
     String attributeList = model.getAttributesList();
     if (attributeList != null) {
       builder.putAll(
-          createEnvironmentResource(
+          ResourceConfiguration.createEnvironmentResource(
               DefaultConfigProperties.createFromMap(
-                  Collections.singletonMap(ATTRIBUTE_PROPERTY, attributeList))));
+                  Collections.singletonMap("otel.resource.attributes", attributeList))));
     }
 
     List<AttributeNameValueModel> attributeNameValueModel = model.getAttributes();