Skip to content

Commit bcc45a7

Browse files
authored
Revert "Trace Failure Origins (#19550)"
This reverts commit fbdbb89.
1 parent ed4ec64 commit bcc45a7

File tree

3 files changed

+3
-16
lines changed

3 files changed

+3
-16
lines changed

airbyte-metrics/metrics-lib/src/main/java/io/airbyte/metrics/lib/ApmTraceConstants.java

-5
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,6 @@ public static final class Tags {
6363
*/
6464
public static final String DOCKER_IMAGE_KEY = "docker_image";
6565

66-
/**
67-
* Name of the APM trace tag that holds the failure origin(s) associated with the trace.
68-
*/
69-
public static final String FAILURE_ORIGINS_KEY = "failure_origins";
70-
7166
/**
7267
* Name of the APM trace tag that holds the job ID value associated with the trace.
7368
*/

airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/JobCreationAndStatusUpdateActivityImpl.java

+2-10
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import static io.airbyte.metrics.lib.ApmTraceConstants.ACTIVITY_TRACE_OPERATION_NAME;
99
import static io.airbyte.metrics.lib.ApmTraceConstants.Tags.ATTEMPT_NUMBER_KEY;
1010
import static io.airbyte.metrics.lib.ApmTraceConstants.Tags.CONNECTION_ID_KEY;
11-
import static io.airbyte.metrics.lib.ApmTraceConstants.Tags.FAILURE_ORIGINS_KEY;
1211
import static io.airbyte.metrics.lib.ApmTraceConstants.Tags.JOB_ID_KEY;
1312
import static io.airbyte.persistence.job.models.AttemptStatus.FAILED;
1413

@@ -23,7 +22,6 @@
2322
import io.airbyte.config.Configs.WorkerEnvironment;
2423
import io.airbyte.config.DestinationConnection;
2524
import io.airbyte.config.FailureReason;
26-
import io.airbyte.config.FailureReason.FailureOrigin;
2725
import io.airbyte.config.JobConfig;
2826
import io.airbyte.config.JobOutput;
2927
import io.airbyte.config.JobSyncConfig;
@@ -58,7 +56,6 @@
5856
import io.airbyte.workers.run.TemporalWorkerRunFactory;
5957
import io.airbyte.workers.run.WorkerRun;
6058
import io.micronaut.context.annotation.Requires;
61-
import io.micronaut.core.util.CollectionUtils;
6259
import jakarta.inject.Singleton;
6360
import java.io.IOException;
6461
import java.nio.file.Path;
@@ -70,7 +67,6 @@
7067
import java.util.OptionalLong;
7168
import java.util.Set;
7269
import java.util.UUID;
73-
import java.util.stream.Collectors;
7470
import lombok.extern.slf4j.Slf4j;
7571

7672
@Slf4j
@@ -291,16 +287,12 @@ public void jobFailure(final JobFailureInput input) {
291287
@Override
292288
public void attemptFailure(final AttemptFailureInput input) {
293289
try {
290+
ApmTraceUtils.addTagsToTrace(Map.of(ATTEMPT_NUMBER_KEY, input.getAttemptId(), JOB_ID_KEY, input.getJobId()));
291+
294292
final int attemptId = input.getAttemptId();
295293
final long jobId = input.getJobId();
296294
final AttemptFailureSummary failureSummary = input.getAttemptFailureSummary();
297295

298-
ApmTraceUtils.addTagsToTrace(Map.of(ATTEMPT_NUMBER_KEY, attemptId, JOB_ID_KEY, jobId));
299-
if (CollectionUtils.isNotEmpty(failureSummary.getFailures())) {
300-
ApmTraceUtils.addTagsToTrace(Map.of(FAILURE_ORIGINS_KEY, failureSummary.getFailures().stream().map(FailureReason::getFailureOrigin).map(
301-
FailureOrigin::name).collect(Collectors.joining(","))));
302-
}
303-
304296
jobPersistence.failAttempt(jobId, attemptId);
305297
jobPersistence.writeAttemptFailureSummary(jobId, attemptId, failureSummary);
306298

docker-compose.datadog.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This exists _only_ for testing datadog integrations!
33
#
44
# Usage:
5-
# 1. Create an organization API Key in DataDog (Organization Settings > API Keys)
5+
# 1. create an API Key in datadog
66
# 2. wget -O dd-java-agent.jar 'https://dtdg.co/latest-java-tracer'
77
# 3. DD_API_KEY=[datadog api key] VERSION=dev docker-compose -f docker-compose.yaml -f docker-compose.datadog.yaml up -d
88
version: "3.7"

0 commit comments

Comments
 (0)