test non-null configuration

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

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/ElasticApmTracerTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/impl/ElasticApmTracerTest.java
@@ -19,6 +19,7 @@
 package co.elastic.apm.agent.impl;
 
 import co.elastic.apm.agent.MockReporter;
+import co.elastic.apm.agent.common.util.WildcardMatcher;
 import co.elastic.apm.agent.configuration.CoreConfiguration;
 import co.elastic.apm.agent.configuration.ServiceInfo;
 import co.elastic.apm.agent.configuration.SpyConfiguration;
@@ -28,19 +29,19 @@
 import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration;
 import co.elastic.apm.agent.impl.transaction.AbstractSpan;
 import co.elastic.apm.agent.impl.transaction.ElasticContext;
-import co.elastic.apm.agent.tracer.Outcome;
 import co.elastic.apm.agent.impl.transaction.Span;
 import co.elastic.apm.agent.impl.transaction.TraceContext;
 import co.elastic.apm.agent.impl.transaction.Transaction;
-import co.elastic.apm.agent.common.util.WildcardMatcher;
 import co.elastic.apm.agent.metrics.Labels;
 import co.elastic.apm.agent.objectpool.TestObjectPoolFactory;
 import co.elastic.apm.agent.report.ApmServerClient;
 import co.elastic.apm.agent.report.ReporterConfiguration;
+import co.elastic.apm.agent.tracer.Outcome;
 import co.elastic.apm.agent.tracer.Scope;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.stagemonitor.configuration.ConfigurationOptionProvider;
 import org.stagemonitor.configuration.ConfigurationRegistry;
 
 import javax.annotation.Nullable;
@@ -53,6 +54,7 @@
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.AdditionalAnswers.delegatesTo;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -698,6 +700,19 @@ void testContextWrapping() {
 
     }
 
+    @Test
+    void testUnknownConfiguration() {
+        assertThatThrownBy(()-> tracerImpl.getConfig(Object.class))
+            .isInstanceOf(IllegalStateException.class);
+
+        ConfigurationOptionProvider unregisteredConfigProvider = new ConfigurationOptionProvider() {
+        };
+
+        assertThatThrownBy(()-> tracerImpl.getConfig(unregisteredConfigProvider.getClass()))
+            .isInstanceOf(IllegalStateException.class);
+
+    }
+
     private static final class TestContext implements ElasticContext<TestContext> {
 
         @Override

diff --git a/...ambda-plugin/src/main/java/co/elastic/apm/agent/awslambda/SQSMessageAttributesGetter.java b/...ambda-plugin/src/main/java/co/elastic/apm/agent/awslambda/SQSMessageAttributesGetter.java
@@ -35,7 +35,7 @@ private SQSMessageAttributesGetter() {
     @Nullable
     @Override
     public String getFirstHeader(String headerName, SQSEvent.SQSMessage carrier) {
-        if(null != carrier.getMessageAttributes() && carrier.getMessageAttributes().containsKey(headerName)){
+        if (null != carrier.getMessageAttributes() && carrier.getMessageAttributes().containsKey(headerName)) {
             return carrier.getMessageAttributes().get(headerName).getStringValue();
         }
         return null;