yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-10-06 06:26:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(trace-model): refactor trace model package (#12510)

Browse Source
This commit is contained in:
david-leifker 2025-01-31 08:33:24 -06:00 committed by GitHub
parent e28e682d07
commit e2b1ed7530
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
metadata-io/src/main/java/com/linkedin/metadata/trace/KafkaTraceReader.java
View File

@ -6,10 +6,10 @@ import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.linkedin.common.urn.Urn;
import com.linkedin.data.template.RecordTemplate;
import com.linkedin.metadata.systemmetadata.TraceStorageStatus;
import com.linkedin.metadata.systemmetadata.TraceWriteStatus;
import com.linkedin.mxe.SystemMetadata;
import com.linkedin.util.Pair;
import io.datahubproject.openapi.v1.models.TraceStorageStatus;
import io.datahubproject.openapi.v1.models.TraceWriteStatus;
import java.time.Duration;
import java.util.Collection;
import java.util.Collections;

6
metadata-io/src/main/java/com/linkedin/metadata/trace/TraceServiceImpl.java
View File

@ -11,9 +11,6 @@ import com.linkedin.metadata.models.registry.EntityRegistry;
import com.linkedin.metadata.run.AspectRowSummary;
import com.linkedin.metadata.systemmetadata.SystemMetadataService;
import com.linkedin.metadata.systemmetadata.TraceService;
import com.linkedin.metadata.systemmetadata.TraceStatus;
import com.linkedin.metadata.systemmetadata.TraceStorageStatus;
import com.linkedin.metadata.systemmetadata.TraceWriteStatus;
import com.linkedin.mxe.FailedMetadataChangeProposal;
import com.linkedin.mxe.SystemMetadata;
import com.linkedin.util.Pair;
@ -21,6 +18,9 @@ import io.datahubproject.metadata.context.OperationContext;
import io.datahubproject.metadata.context.TraceContext;
import io.datahubproject.metadata.context.TraceIdGenerator;
import io.datahubproject.metadata.exception.TraceException;
import io.datahubproject.openapi.v1.models.TraceStatus;
import io.datahubproject.openapi.v1.models.TraceStorageStatus;
import io.datahubproject.openapi.v1.models.TraceWriteStatus;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;

4
metadata-io/src/test/java/com/linkedin/metadata/trace/BaseKafkaTraceReaderTest.java
View File

@ -12,11 +12,11 @@ import com.linkedin.common.urn.Urn;
import com.linkedin.common.urn.UrnUtils;
import com.linkedin.data.template.RecordTemplate;
import com.linkedin.data.template.StringMap;
import com.linkedin.metadata.systemmetadata.TraceStorageStatus;
import com.linkedin.metadata.systemmetadata.TraceWriteStatus;
import com.linkedin.mxe.SystemMetadata;
import com.linkedin.util.Pair;
import io.datahubproject.metadata.context.TraceContext;
import io.datahubproject.openapi.v1.models.TraceStorageStatus;
import io.datahubproject.openapi.v1.models.TraceWriteStatus;
import java.io.IOException;
import java.time.Duration;
import java.util.Collections;

6
metadata-io/src/test/java/com/linkedin/metadata/trace/TraceServiceImplTest.java
View File

@ -25,9 +25,6 @@ import com.linkedin.metadata.EventUtils;
import com.linkedin.metadata.entity.EntityService;
import com.linkedin.metadata.run.AspectRowSummary;
import com.linkedin.metadata.systemmetadata.SystemMetadataService;
import com.linkedin.metadata.systemmetadata.TraceStatus;
import com.linkedin.metadata.systemmetadata.TraceStorageStatus;
import com.linkedin.metadata.systemmetadata.TraceWriteStatus;
import com.linkedin.mxe.FailedMetadataChangeProposal;
import com.linkedin.mxe.MetadataChangeProposal;
import com.linkedin.mxe.SystemMetadata;
@ -35,6 +32,9 @@ import com.linkedin.util.Pair;
import io.datahubproject.metadata.context.OperationContext;
import io.datahubproject.metadata.context.TraceContext;
import io.datahubproject.metadata.context.TraceIdGenerator;
import io.datahubproject.openapi.v1.models.TraceStatus;
import io.datahubproject.openapi.v1.models.TraceStorageStatus;
import io.datahubproject.openapi.v1.models.TraceWriteStatus;
import io.datahubproject.test.metadata.context.TestOperationContexts;
import java.time.Instant;
import java.util.Collections;

1
metadata-service/openapi-servlet/models/build.gradle
View File

@ -6,7 +6,6 @@ dependencies {
implementation project(':entity-registry')
implementation project(':metadata-operation-context')
implementation project(':metadata-auth:auth-api')
implementation project(':metadata-service:services')
implementation externalDependency.jacksonDataBind
implementation externalDependency.httpClient

1
metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceResponseV1.java
View File

@ -2,7 +2,6 @@ package io.datahubproject.openapi.v1.models;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.linkedin.common.urn.Urn;
import com.linkedin.metadata.systemmetadata.TraceStatus;
import java.util.LinkedHashMap;
import java.util.Map;
import lombok.AllArgsConstructor;

2
metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStatus.java → metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceStatus.java
View File

@ -1,4 +1,4 @@
package com.linkedin.metadata.systemmetadata;
package io.datahubproject.openapi.v1.models;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.AllArgsConstructor;

2
metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceStorageStatus.java → metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceStorageStatus.java
View File

@ -1,4 +1,4 @@
package com.linkedin.metadata.systemmetadata;
package io.datahubproject.openapi.v1.models;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.datahubproject.metadata.exception.TraceException;

2
metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceWriteStatus.java → metadata-service/openapi-servlet/models/src/main/java/io/datahubproject/openapi/v1/models/TraceWriteStatus.java
View File

@ -1,4 +1,4 @@
package com.linkedin.metadata.systemmetadata;
package io.datahubproject.openapi.v1.models;
public enum TraceWriteStatus {
// error occurred during processing

6
metadata-service/openapi-servlet/src/test/java/io/datahubproject/openapi/operations/v1/TraceControllerTest.java
View File

@ -18,15 +18,15 @@ import com.linkedin.common.urn.Urn;
import com.linkedin.common.urn.UrnUtils;
import com.linkedin.metadata.models.registry.EntityRegistry;
import com.linkedin.metadata.systemmetadata.TraceService;
import com.linkedin.metadata.systemmetadata.TraceStatus;
import com.linkedin.metadata.systemmetadata.TraceStorageStatus;
import com.linkedin.metadata.systemmetadata.TraceWriteStatus;
import io.datahubproject.metadata.context.ObjectMapperContext;
import io.datahubproject.metadata.context.OperationContext;
import io.datahubproject.metadata.context.TraceContext;
import io.datahubproject.openapi.config.TracingInterceptor;
import io.datahubproject.openapi.v1.models.TraceRequestV1;
import io.datahubproject.openapi.v1.models.TraceResponseV1;
import io.datahubproject.openapi.v1.models.TraceStatus;
import io.datahubproject.openapi.v1.models.TraceStorageStatus;
import io.datahubproject.openapi.v1.models.TraceWriteStatus;
import io.datahubproject.test.metadata.context.TestOperationContexts;
import java.util.List;
import java.util.Map;

1
metadata-service/services/build.gradle
View File

@ -16,6 +16,7 @@ dependencies {
implementation project(':metadata-events:mxe-avro')
implementation project(':metadata-events:mxe-registration')
implementation project(':metadata-events:mxe-utils-avro')
api project(':metadata-service:openapi-servlet:models')
api project(path: ':metadata-models', configuration: 'dataTemplate')
api project(':metadata-models')

1
metadata-service/services/src/main/java/com/linkedin/metadata/systemmetadata/TraceService.java
View File

@ -2,6 +2,7 @@ package com.linkedin.metadata.systemmetadata;
import com.linkedin.common.urn.Urn;
import io.datahubproject.metadata.context.OperationContext;
import io.datahubproject.openapi.v1.models.TraceStatus;
import java.util.List;
import java.util.Map;
import javax.annotation.Nonnull;