Reuse OtelInstrumentationScope

Author: mcculls

…metry/shim/OtelInstrumentationScope.java …tel/common/OtelInstrumentationScope.javadd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/OtelInstrumentationScope.java renamed to dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/common/OtelInstrumentationScope.java dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/OtelInstrumentationScope.java renamed to dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/common/OtelInstrumentationScope.java

@@ -1,4 +1,4 @@
-package datadog.opentelemetry.shim;
+package datadog.trace.bootstrap.otel.common;
 
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import java.util.Objects;

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelMeter.java

@@ -4,9 +4,9 @@
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Stream.concat;
 
-import datadog.opentelemetry.shim.OtelInstrumentationScope;
 import datadog.opentelemetry.shim.metrics.data.OtelMetricStorage;
 import datadog.opentelemetry.shim.metrics.export.OtelMeterVisitor;
+import datadog.trace.bootstrap.otel.common.OtelInstrumentationScope;
 import io.opentelemetry.api.metrics.BatchCallback;
 import io.opentelemetry.api.metrics.DoubleGaugeBuilder;
 import io.opentelemetry.api.metrics.DoubleHistogramBuilder;

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelMeterProvider.java

@@ -1,7 +1,7 @@
 package datadog.opentelemetry.shim.metrics;
 
-import datadog.opentelemetry.shim.OtelInstrumentationScope;
 import datadog.opentelemetry.shim.metrics.export.OtelMetricsVisitor;
+import datadog.trace.bootstrap.otel.common.OtelInstrumentationScope;
 import datadog.trace.util.Strings;
 import io.opentelemetry.api.metrics.Meter;
 import io.opentelemetry.api.metrics.MeterBuilder;

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/export/OtelMetricsVisitor.java

@@ -1,6 +1,6 @@
 package datadog.opentelemetry.shim.metrics.export;
 
-import datadog.opentelemetry.shim.OtelInstrumentationScope;
+import datadog.trace.bootstrap.otel.common.OtelInstrumentationScope;
 
 public interface OtelMetricsVisitor {
   /** Visits a meter created by the OpenTelemetry API. */

dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/build.gradle

@@ -18,6 +18,8 @@ dependencies {
 
   implementation project(':dd-java-agent:agent-otel:otel-shim')
 
+  testImplementation project(path: ':dd-java-agent:agent-otel:otel-bootstrap', configuration: 'shadow')
+
   testImplementation group: 'io.opentelemetry', name: 'opentelemetry-api', version: openTelemetryVersion
   latestDepTestImplementation group: 'io.opentelemetry', name: 'opentelemetry-api', version: '1+'
 }

dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/main/java/datadog/trace/instrumentation/opentelemetry147/OpenTelemetryMetricsInstrumentation.java

@@ -61,7 +61,6 @@ public boolean onlyMatchKnownTypes() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      "datadog.opentelemetry.shim.OtelInstrumentationScope",
       "datadog.opentelemetry.shim.metrics.OtelMeter",
       "datadog.opentelemetry.shim.metrics.OtelMeterBuilder",
       "datadog.opentelemetry.shim.metrics.OtelMeterProvider",

dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/test/groovy/opentelemetry147/metrics/MetricsTest.groovy

@@ -2,7 +2,7 @@ package opentelemetry147.metrics
 
 import static io.opentelemetry.api.common.AttributeKey.stringKey
 
-import datadog.opentelemetry.shim.OtelInstrumentationScope
+import datadog.trace.bootstrap.otel.common.OtelInstrumentationScope
 import datadog.opentelemetry.shim.metrics.OtelInstrumentDescriptor
 import datadog.opentelemetry.shim.metrics.OtelMeterProvider
 import datadog.opentelemetry.shim.metrics.data.OtelDoublePoint