diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/BasicTracer.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/BasicTracer.java index 7fe6ef034fe..567f8e9c860 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/BasicTracer.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/BasicTracer.java @@ -487,12 +487,6 @@ public String captureAndReportException(long epochMicros, @Nullable Throwable e, return captureAndReportException(epochMicros, e, (AbstractSpan) parent); } - @Nullable - @Override - public co.elastic.apm.plugin.spi.ErrorCapture captureException(@Nullable Throwable e, @Nullable co.elastic.apm.plugin.spi.AbstractSpan parent, @Nullable ClassLoader initiatingClassLoader) { - return captureException(e, (AbstractSpan) parent, initiatingClassLoader); - } - @Override public void endSpan(co.elastic.apm.plugin.spi.Span span) { endSpan((Span) span); @@ -503,11 +497,6 @@ public void endTransaction(co.elastic.apm.plugin.spi.Transaction transaction) endTransaction((Transaction) transaction); } - @Override - public void endError(co.elastic.apm.plugin.spi.ErrorCapture errorCapture) { - endError((ErrorCapture) errorCapture); - } - @Override public void setServiceInfoForClassLoader(ClassLoader classLoader, co.elastic.apm.plugin.spi.ServiceInfo serviceInfo) { setServiceInfoForClassLoader(classLoader, serviceInfo.isMultiServiceContainer() diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/GlobalTracer.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/GlobalTracer.java index 6b5cbdc3404..8b9533f5537 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/GlobalTracer.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/GlobalTracer.java @@ -302,12 +302,6 @@ public String captureAndReportException(long epochMicros, @Nullable Throwable e, return tracer.captureAndReportException(epochMicros, e, parent); } - @Nullable - @Override - public co.elastic.apm.plugin.spi.ErrorCapture captureException(@Nullable Throwable e, @Nullable co.elastic.apm.plugin.spi.AbstractSpan parent, @Nullable ClassLoader initiatingClassLoader) { - return tracer.captureException(e, parent, initiatingClassLoader); - } - @Override public void endSpan(co.elastic.apm.plugin.spi.Span span) { tracer.endSpan(span); @@ -318,11 +312,6 @@ public void endTransaction(co.elastic.apm.plugin.spi.Transaction transaction) tracer.endTransaction(transaction); } - @Override - public void endError(co.elastic.apm.plugin.spi.ErrorCapture errorCapture) { - tracer.endError(errorCapture); - } - @Override public void setServiceInfoForClassLoader(ClassLoader classLoader, co.elastic.apm.plugin.spi.ServiceInfo serviceInfo) { tracer.setServiceInfoForClassLoader(classLoader, serviceInfo); diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/NoopTracer.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/NoopTracer.java index 21d59fb092d..2d739944370 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/NoopTracer.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/NoopTracer.java @@ -205,12 +205,6 @@ public String captureAndReportException(long epochMicros, @Nullable Throwable e, return null; } - @Nullable - @Override - public co.elastic.apm.plugin.spi.ErrorCapture captureException(@Nullable Throwable e, @Nullable co.elastic.apm.plugin.spi.AbstractSpan parent, @Nullable ClassLoader initiatingClassLoader) { - return null; - } - @Override public void endSpan(co.elastic.apm.plugin.spi.Span span) { } @@ -219,10 +213,6 @@ public void endSpan(co.elastic.apm.plugin.spi.Span span) { public void endTransaction(co.elastic.apm.plugin.spi.Transaction transaction) { } - @Override - public void endError(co.elastic.apm.plugin.spi.ErrorCapture errorCapture) { - } - @Override public void setServiceInfoForClassLoader(ClassLoader classLoader, co.elastic.apm.plugin.spi.ServiceInfo serviceInfo) { } diff --git a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/error/ErrorCapture.java b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/error/ErrorCapture.java index 13d4dec3162..927073d15ed 100644 --- a/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/error/ErrorCapture.java +++ b/apm-agent-core/src/main/java/co/elastic/apm/agent/impl/error/ErrorCapture.java @@ -38,7 +38,7 @@ /** * Data captured by an agent representing an event occurring in a monitored service */ -public class ErrorCapture implements Recyclable, co.elastic.apm.plugin.spi.ErrorCapture { +public class ErrorCapture implements Recyclable { private static final Logger logger = LoggerFactory.getLogger(ErrorCapture.class); diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/ErrorCapture.java b/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/ErrorCapture.java deleted file mode 100644 index 409008b815b..00000000000 --- a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/ErrorCapture.java +++ /dev/null @@ -1,4 +0,0 @@ -package co.elastic.apm.plugin.spi; - -public interface ErrorCapture { -} diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/GlobalTracer.java b/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/GlobalTracer.java index 71e598bc18e..8aa80ae446e 100644 --- a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/GlobalTracer.java +++ b/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/GlobalTracer.java @@ -110,11 +110,6 @@ public String captureAndReportException(long epochMicros, @Nullable Throwable e, return tracer.captureAndReportException(epochMicros, e, parent); } - @Nullable - public ErrorCapture captureException(@Nullable Throwable e, @Nullable AbstractSpan parent, @Nullable ClassLoader initiatingClassLoader) { - return tracer.captureException(e, parent, initiatingClassLoader); - } - @Nullable @Override public Span getActiveExitSpan() { @@ -137,11 +132,6 @@ public void endTransaction(Transaction transaction) { tracer.endTransaction(transaction); } - @Override - public void endError(ErrorCapture errorCapture) { - tracer.endError(errorCapture); - } - @Override public T getConfig(Class configuration) { return tracer.getConfig(configuration); diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/NoopTracer.java b/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/NoopTracer.java index d292dc0a28a..e101eca18e4 100644 --- a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/NoopTracer.java +++ b/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/NoopTracer.java @@ -67,12 +67,6 @@ public String captureAndReportException(long epochMicros, @Nullable Throwable e, return null; } - @Nullable - @Override - public ErrorCapture captureException(@Nullable Throwable e, @Nullable AbstractSpan parent, @Nullable ClassLoader initiatingClassLoader) { - return null; - } - @Nullable @Override public Span getActiveExitSpan() { @@ -93,10 +87,6 @@ public void endSpan(Span span) { public void endTransaction(Transaction transaction) { } - @Override - public void endError(ErrorCapture errorCapture) { - } - @Override public T getConfig(Class configuration) { return null; diff --git a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Tracer.java b/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Tracer.java index c91cb04402e..515b2dc4f34 100644 --- a/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Tracer.java +++ b/apm-agent-plugin-spi/src/main/java/co/elastic/apm/plugin/spi/Tracer.java @@ -51,9 +51,6 @@ public interface Tracer { @Nullable String captureAndReportException(long epochMicros, @Nullable Throwable e, @Nullable AbstractSpan parent); - @Nullable - ErrorCapture captureException(@Nullable Throwable e, @Nullable AbstractSpan parent, @Nullable ClassLoader initiatingClassLoader); - @Nullable Span getActiveExitSpan(); @@ -64,8 +61,6 @@ public interface Tracer { void endTransaction(Transaction transaction); - void endError(ErrorCapture errorCapture); - T getConfig(Class configuration); ObjectPoolFactory getObjectPoolFactory();