Skip to content

Commit ce6c159

Browse files
authored
Avoid conflicts with user-defined filters with default order (open-telemetry#13625)
1 parent 1aa97e2 commit ce6c159

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/OpenTelemetryClientFilter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
import org.apache.dubbo.rpc.Invoker;
1212
import org.apache.dubbo.rpc.Result;
1313

14-
@Activate(group = {"consumer"})
14+
@Activate(
15+
group = {"consumer"},
16+
order = -1)
1517
public final class OpenTelemetryClientFilter implements Filter {
1618

1719
private final Filter delegate;

instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/OpenTelemetryServerFilter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
import org.apache.dubbo.rpc.Invoker;
1212
import org.apache.dubbo.rpc.Result;
1313

14-
@Activate(group = {"provider"})
14+
@Activate(
15+
group = {"provider"},
16+
order = -1)
1517
public final class OpenTelemetryServerFilter implements Filter {
1618

1719
private final Filter delegate;

instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/OpenTelemetryClientFilter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
import org.apache.dubbo.rpc.Invoker;
1313
import org.apache.dubbo.rpc.Result;
1414

15-
@Activate(group = {"consumer"})
15+
@Activate(
16+
group = {"consumer"},
17+
order = -1)
1618
public final class OpenTelemetryClientFilter implements Filter {
1719

1820
private final Filter delegate;

instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/OpenTelemetryServerFilter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
import org.apache.dubbo.rpc.Invoker;
1313
import org.apache.dubbo.rpc.Result;
1414

15-
@Activate(group = {"provider"})
15+
@Activate(
16+
group = {"provider"},
17+
order = -1)
1618
public final class OpenTelemetryServerFilter implements Filter {
1719

1820
private final Filter delegate;

0 commit comments

Comments
 (0)