Cleanup of the AppD related code. (signalfx#2609)

Removed dead code
Updated use of deprecated resource attribute

Author: robsunday

custom/src/main/java/com/splunk/opentelemetry/appd/AppdBonusConfigurationCustomizerProvider.java

@@ -16,17 +16,17 @@
 
 package com.splunk.opentelemetry.appd;
 
-import static io.opentelemetry.sdk.autoconfigure.AdditionalPropertiesUtil.getAdditionalPropertyOrDefault;
+import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
 
 import com.google.auto.service.AutoService;
+import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
+import io.opentelemetry.sdk.autoconfigure.AutoConfigureUtil;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizer;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationPropertyModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PropagatorModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel;
-import java.util.Map;
 
 @AutoService(DeclarativeConfigurationCustomizerProvider.class)
 public final class AppdBonusConfigurationCustomizerProvider
@@ -57,15 +57,12 @@ public void customize(DeclarativeConfigurationCustomizer autoConfiguration) {
   }
 
   private static boolean isFeatureEnabled(OpenTelemetryConfigurationModel model) {
-    if (model.getInstrumentationDevelopment() == null
-        || model.getInstrumentationDevelopment().getJava() == null) {
-      return false;
-    }
-
-    Map<String, ExperimentalLanguageSpecificInstrumentationPropertyModel> properties =
-        model.getInstrumentationDevelopment().getJava().getAdditionalProperties();
+    DeclarativeConfigProperties config = AutoConfigureUtil.getInstrumentationConfig(model);
 
-    return getAdditionalPropertyOrDefault(properties, CONFIG_CISCO_CTX_ENABLED, false);
+    return config
+        .getStructured("cisco", empty())
+        .getStructured("ctx", empty())
+        .getBoolean("enabled", false);
   }
 
   private static boolean canAddPropagator(String compositeList) {

custom/src/main/java/com/splunk/opentelemetry/appd/AppdBonusCustomizer.java

@@ -16,9 +16,6 @@
 
 package com.splunk.opentelemetry.appd;
 
-import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
-import static io.opentelemetry.semconv.incubating.DeploymentIncubatingAttributes.DEPLOYMENT_ENVIRONMENT_NAME;
-
 import com.google.auto.service.AutoService;
 import com.google.common.annotations.VisibleForTesting;
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizer;
@@ -57,12 +54,6 @@ void customize(AutoConfigurationCustomizer customizer, AppdBonusPropagator propa
           }
           return builder;
         });
-    customizer.addResourceCustomizer(
-        (resource, configProperties) -> {
-          propagator.setEnvironmentName(resource.getAttribute(DEPLOYMENT_ENVIRONMENT_NAME));
-          propagator.setServiceName(resource.getAttribute(SERVICE_NAME));
-          return resource;
-        });
   }
 
   private static boolean featureEnabled(ConfigProperties config) {

custom/src/main/java/io/opentelemetry/sdk/autoconfigure/AdditionalPropertiesUtil.java

@@ -29,7 +29,9 @@
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.DistributionPropertyModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 import io.opentelemetry.sdk.resources.Resource;
+import java.util.Map;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 /**
  * This class is a hack to allows us to call getResource() and getConfig() on the
@@ -79,6 +81,29 @@ public static DeclarativeConfigProperties getDistributionConfig(
         splunkModel.getAdditionalProperties(), componentLoader);
   }
 
+  public static DeclarativeConfigProperties getInstrumentationConfig(
+      OpenTelemetryConfigurationModel model) {
+    if (model.getInstrumentationDevelopment() == null
+        || model.getInstrumentationDevelopment().getJava() == null) {
+      return empty();
+    }
+
+    Map<String, Object> properties =
+        model
+            .getInstrumentationDevelopment()
+            .getJava()
+            .getAdditionalProperties()
+            .entrySet()
+            .stream()
+            .collect(
+                Collectors.toMap(Map.Entry::getKey, v -> v.getValue().getAdditionalProperties()));
+
+    ComponentLoader componentLoader =
+        ComponentLoader.forClassLoader(AutoConfigureUtil.class.getClassLoader());
+
+    return YamlDeclarativeConfigProperties.create(properties, componentLoader);
+  }
+
   public static Resource getResource(AutoConfiguredOpenTelemetrySdk sdk) {
     return sdk.getResource();
   }

custom/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfigureUtil.java

@@ -18,12 +18,21 @@
 
 import static com.splunk.opentelemetry.appd.AppdBonusPropagator.CTX_HEADER_ENV;
 import static com.splunk.opentelemetry.appd.AppdBonusPropagator.CTX_HEADER_SERVICE;
+import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
+import static io.opentelemetry.semconv.incubating.DeploymentIncubatingAttributes.DEPLOYMENT_ENVIRONMENT_NAME;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import com.splunk.opentelemetry.testing.declarativeconfig.DeclarativeConfigTestUtil;
+import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
+import io.opentelemetry.sdk.autoconfigure.AutoConfigureUtil;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
+import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
+import io.opentelemetry.sdk.resources.Resource;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.HashMap;
@@ -36,7 +45,7 @@ class AppdBeforeAgentListenerTest {
   @RegisterExtension final AutoCleanupExtension autoCleanup = AutoCleanupExtension.create();
 
   @Test
-  void shouldSetPropagatorProperties(@TempDir Path tempDir) throws IOException {
+  void shouldSetPropagatorProperties_declarativeConfig(@TempDir Path tempDir) throws IOException {
     // given
     AppdBeforeAgentListener agentListener = new AppdBeforeAgentListener();
     var yaml =
@@ -76,4 +85,38 @@ void shouldSetPropagatorProperties(@TempDir Path tempDir) throws IOException {
     assertThat(carrier.get(CTX_HEADER_SERVICE)).isEqualTo("test-service");
     assertThat(carrier.get(CTX_HEADER_ENV)).isEqualTo("test-deployment-env");
   }
+
+  @Test
+  void shouldSetPropagatorProperties_envVarConfig() {
+    // given
+    AppdBeforeAgentListener agentListener = new AppdBeforeAgentListener();
+    AutoConfiguredOpenTelemetrySdk sdkMock = mock(AutoConfiguredOpenTelemetrySdk.class);
+    ConfigProperties mockConfigProperties =
+        DefaultConfigProperties.createFromMap(Map.of("cisco.ctx.enabled", Boolean.TRUE.toString()));
+    Resource resource =
+        Resource.create(
+            Attributes.of(
+                DEPLOYMENT_ENVIRONMENT_NAME, "test-deployment-env", SERVICE_NAME, "test-service"));
+    when(AutoConfigureUtil.getConfig(sdkMock)).thenReturn(mockConfigProperties);
+    when(AutoConfigureUtil.getResource(sdkMock)).thenReturn(resource);
+
+    // when
+    agentListener.beforeAgent(sdkMock);
+
+    // then
+    AppdBonusPropagator propagator = AppdBonusPropagator.getInstance();
+    Map<String, String> carrier = new HashMap<>();
+    Context context = Context.current();
+    propagator.inject(
+        context,
+        carrier,
+        (map, key, value) -> {
+          if (map != null) {
+            map.put(key, value);
+          }
+        });
+
+    assertThat(carrier.get(CTX_HEADER_SERVICE)).isEqualTo("test-service");
+    assertThat(carrier.get(CTX_HEADER_ENV)).isEqualTo("test-deployment-env");
+  }
 }

custom/src/test/java/com/splunk/opentelemetry/appd/AppdBeforeAgentListenerTest.java

@@ -22,8 +22,6 @@
 import static com.splunk.opentelemetry.appd.AppdBonusSpanProcessor.APPD_ATTR_APP;
 import static com.splunk.opentelemetry.appd.AppdBonusSpanProcessor.APPD_ATTR_BT;
 import static com.splunk.opentelemetry.appd.AppdBonusSpanProcessor.APPD_ATTR_TIER;
-import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
-import static io.opentelemetry.semconv.incubating.DeploymentIncubatingAttributes.DEPLOYMENT_ENVIRONMENT_NAME;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
@@ -35,7 +33,6 @@
 import io.opentelemetry.context.Context;
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizer;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
-import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.ReadWriteSpan;
 import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
 import io.opentelemetry.sdk.trace.SpanProcessor;
@@ -57,7 +54,6 @@ class AppdBonusCustomizerTest {
   @Mock Context context;
   @Mock AppdBonusPropagator propagator;
   @Mock SpanProcessor defaultSpanProcessor;
-  @Mock Resource resource;
 
   @Test
   void customizeEnabled() {
@@ -66,8 +62,6 @@ void customizeEnabled() {
     when(context.get(CONTEXT_KEY)).thenReturn(appdContext);
     when(config.getBoolean("cisco.ctx.enabled", false)).thenReturn(true);
     when(config.getList("otel.propagators", DEFAULT_PROPAGATORS)).thenReturn(DEFAULT_PROPAGATORS);
-    when(resource.getAttribute(SERVICE_NAME)).thenReturn("amazingService");
-    when(resource.getAttribute(DEPLOYMENT_ENVIRONMENT_NAME)).thenReturn("amazingEnv");
 
     AppdBonusCustomizer testClass = new AppdBonusCustomizer();
     testClass.customize(customizer, propagator);
@@ -76,10 +70,6 @@ void customizeEnabled() {
         ArgumentCaptor.forClass(Function.class);
     verify(customizer).addPropertiesCustomizer(pcCaptor.capture());
 
-    ArgumentCaptor<BiFunction<Resource, ConfigProperties, Resource>> rcCaptor =
-        ArgumentCaptor.forClass(BiFunction.class);
-    verify(customizer).addResourceCustomizer(rcCaptor.capture());
-
     ArgumentCaptor<BiFunction<SdkTracerProviderBuilder, ConfigProperties, SdkTracerProviderBuilder>>
         tpcCaptor = ArgumentCaptor.forClass(BiFunction.class);
     verify(customizer).addTracerProviderCustomizer(tpcCaptor.capture());
@@ -90,11 +80,6 @@ void customizeEnabled() {
     defaultSpanProcessor.onStart(mock(), mock());
     verify(defaultSpanProcessor).onStart(any(), any());
 
-    Resource res = rcCaptor.getValue().apply(resource, config);
-    assertThat(res).isSameAs(resource);
-    verify(propagator).setServiceName("amazingService");
-    verify(propagator).setEnvironmentName("amazingEnv");
-
     SdkTracerProviderBuilder builder = mock();
     tpcCaptor.getValue().apply(builder, config);
     ArgumentCaptor<SpanProcessor> spCapture = ArgumentCaptor.forClass(SpanProcessor.class);
@@ -116,8 +101,6 @@ void customizeEnabled() {
   @Test
   void customizeNotEnabled() {
     when(config.getBoolean("cisco.ctx.enabled", false)).thenReturn(false);
-    when(resource.getAttribute(SERVICE_NAME)).thenReturn("amazingService");
-    when(resource.getAttribute(DEPLOYMENT_ENVIRONMENT_NAME)).thenReturn("amazingEnv");
 
     AppdBonusCustomizer testClass = new AppdBonusCustomizer();
     testClass.customize(customizer, propagator);
@@ -126,10 +109,6 @@ void customizeNotEnabled() {
         ArgumentCaptor.forClass(Function.class);
     verify(customizer).addPropertiesCustomizer(pcCaptor.capture());
 
-    ArgumentCaptor<BiFunction<Resource, ConfigProperties, Resource>> rcCaptor =
-        ArgumentCaptor.forClass(BiFunction.class);
-    verify(customizer).addResourceCustomizer(rcCaptor.capture());
-
     ArgumentCaptor<BiFunction<SdkTracerProviderBuilder, ConfigProperties, SdkTracerProviderBuilder>>
         tpcCaptor = ArgumentCaptor.forClass(BiFunction.class);
     verify(customizer).addTracerProviderCustomizer(tpcCaptor.capture());
@@ -140,11 +119,6 @@ void customizeNotEnabled() {
     defaultSpanProcessor.onStart(mock(), mock());
     verify(defaultSpanProcessor).onStart(any(), any());
 
-    Resource res = rcCaptor.getValue().apply(resource, config);
-    assertThat(res).isSameAs(resource);
-    verify(propagator).setServiceName("amazingService");
-    verify(propagator).setEnvironmentName("amazingEnv");
-
     SdkTracerProviderBuilder builder = mock();
     tpcCaptor.getValue().apply(builder, config);
     verify(builder, never()).addSpanProcessor(any());