Throw exception on asking for configuration that is not available.

elastic · Mar 8, 2023 · 0caaf30 · 0caaf30
1 parent c886ccc
commit 0caaf30
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/ElasticApmTracer.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/ElasticApmTracer.java
@@ -378,11 +378,14 @@ public ConfigurationRegistry getConfigurationRegistry() {
     @Override
     @SuppressWarnings({"unchecked", "rawtypes"})
     public <T> T getConfig(Class<T> configProvider) {
+        T configuration = null;
         if (ConfigurationOptionProvider.class.isAssignableFrom(configProvider)) {
-            return (T) configurationRegistry.getConfig((Class) configProvider);
-        } else {
-            return null;
+             configuration = (T) configurationRegistry.getConfig((Class) configProvider);
+        }
+        if (configuration == null) {
+            throw new IllegalStateException("no configuration available for " + configProvider.getName());
         }
+        return configuration;
     }
 
     public void endTransaction(Transaction transaction) {

diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/NoopTracer.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/NoopTracer.java
@@ -169,7 +169,7 @@ public <T extends co.elastic.apm.agent.tracer.Tracer> T require(Class<T> type) {
 
     @Override
     public <T> T getConfig(Class<T> configuration) {
-        return null;
+        throw new IllegalStateException();
     }
 
     @Override