Remove agent's Ordered interface and use the SDK one (open-telemetry#…

…6589)
helios · Oct 31, 2022 · 705c714 · 705c714
1 parent e1609d1
commit 705c714
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 21 deletions.
diff --git a/...agent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/AgentListener.java b/...agent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/AgentListener.java
@@ -6,6 +6,7 @@
 package io.opentelemetry.javaagent.extension;
 
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
+import io.opentelemetry.sdk.autoconfigure.spi.Ordered;
 import java.lang.instrument.Instrumentation;
 import net.bytebuddy.agent.builder.AgentBuilder;
 

diff --git a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/Ordered.java b/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/Ordered.java
diff --git a/...api/src/main/java/io/opentelemetry/javaagent/extension/ignore/IgnoredTypesConfigurer.java b/...api/src/main/java/io/opentelemetry/javaagent/extension/ignore/IgnoredTypesConfigurer.java
@@ -5,8 +5,8 @@
 
 package io.opentelemetry.javaagent.extension.ignore;
 
-import io.opentelemetry.javaagent.extension.Ordered;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
+import io.opentelemetry.sdk.autoconfigure.spi.Ordered;
 
 /**
  * An {@link IgnoredTypesConfigurer} can be used to augment built-in instrumentation restrictions:

diff --git a/...main/java/io/opentelemetry/javaagent/extension/instrumentation/InstrumentationModule.java b/...main/java/io/opentelemetry/javaagent/extension/instrumentation/InstrumentationModule.java
@@ -9,8 +9,8 @@
 import static java.util.Collections.unmodifiableSet;
 import static net.bytebuddy.matcher.ElementMatchers.any;
 
-import io.opentelemetry.javaagent.extension.Ordered;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
+import io.opentelemetry.sdk.autoconfigure.spi.Ordered;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;

diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentExtension.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentExtension.java
@@ -5,9 +5,9 @@
 
 package io.opentelemetry.javaagent.tooling;
 
-import io.opentelemetry.javaagent.extension.Ordered;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
+import io.opentelemetry.sdk.autoconfigure.spi.Ordered;
 import net.bytebuddy.agent.builder.AgentBuilder;
 
 /**

diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/BeforeAgentListener.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/BeforeAgentListener.java
@@ -5,8 +5,8 @@
 
 package io.opentelemetry.javaagent.tooling;
 
-import io.opentelemetry.javaagent.extension.Ordered;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
+import io.opentelemetry.sdk.autoconfigure.spi.Ordered;
 import net.bytebuddy.agent.builder.AgentBuilder;
 
 /**

diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/SafeServiceLoader.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/SafeServiceLoader.java
@@ -7,7 +7,7 @@
 
 import static java.util.logging.Level.FINE;
 
-import io.opentelemetry.javaagent.extension.Ordered;
+import io.opentelemetry.sdk.autoconfigure.spi.Ordered;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Iterator;