Merge pull request #228 from SAP/dependabot/maven/release-4/io.opentelemetry.contrib-opentelemetry-cloudfoundry-resources-1.51.0-alpha

Bump io.opentelemetry.contrib:opentelemetry-cloudfoundry-resources from 1.46.0-alpha to 1.51.0-alpha

Author: KarstenSchnitter

cf-java-logging-support-opentelemetry-agent-extension/pom.xml

@@ -57,7 +57,7 @@
         <dependency>
             <groupId>io.opentelemetry.contrib</groupId>
             <artifactId>opentelemetry-cloudfoundry-resources</artifactId>
-            <version>1.46.0-alpha</version>
+            <version>1.51.0-alpha</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/CloudFoundryResourceProvider.java

@@ -2,16 +2,36 @@
 
 import com.sap.hcf.cf.logging.opentelemetry.agent.ext.attributes.CloudFoundryResourceCustomizer;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
+import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
 import io.opentelemetry.sdk.resources.Resource;
 
-public class CloudFoundryResourceProvider
-        extends io.opentelemetry.contrib.cloudfoundry.resources.CloudFoundryResourceProvider {
+import java.util.ServiceLoader;
+
+public class CloudFoundryResourceProvider implements ResourceProvider {
 
     private final CloudFoundryResourceCustomizer customizer = new CloudFoundryResourceCustomizer();
 
     @Override
     public Resource createResource(ConfigProperties configProperties) {
-        Resource original = super.createResource(configProperties);
-        return customizer.apply(original, configProperties);
+        ResourceProvider delegate = getDelegate();
+        return delegate == null
+                ? Resource.empty()
+                : customizer.apply(delegate.createResource(configProperties), configProperties);
+    }
+
+    private ResourceProvider getDelegate() {
+        return DelegateHolder.INSTANCE;
+    }
+
+    private static class DelegateHolder {
+        static final ResourceProvider INSTANCE = loadCloudFoundryResourceProvider();
+
+        private static ResourceProvider loadCloudFoundryResourceProvider() {
+            ServiceLoader<ResourceProvider> loader = ServiceLoader.load(ResourceProvider.class);
+            return loader.stream().map(ServiceLoader.Provider::get)
+                         .filter(p -> p instanceof io.opentelemetry.contrib.cloudfoundry.resources.CloudFoundryResourceProvider)
+                         .findAny().orElse(null);
+        }
+
     }
 }