add missing declarative config resource providers

Author: zeitlinger

instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/internal/DeclarativeConfigTest.java renamed to instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/internal/ResourceDeclarativeConfigTest.java

@@ -19,7 +19,7 @@
 import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.jupiter.api.Test;
 
-class DeclarativeConfigTest {
+class ResourceDeclarativeConfigTest {
 
   @Test
   void endToEnd() {

javaagent-tooling/build.gradle.kts

@@ -61,6 +61,7 @@ dependencies {
   testImplementation(project(":testing-common"))
   testImplementation("com.google.guava:guava")
   testImplementation("org.junit-pioneer:junit-pioneer")
+  testImplementation("com.fasterxml.jackson.core:jackson-databind")
 }
 
 testing {

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/DistroComponentProvider.java renamed to javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/resources/DistroComponentProvider.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.tooling;
+package io.opentelemetry.javaagent.tooling.resources;
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/DistroResourceProvider.java renamed to javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/resources/DistroResourceProvider.java

@@ -3,13 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.tooling;
+package io.opentelemetry.javaagent.tooling.resources;
 
 import static io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes.TELEMETRY_DISTRO_NAME;
 import static io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes.TELEMETRY_DISTRO_VERSION;
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.javaagent.tooling.AgentVersion;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
 import io.opentelemetry.sdk.resources.Resource;

instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/internal/ResourceCustomizerProvider.java renamed to javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/resources/ResourceCustomizerProvider.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.resources.internal;
+package io.opentelemetry.javaagent.tooling.resources;
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizer;

instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/internal/ResourceCustomizerProviderTest.java renamed to javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/resources/ResourceCustomizerProviderTest.java

@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.resources.internal;
+package io.opentelemetry.javaagent.tooling.resources;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
-import io.opentelemetry.testing.internal.jackson.core.JsonProcessingException;
-import io.opentelemetry.testing.internal.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Test;
 
 class ResourceCustomizerProviderTest {
@@ -27,10 +27,7 @@ void customize() {
               try {
                 assertThat(objectMapper.writeValueAsString(configurationModel.getResource()))
                     .isEqualTo(
-                        "{\"attributes\":[],\"detectionDevelopment\":{\"attributes\":null,\"detectors\":["
-                            + "{\"additionalProperties\":{\"distribution\":null}},"
-                            + "{\"additionalProperties\":{\"service\":null}}]},"
-                            + "\"schemaUrl\":null,\"attributesList\":null}");
+                        "{\"attributes\":[],\"detection/development\":{\"detectors\":[{\"distribution\":null},{\"service\":null}]}}");
               } catch (JsonProcessingException e) {
                 throw new AssertionError(e);
               }