Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(telemetry): fix hardcoded aspect name and cover errors when producing MAE #4981

Merged
merged 5 commits into from
May 24, 2022
Merged

fix(telemetry): fix hardcoded aspect name and cover errors when producing MAE #4981

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
942ea0b
fix(telemetry): fix hardcoded aspect name and cover errors when produ…
RyanHolstien May 23, 2022
17bbda8
fix(telemetry): make smoke tests not run telemetry
RyanHolstien May 23, 2022
7b5610b
fix(telemetry): add telemetry clientId test
RyanHolstien May 23, 2022
dd7bb9b
checkstyle
RyanHolstien May 23, 2022
b0f5dd1
move environment variable to invocation
RyanHolstien May 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions metadata-io/src/main/java/com/linkedin/metadata/entity/EntityService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,10 +442,13 @@ protected RecordTemplate sendEventForUpdateAspectResult(@Nonnull final Urn urn,
produceMCLTimer.stop();

// For legacy reasons, keep producing to the MAE event stream without blocking ingest
Timer.Context produceMAETimer = MetricUtils.timer(this.getClass(), "produceMAE").time();
produceMetadataAuditEvent(urn, aspectName, oldValue, updatedValue, result.getOldSystemMetadata(),
result.getNewSystemMetadata(), MetadataAuditOperation.UPDATE);
produceMAETimer.stop();
try {
Timer.Context produceMAETimer = MetricUtils.timer(this.getClass(), "produceMAE").time();
produceMetadataAuditEvent(urn, aspectName, oldValue, updatedValue, result.getOldSystemMetadata(), result.getNewSystemMetadata(), MetadataAuditOperation.UPDATE);
produceMAETimer.stop();
} catch (Exception e) {
log.warn("Unable to produce legacy MAE, entity may not have legacy Snapshot schema.", e);
shirshanka marked this conversation as resolved.
Show resolved Hide resolved
}
} else {
log.debug("Skipped producing MetadataAuditEvent for ingested aspect {}, urn {}. Aspect has not changed.",
aspectName, urn);
Expand Down
2 changes: 1 addition & 1 deletion ...ta-service/factories/src/main/java/com/linkedin/gms/factory/telemetry/TelemetryUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
public final class TelemetryUtils {

public static final String CLIENT_ID_URN = "urn:li:telemetry:clientId";
public static final String CLIENT_ID_ASPECT = "clientId";
public static final String CLIENT_ID_ASPECT = "telemetryClientId";

private static String _clientId;

Expand Down
1 change: 1 addition & 0 deletions smoke-test/smoke.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ pip install --upgrade pip wheel setuptools
pip install -r requirements.txt

echo "DATAHUB_VERSION = $DATAHUB_VERSION"
export DATAHUB_TELEMETRY_ENABLED=false
datahub docker quickstart --quickstart-compose-file ../docker/quickstart/docker-compose-without-neo4j.quickstart.yml --dump-logs-on-failure
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add it specifically to the invocation?
DATAHUB_TELEMETRY_ENABLED=false datahub docker quickstart ...

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want telemetry if someone runs a local smoke test?


(cd tests/cypress ; yarn install)
Expand Down