PR feedback

Author: jack-berg

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

@@ -36,6 +36,8 @@ public OpenTelemetrySdk create(
       throw new DeclarativeConfigException(
           "Unsupported file format. Supported formats include 0.4, 1.0*");
     }
+    // TODO(jack-berg): log warning if version is not exact match, which may result in unexpected
+    // behavior for experimental properties.
 
     if (Objects.equals(Boolean.TRUE, model.getDisabled())) {
       return builder.build();

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

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.sdk.extension.incubator.fileconfig;
 
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
@@ -15,6 +16,14 @@
 import java.util.UUID;
 
 public class ServiceResourceDetector implements ComponentProvider<Resource> {
+
+  private static final AttributeKey<String> SERVICE_NAME = AttributeKey.stringKey("service.name");
+  private static final AttributeKey<String> SERVICE_INSTANCE_ID =
+      AttributeKey.stringKey("service.instance.id");
+
+  // multiple calls to this resource provider should return the same value
+  private static final String RANDOM_SERVICE_INSTANCE_ID = UUID.randomUUID().toString();
+
   @Override
   public Class<Resource> getType() {
     return Resource.class;
@@ -32,10 +41,10 @@ public Resource create(DeclarativeConfigProperties config) {
     ConfigProperties properties = DefaultConfigProperties.create(Collections.emptyMap());
     String serviceName = properties.getString("otel.service.name");
     if (serviceName != null) {
-      builder.put("service.name", serviceName).build();
+      builder.put(SERVICE_NAME, serviceName).build();
     }
 
-    builder.put("service.instance.id", UUID.randomUUID().toString());
+    builder.put(SERVICE_INSTANCE_ID, RANDOM_SERVICE_INSTANCE_ID);
 
     return builder.build();
   }

sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/OpenTelemetryConfigurationFactoryTest.java

@@ -105,6 +105,8 @@ private static Stream<Arguments> fileFormatArgs() {
         Arguments.of("0.4a", false),
         Arguments.of("foo", false),
         Arguments.of("1.0-rc.a", false),
+        Arguments.of("1.0.0", false),
+        Arguments.of("1.0.3", false),
         // Valid file formats
         Arguments.of("0.4", true),
         Arguments.of("1.0-rc.1", true),