improve test

Author: zeitlinger

instrumentation/spring/spring-boot-autoconfigure/src/testDeclarativeConfig/java/io/opentelemetry/instrumentation/spring/autoconfigure/DeclarativeConfigTest.java

@@ -55,15 +55,68 @@ void customOpenTelemetry() {
   @Test
   @DisplayName(
       "when Application Context DOES NOT contain OpenTelemetry bean should initialize openTelemetry")
+  void initializeProvidersAndOpenTelemetry() {
+    this.contextRunner.run(
+        context ->
+            assertThat(context)
+                .getBean("openTelemetry", OpenTelemetry.class)
+                .isNotNull()
+                .satisfies(
+                    o -> {
+                      ExtendedDeclarativeConfigProperties config =
+                          DeclarativeConfigUtil.getInstrumentationConfig(o, "foo");
+                      assertThat(config.getString("string_key")).isEqualTo("string_value");
+                      assertThat(config.getBoolean("bool_key")).isTrue();
+                      assertThat(config.getDouble("double_key")).isEqualTo(3.14);
+                      assertThat(config.getLong("int_key")).isEqualTo(42);
+                    }));
+  }
+
+  @Test
+  @SetEnvironmentVariable(
+      key = "OTEL_INSTRUMENTATION/DEVELOPMENT_JAVA_FOO_STRING_KEY",
+      value = "new_value")
+  @SetEnvironmentVariable(
+      key = "OTEL_INSTRUMENTATION/DEVELOPMENT_JAVA_FOO_BOOL_KEY",
+      value = "false")
+  @SetEnvironmentVariable(key = "OTEL_INSTRUMENTATION/DEVELOPMENT_JAVA_FOO_INT_KEY", value = "43")
+  @SetEnvironmentVariable(
+      key = "OTEL_INSTRUMENTATION/DEVELOPMENT_JAVA_FOO_DOUBLE_KEY",
+      value = "4.14")
+  @SetEnvironmentVariable(
+      key = "OTEL_TRACER_PROVIDER_PROCESSORS_0_BATCH_EXPORTER_OTLP_HTTP_ENDPOINT",
+      value = "http://custom:4318/v1/traces")
+  void envVarOverrideSpringStyle() {
+    this.contextRunner.run(
+        context ->
+            assertThat(context)
+                .getBean(OpenTelemetry.class)
+                .isNotNull()
+                .satisfies(
+                    o -> {
+                      ExtendedDeclarativeConfigProperties config =
+                          DeclarativeConfigUtil.getInstrumentationConfig(o, "foo");
+                      assertThat(config.getString("string_key")).isEqualTo("new_value");
+                      assertThat(config.getBoolean("bool_key")).isFalse();
+                      assertThat(config.getDouble("double_key")).isEqualTo(4.14);
+                      assertThat(config.getLong("int_key")).isEqualTo(43);
+
+                      assertThat(o.toString())
+                          .contains("OtlpHttpSpanExporter{endpoint=http://custom:4318/v1/traces");
+                    }));
+  }
+
+  @Test
   @SetEnvironmentVariable(key = "STRING_ENV", value = "string_value")
   @SetEnvironmentVariable(key = "BOOL_ENV", value = "true")
   @SetEnvironmentVariable(key = "INT_ENV", value = "42")
   @SetEnvironmentVariable(key = "DOUBLE_ENV", value = "3.14")
-  void initializeProvidersAndOpenTelemetry() {
+  @SetEnvironmentVariable(key = "OTEL_EXPORTER_OTLP_ENDPOINT", value = "http://custom:4318")
+  void envVarOverrideOtelStyle() {
     this.contextRunner.run(
         context ->
             assertThat(context)
-                .getBean("openTelemetry", OpenTelemetry.class)
+                .getBean(OpenTelemetry.class)
                 .isNotNull()
                 .satisfies(
                     o -> {
@@ -151,39 +204,4 @@ void shouldNotLoadInstrumentationWhenExplicitlyDisabled() {
             "otel.instrumentation/development.java.spring_web.enabled=false")
         .run(context -> assertThat(context).doesNotHaveBean("otelRestTemplateBeanPostProcessor"));
   }
-
-  @Test
-  void envVarOverrideSpringStyle() {
-    this.contextRunner
-        // this is typically set via env var
-        .withSystemProperties(
-            "OTEL_TRACER_PROVIDER_PROCESSORS_0_BATCH_EXPORTER_OTLP_HTTP_ENDPOINT=http://custom:4318/v1/traces")
-        .run(
-            context ->
-                assertThat(context)
-                    .getBean(OpenTelemetry.class)
-                    .isNotNull()
-                    .satisfies(
-                        c ->
-                            assertThat(c.toString())
-                                .contains(
-                                    "OtlpHttpSpanExporter{endpoint=http://custom:4318/v1/traces")));
-  }
-
-  @Test
-  void envVarOverrideOtelStyle() {
-    this.contextRunner
-        // this is typically set via env var
-        .withSystemProperties("OTEL_EXPORTER_OTLP_ENDPOINT=http://custom:4318")
-        .run(
-            context ->
-                assertThat(context)
-                    .getBean(OpenTelemetry.class)
-                    .isNotNull()
-                    .satisfies(
-                        c ->
-                            assertThat(c.toString())
-                                .contains(
-                                    "OtlpHttpSpanExporter{endpoint=http://custom:4318/v1/traces")));
-  }
 }