From f27b7e137bfb214fa23c5fb78f48cfc65f8f67ed Mon Sep 17 00:00:00 2001 From: Atul Mohan Date: Thu, 22 Mar 2018 13:49:37 -0500 Subject: [PATCH 1/4] Add getters for AlertEvent --- .../java/util/emitter/service/AlertEvent.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/java-util/src/main/java/io/druid/java/util/emitter/service/AlertEvent.java b/java-util/src/main/java/io/druid/java/util/emitter/service/AlertEvent.java index e52c423045e2..15721f15cd4c 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/service/AlertEvent.java +++ b/java-util/src/main/java/io/druid/java/util/emitter/service/AlertEvent.java @@ -25,6 +25,7 @@ import io.druid.java.util.emitter.core.Event; import org.joda.time.DateTime; +import java.util.Collections; import java.util.Map; /** @@ -106,6 +107,16 @@ public String getFeed() return "alerts"; } + public String getService() + { + return serviceDimensions.get("service"); + } + + public String getHost() + { + return serviceDimensions.get("host"); + } + public Severity getSeverity() { return severity; @@ -116,6 +127,11 @@ public String getDescription() return description; } + public Map getDataMap() + { + return Collections.unmodifiableMap(dataMap); + } + @Override @JsonValue public Map toMap() From ea967601aaf7c31cf0ca62b1c2920d986081c413 Mon Sep 17 00:00:00 2001 From: Atul Mohan Date: Mon, 9 Apr 2018 11:26:54 -0500 Subject: [PATCH 2/4] Move PublicApi and ExtensionPoint to java-util --- .../druid/guice/annotations/ExtensionPoint.java | 0 .../io/druid/guice/annotations/PublicApi.java | 0 .../java/util/emitter/service/AlertEvent.java | 16 ++++++++++++++++ 3 files changed, 16 insertions(+) rename {api => java-util}/src/main/java/io/druid/guice/annotations/ExtensionPoint.java (100%) rename {api => java-util}/src/main/java/io/druid/guice/annotations/PublicApi.java (100%) diff --git a/api/src/main/java/io/druid/guice/annotations/ExtensionPoint.java b/java-util/src/main/java/io/druid/guice/annotations/ExtensionPoint.java similarity index 100% rename from api/src/main/java/io/druid/guice/annotations/ExtensionPoint.java rename to java-util/src/main/java/io/druid/guice/annotations/ExtensionPoint.java diff --git a/api/src/main/java/io/druid/guice/annotations/PublicApi.java b/java-util/src/main/java/io/druid/guice/annotations/PublicApi.java similarity index 100% rename from api/src/main/java/io/druid/guice/annotations/PublicApi.java rename to java-util/src/main/java/io/druid/guice/annotations/PublicApi.java diff --git a/java-util/src/main/java/io/druid/java/util/emitter/service/AlertEvent.java b/java-util/src/main/java/io/druid/java/util/emitter/service/AlertEvent.java index 15721f15cd4c..c742b59a4f5c 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/service/AlertEvent.java +++ b/java-util/src/main/java/io/druid/java/util/emitter/service/AlertEvent.java @@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.collect.ImmutableMap; +import io.druid.guice.annotations.PublicApi; import io.druid.java.util.common.DateTimes; import io.druid.java.util.emitter.core.Event; import org.joda.time.DateTime; @@ -107,11 +108,21 @@ public String getFeed() return "alerts"; } + /* + * This method is used in certain proprietary emitter extensions + */ + @PublicApi + @SuppressWarnings("unused") public String getService() { return serviceDimensions.get("service"); } + /* + * This method is used in certain proprietary emitter extensions + */ + @PublicApi + @SuppressWarnings("unused") public String getHost() { return serviceDimensions.get("host"); @@ -127,6 +138,11 @@ public String getDescription() return description; } + /* + * This method is used in certain proprietary emitter extensions + */ + @PublicApi + @SuppressWarnings("unused") public Map getDataMap() { return Collections.unmodifiableMap(dataMap); From fa8c7202dfd283f57f29e5b9d38afb34a1c775f2 Mon Sep 17 00:00:00 2001 From: Atul Mohan Date: Mon, 9 Apr 2018 14:22:32 -0500 Subject: [PATCH 3/4] Fix publicapi annotation usage --- .../java/io/druid/java/util/emitter/service/AlertEvent.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/java-util/src/main/java/io/druid/java/util/emitter/service/AlertEvent.java b/java-util/src/main/java/io/druid/java/util/emitter/service/AlertEvent.java index c742b59a4f5c..183bf37b614a 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/service/AlertEvent.java +++ b/java-util/src/main/java/io/druid/java/util/emitter/service/AlertEvent.java @@ -31,6 +31,7 @@ /** */ +@PublicApi public class AlertEvent implements Event { private final ImmutableMap serviceDimensions; @@ -111,7 +112,6 @@ public String getFeed() /* * This method is used in certain proprietary emitter extensions */ - @PublicApi @SuppressWarnings("unused") public String getService() { @@ -121,7 +121,6 @@ public String getService() /* * This method is used in certain proprietary emitter extensions */ - @PublicApi @SuppressWarnings("unused") public String getHost() { @@ -141,7 +140,6 @@ public String getDescription() /* * This method is used in certain proprietary emitter extensions */ - @PublicApi @SuppressWarnings("unused") public Map getDataMap() { From ce2ad4e4c698e528752e5874af032dbbeb410c54 Mon Sep 17 00:00:00 2001 From: Atul Mohan Date: Mon, 9 Apr 2018 15:24:18 -0500 Subject: [PATCH 4/4] Add publicapi annotations to ServiceMetricEvent and RequestLogEvent --- .../io/druid/java/util/emitter/service/ServiceMetricEvent.java | 2 ++ .../main/java/io/druid/server/log/EmittingRequestLogger.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/java-util/src/main/java/io/druid/java/util/emitter/service/ServiceMetricEvent.java b/java-util/src/main/java/io/druid/java/util/emitter/service/ServiceMetricEvent.java index 07564330785d..5a76fa1acea5 100644 --- a/java-util/src/main/java/io/druid/java/util/emitter/service/ServiceMetricEvent.java +++ b/java-util/src/main/java/io/druid/java/util/emitter/service/ServiceMetricEvent.java @@ -23,6 +23,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; +import io.druid.guice.annotations.PublicApi; import io.druid.java.util.common.DateTimes; import io.druid.java.util.common.ISE; import io.druid.java.util.emitter.core.Event; @@ -33,6 +34,7 @@ /** */ +@PublicApi public class ServiceMetricEvent implements Event { public static Builder builder() diff --git a/server/src/main/java/io/druid/server/log/EmittingRequestLogger.java b/server/src/main/java/io/druid/server/log/EmittingRequestLogger.java index aeb12832b51d..5565375d9205 100644 --- a/server/src/main/java/io/druid/server/log/EmittingRequestLogger.java +++ b/server/src/main/java/io/druid/server/log/EmittingRequestLogger.java @@ -22,6 +22,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.collect.ImmutableMap; +import io.druid.guice.annotations.PublicApi; import io.druid.java.util.emitter.core.Event; import io.druid.java.util.emitter.service.ServiceEmitter; import io.druid.java.util.emitter.service.ServiceEventBuilder; @@ -58,6 +59,7 @@ public String toString() '}'; } + @PublicApi public static class RequestLogEvent implements Event { final ImmutableMap serviceDimensions;