Filter exit errors by operation name (airbytehq#18850)

drewrasm · Nov 2, 2022 · fd07e43 · fd07e43
1 parent 0153cfa
commit fd07e43
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 20 deletions.
diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/tracing/TemporalSdkInterceptor.java b/airbyte-workers/src/main/java/io/airbyte/workers/tracing/TemporalSdkInterceptor.java
@@ -4,6 +4,8 @@
 
 package io.airbyte.workers.tracing;
 
+import static io.airbyte.metrics.lib.ApmTraceConstants.WORKFLOW_TRACE_OPERATION_NAME;
+
 import com.google.common.annotations.VisibleForTesting;
 import datadog.trace.api.interceptor.MutableSpan;
 import datadog.trace.api.interceptor.TraceInterceptor;
@@ -19,11 +21,6 @@
 @Slf4j
 public class TemporalSdkInterceptor implements TraceInterceptor {
 
-  /**
-   * Trace resource name used to scope the filtering performed by this interceptor.
-   */
-  static final String CONNECTION_MANAGER_WORKFLOW_IMPL_RESOURCE_NAME = "ConnectionManagerWorkflowImpl.run";
-
   /**
    * Error message tag key name that contains the Temporal exit error message.
    */
@@ -76,7 +73,7 @@ boolean isExitTrace(final MutableSpan trace) {
 
     return trace.isError() &&
         EXIT_ERROR_MESSAGE.equalsIgnoreCase(trace.getTags().getOrDefault(ERROR_MESSAGE_TAG_KEY, "").toString()) &&
-        CONNECTION_MANAGER_WORKFLOW_IMPL_RESOURCE_NAME.equalsIgnoreCase(trace.getResourceName().toString());
+        WORKFLOW_TRACE_OPERATION_NAME.equalsIgnoreCase(trace.getOperationName().toString());
   }
 
 }
diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/tracing/DummySpan.java b/airbyte-workers/src/test/java/io/airbyte/workers/tracing/DummySpan.java
@@ -12,7 +12,7 @@ class DummySpan implements MutableSpan {
 
   private final Map<String, Object> tags = new HashMap<>();
   private boolean error = false;
-
+  private String operationName = null;
   private String resourceName = null;
 
   @Override
@@ -27,12 +27,13 @@ public long getDurationNano() {
 
   @Override
   public CharSequence getOperationName() {
-    return null;
+    return operationName;
   }
 
   @Override
-  public MutableSpan setOperationName(final CharSequence serviceName) {
-    return null;
+  public MutableSpan setOperationName(final CharSequence operationName) {
+    this.operationName = operationName != null ? operationName.toString() : null;
+    return this;
   }
 
   @Override
@@ -52,7 +53,7 @@ public CharSequence getResourceName() {
 
   @Override
   public MutableSpan setResourceName(final CharSequence resourceName) {
-    this.resourceName = resourceName.toString();
+    this.resourceName = resourceName != null ? resourceName.toString() : null;
     return this;
   }
 

diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/tracing/TemporalSdkInterceptorTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/tracing/TemporalSdkInterceptorTest.java
@@ -4,7 +4,7 @@
 
 package io.airbyte.workers.tracing;
 
-import static io.airbyte.workers.tracing.TemporalSdkInterceptor.CONNECTION_MANAGER_WORKFLOW_IMPL_RESOURCE_NAME;
+import static io.airbyte.metrics.lib.ApmTraceConstants.WORKFLOW_TRACE_OPERATION_NAME;
 import static io.airbyte.workers.tracing.TemporalSdkInterceptor.ERROR_MESSAGE_TAG_KEY;
 import static io.airbyte.workers.tracing.TemporalSdkInterceptor.EXIT_ERROR_MESSAGE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -25,23 +25,23 @@ void testOnTraceComplete() {
 
     final var noError = new DummySpan();
     noError.setError(false);
-    noError.setResourceName(CONNECTION_MANAGER_WORKFLOW_IMPL_RESOURCE_NAME);
+    noError.setOperationName(WORKFLOW_TRACE_OPERATION_NAME);
     noError.setTag("tag", "value");
 
     final var otherError = new DummySpan();
     otherError.setError(true);
-    otherError.setResourceName(CONNECTION_MANAGER_WORKFLOW_IMPL_RESOURCE_NAME);
+    otherError.setOperationName(WORKFLOW_TRACE_OPERATION_NAME);
     otherError.setTag("error.message", "some other error");
 
     final var temporalExitMsgError = new DummySpan();
     temporalExitMsgError.setError(true);
+    temporalExitMsgError.setOperationName(WORKFLOW_TRACE_OPERATION_NAME);
     temporalExitMsgError.setTag(ERROR_MESSAGE_TAG_KEY, EXIT_ERROR_MESSAGE);
-    temporalExitMsgError.setResourceName(CONNECTION_MANAGER_WORKFLOW_IMPL_RESOURCE_NAME);
 
     final var temporalExitMsgOtherResourceError = new DummySpan();
     temporalExitMsgOtherResourceError.setError(true);
+    temporalExitMsgOtherResourceError.setOperationName("OtherOperation");
     temporalExitMsgOtherResourceError.setTag(ERROR_MESSAGE_TAG_KEY, EXIT_ERROR_MESSAGE);
-    temporalExitMsgOtherResourceError.setResourceName("OtherResource.run");
 
     final var spans = List.of(
         simple, noError, otherError, temporalExitMsgError, temporalExitMsgOtherResourceError);
@@ -65,24 +65,24 @@ void testIsExitTrace() {
     assertEquals(false, interceptor.isExitTrace(new DummySpan()));
 
     final var temporalTrace = new DummySpan();
-    temporalTrace.setResourceName(CONNECTION_MANAGER_WORKFLOW_IMPL_RESOURCE_NAME);
+    temporalTrace.setOperationName(WORKFLOW_TRACE_OPERATION_NAME);
     assertEquals(false, interceptor.isExitTrace(temporalTrace));
 
     final var temporalTraceWithError = new DummySpan();
     temporalTraceWithError.setError(true);
-    temporalTraceWithError.setResourceName(CONNECTION_MANAGER_WORKFLOW_IMPL_RESOURCE_NAME);
+    temporalTraceWithError.setOperationName(WORKFLOW_TRACE_OPERATION_NAME);
     assertEquals(false, interceptor.isExitTrace(temporalTraceWithError));
 
     final var temporalTraceWithExitError = new DummySpan();
     temporalTraceWithExitError.setError(true);
+    temporalTraceWithExitError.setOperationName(WORKFLOW_TRACE_OPERATION_NAME);
     temporalTraceWithExitError.setTag(ERROR_MESSAGE_TAG_KEY, EXIT_ERROR_MESSAGE);
-    temporalTraceWithExitError.setResourceName(CONNECTION_MANAGER_WORKFLOW_IMPL_RESOURCE_NAME);
     assertEquals(true, interceptor.isExitTrace(temporalTraceWithExitError));
 
     final var otherTemporalTraceWithExitError = new DummySpan();
     otherTemporalTraceWithExitError.setError(true);
+    otherTemporalTraceWithExitError.setOperationName("OtherOperation");
     otherTemporalTraceWithExitError.setTag(ERROR_MESSAGE_TAG_KEY, EXIT_ERROR_MESSAGE);
-    otherTemporalTraceWithExitError.setResourceName("OtherResource");
     assertEquals(false, interceptor.isExitTrace(otherTemporalTraceWithExitError));
   }