This is an automated email from the ASF dual-hosted git repository.
wlo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/gobblin.git
The following commit(s) were added to refs/heads/master by this push:
new c1a09f061 [GOBBLIN-2064] Use proper GSON builder class for
GaaSObservabilityProducer and cleanup fully qualified classnames in tests
(#3945)
c1a09f061 is described below
commit c1a09f0617590ef22092fb2c1e2db3b47c1de8c3
Author: William Lo <[email protected]>
AuthorDate: Wed May 8 12:04:31 2024 -0400
[GOBBLIN-2064] Use proper GSON builder class for GaaSObservabilityProducer
and cleanup fully qualified classnames in tests (#3945)
Remove full classnames and use imports for mock classes, use proper gson
builder
---
.../runtime/KafkaAvroJobStatusMonitorTest.java | 22 +++++++++++-----------
.../GaaSJobObservabilityEventProducer.java | 2 +-
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/gobblin-modules/gobblin-kafka-09/src/test/java/org/apache/gobblin/runtime/KafkaAvroJobStatusMonitorTest.java
b/gobblin-modules/gobblin-kafka-09/src/test/java/org/apache/gobblin/runtime/KafkaAvroJobStatusMonitorTest.java
index 68e208e9c..647b5cfe1 100644
---
a/gobblin-modules/gobblin-kafka-09/src/test/java/org/apache/gobblin/runtime/KafkaAvroJobStatusMonitorTest.java
+++
b/gobblin-modules/gobblin-kafka-09/src/test/java/org/apache/gobblin/runtime/KafkaAvroJobStatusMonitorTest.java
@@ -201,7 +201,7 @@ public class KafkaAvroJobStatusMonitorTest {
Thread.currentThread().interrupt();
}
- MockKafkaAvroJobStatusMonitor jobStatusMonitor =
createMockKafkaAvroJobStatusMonitor(new AtomicBoolean(false),
ConfigFactory.empty(), new
org.apache.gobblin.service.monitoring.NoopGaaSJobObservabilityEventProducer());
+ MockKafkaAvroJobStatusMonitor jobStatusMonitor =
createMockKafkaAvroJobStatusMonitor(new AtomicBoolean(false),
ConfigFactory.empty(), new NoopGaaSJobObservabilityEventProducer());
jobStatusMonitor.buildMetricsContextAndMetrics();
ConsumerIterator<byte[], byte[]> iterator =
this.kafkaTestHelper.getIteratorForTopic(TOPIC);
@@ -279,7 +279,7 @@ public class KafkaAvroJobStatusMonitorTest {
}
MockKafkaAvroJobStatusMonitor jobStatusMonitor =
createMockKafkaAvroJobStatusMonitor(new AtomicBoolean(false),
ConfigFactory.empty(),
- new
org.apache.gobblin.service.monitoring.NoopGaaSJobObservabilityEventProducer());
+ new NoopGaaSJobObservabilityEventProducer());
jobStatusMonitor.buildMetricsContextAndMetrics();
ConsumerIterator<byte[], byte[]> iterator =
this.kafkaTestHelper.getIteratorForTopic(TOPIC);
@@ -339,9 +339,9 @@ public class KafkaAvroJobStatusMonitorTest {
Config conf = ConfigFactory.empty().withValue(
KafkaJobStatusMonitor.JOB_STATUS_MONITOR_PREFIX + "." +
RETRY_MULTIPLIER,
ConfigValueFactory.fromAnyRef(TimeUnit.MILLISECONDS.toMillis(1L)));
MockKafkaAvroJobStatusMonitor jobStatusMonitor =
createMockKafkaAvroJobStatusMonitor(shouldThrowFakeExceptionInParseJobStatusToggle,
conf,
- new
org.apache.gobblin.service.monitoring.NoopGaaSJobObservabilityEventProducer());
- jobStatusMonitor.buildMetricsContextAndMetrics();
+ new NoopGaaSJobObservabilityEventProducer());
+ jobStatusMonitor.buildMetricsContextAndMetrics();
Iterator<DecodeableKafkaRecord> recordIterator = Iterators.transform(
this.kafkaTestHelper.getIteratorForTopic(TOPIC),
this::convertMessageAndMetadataToDecodableKafkaRecord);
@@ -397,7 +397,7 @@ public class KafkaAvroJobStatusMonitorTest {
Thread.currentThread().interrupt();
}
- MockKafkaAvroJobStatusMonitor jobStatusMonitor =
createMockKafkaAvroJobStatusMonitor(new AtomicBoolean(false),
ConfigFactory.empty(), new
org.apache.gobblin.service.monitoring.NoopGaaSJobObservabilityEventProducer());
+ MockKafkaAvroJobStatusMonitor jobStatusMonitor =
createMockKafkaAvroJobStatusMonitor(new AtomicBoolean(false),
ConfigFactory.empty(), new NoopGaaSJobObservabilityEventProducer());
jobStatusMonitor.buildMetricsContextAndMetrics();
Iterator<DecodeableKafkaRecord> recordIterator = Iterators.transform(
this.kafkaTestHelper.getIteratorForTopic(TOPIC),
@@ -456,7 +456,7 @@ public class KafkaAvroJobStatusMonitorTest {
Thread.currentThread().interrupt();
}
- MockKafkaAvroJobStatusMonitor jobStatusMonitor =
createMockKafkaAvroJobStatusMonitor(new AtomicBoolean(false),
ConfigFactory.empty(), new
org.apache.gobblin.service.monitoring.NoopGaaSJobObservabilityEventProducer());
+ MockKafkaAvroJobStatusMonitor jobStatusMonitor =
createMockKafkaAvroJobStatusMonitor(new AtomicBoolean(false),
ConfigFactory.empty(), new NoopGaaSJobObservabilityEventProducer());
jobStatusMonitor.buildMetricsContextAndMetrics();
Iterator<DecodeableKafkaRecord> recordIterator = Iterators.transform(
this.kafkaTestHelper.getIteratorForTopic(TOPIC),
@@ -507,7 +507,7 @@ public class KafkaAvroJobStatusMonitorTest {
}
MockKafkaAvroJobStatusMonitor jobStatusMonitor =
createMockKafkaAvroJobStatusMonitor(new AtomicBoolean(false),
ConfigFactory.empty(),
- new
org.apache.gobblin.service.monitoring.NoopGaaSJobObservabilityEventProducer());
+ new NoopGaaSJobObservabilityEventProducer());
jobStatusMonitor.buildMetricsContextAndMetrics();
Iterator<DecodeableKafkaRecord> recordIterator = Iterators.transform(
this.kafkaTestHelper.getIteratorForTopic(TOPIC),
@@ -537,8 +537,8 @@ public class KafkaAvroJobStatusMonitorTest {
Thread.currentThread().interrupt();
}
MultiContextIssueRepository issueRepository = new
InMemoryMultiContextIssueRepository();
- MockGaaSJobObservabilityEventProducer mockEventProducer = new
MockGaaSJobObservabilityEventProducer(
- ConfigUtils.configToState(ConfigFactory.empty()), issueRepository,
false);
+ MockGaaSJobObservabilityEventProducer mockEventProducer = new
MockGaaSJobObservabilityEventProducer(ConfigUtils.configToState(ConfigFactory.empty()),
+ issueRepository, false);
MockKafkaAvroJobStatusMonitor jobStatusMonitor =
createMockKafkaAvroJobStatusMonitor(new AtomicBoolean(false),
ConfigFactory.empty(),
mockEventProducer);
jobStatusMonitor.buildMetricsContextAndMetrics();
@@ -584,8 +584,8 @@ public class KafkaAvroJobStatusMonitorTest {
Thread.currentThread().interrupt();
}
MultiContextIssueRepository issueRepository = new
InMemoryMultiContextIssueRepository();
-
org.apache.gobblin.service.monitoring.MockGaaSJobObservabilityEventProducer
mockEventProducer = new
org.apache.gobblin.service.monitoring.MockGaaSJobObservabilityEventProducer(
- ConfigUtils.configToState(ConfigFactory.empty()), issueRepository,
false);
+ MockGaaSJobObservabilityEventProducer mockEventProducer = new
MockGaaSJobObservabilityEventProducer(ConfigUtils.configToState(ConfigFactory.empty()),
+ issueRepository, false);
MockKafkaAvroJobStatusMonitor jobStatusMonitor =
createMockKafkaAvroJobStatusMonitor(new AtomicBoolean(false),
ConfigFactory.empty(),
mockEventProducer);
jobStatusMonitor.buildMetricsContextAndMetrics();
diff --git
a/gobblin-service/src/main/java/org/apache/gobblin/service/monitoring/GaaSJobObservabilityEventProducer.java
b/gobblin-service/src/main/java/org/apache/gobblin/service/monitoring/GaaSJobObservabilityEventProducer.java
index bd5c4eb3d..ab72a52f8 100644
---
a/gobblin-service/src/main/java/org/apache/gobblin/service/monitoring/GaaSJobObservabilityEventProducer.java
+++
b/gobblin-service/src/main/java/org/apache/gobblin/service/monitoring/GaaSJobObservabilityEventProducer.java
@@ -206,7 +206,7 @@ public abstract class GaaSJobObservabilityEventProducer
implements Closeable {
.setEffectiveUserUrn(jobState.getProp(AzkabanProjectConfig.USER_TO_PROXY, null))
.setDatasetsMetrics(datasetMetrics)
.setGaasId(this.state.getProp(ServiceConfigKeys.GOBBLIN_SERVICE_INSTANCE_NAME,
null))
-
.setJobProperties(GsonUtils.GSON_WITH_DATE_HANDLING.newBuilder().create().toJson(jobProperties))
+
.setJobProperties(GsonUtils.GSON_WITH_DATE_HANDLING.toJson(jobProperties))
.setSourceNode(jobProperties.getProperty(ServiceConfigKeys.FLOW_SOURCE_IDENTIFIER_KEY,
""))
.setDestinationNode(jobProperties.getProperty(ServiceConfigKeys.FLOW_DESTINATION_IDENTIFIER_KEY,
""))
.setFlowEdgeId(!edgeId.isEmpty() ? edgeId : fullFlowEdge)
