diff options
25 files changed, 12 insertions, 596 deletions
diff --git a/logserver/src/main/java/com/yahoo/logserver/Server.java b/logserver/src/main/java/com/yahoo/logserver/Server.java index ff9939ff244..cfe2bcf0776 100644 --- a/logserver/src/main/java/com/yahoo/logserver/Server.java +++ b/logserver/src/main/java/com/yahoo/logserver/Server.java @@ -22,7 +22,6 @@ import java.util.logging.Logger; * @author Bjorn Borud * @author Stig Bakken */ -@SuppressWarnings("removal") // TODO Vespa 8: remove (com.yahoo.log.event) public class Server implements Runnable { private final AtomicBoolean signalCaught = new AtomicBoolean(false); static final String APPNAME = "logserver"; diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/logmetrics/LogMetricsHandler.java b/logserver/src/main/java/com/yahoo/logserver/handlers/logmetrics/LogMetricsHandler.java index 59475972279..68a32def9ad 100644 --- a/logserver/src/main/java/com/yahoo/logserver/handlers/logmetrics/LogMetricsHandler.java +++ b/logserver/src/main/java/com/yahoo/logserver/handlers/logmetrics/LogMetricsHandler.java @@ -24,7 +24,6 @@ import com.yahoo.logserver.handlers.AbstractLogHandler; * * @author hmusum */ -@SuppressWarnings("removal") // TODO Vespa 8: remove (com.yahoo.log.event) public class LogMetricsHandler extends AbstractLogHandler { private static final long EVENTINTERVAL = 5 * 60; // in seconds diff --git a/vespalog/abi-spec.json b/vespalog/abi-spec.json index 24ae08b6ca3..aaf98e57410 100644 --- a/vespalog/abi-spec.json +++ b/vespalog/abi-spec.json @@ -1,20 +1,4 @@ { - "com.yahoo.log.FileLogTarget": { - "superClass": "java.lang.Object", - "interfaces": [ - "com.yahoo.log.LogTarget" - ], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>(java.io.File)", - "public synchronized java.io.OutputStream open()", - "public synchronized void close()", - "public java.lang.String toString()" - ], - "fields": [] - }, "com.yahoo.log.InvalidLogFormatException": { "superClass": "java.lang.Exception", "interfaces": [], @@ -28,36 +12,6 @@ ], "fields": [] }, - "com.yahoo.log.LevelController": { - "superClass": "java.lang.Object", - "interfaces": [], - "attributes": [ - "public", - "interface", - "abstract" - ], - "methods": [ - "public abstract boolean shouldLog(java.util.logging.Level)", - "public abstract java.lang.String getOnOffString()", - "public abstract void checkBack()", - "public abstract java.util.logging.Level getLevelLimit()" - ], - "fields": [] - }, - "com.yahoo.log.LevelControllerRepo": { - "superClass": "java.lang.Object", - "interfaces": [], - "attributes": [ - "public", - "interface", - "abstract" - ], - "methods": [ - "public abstract com.yahoo.log.LevelController getLevelController(java.lang.String)", - "public abstract void close()" - ], - "fields": [] - }, "com.yahoo.log.LogFileDb": { "superClass": "java.lang.Object", "interfaces": [], @@ -169,90 +123,6 @@ ], "fields": [] }, - "com.yahoo.log.LogTarget": { - "superClass": "java.lang.Object", - "interfaces": [], - "attributes": [ - "public", - "interface", - "abstract" - ], - "methods": [ - "public abstract java.io.OutputStream open()", - "public abstract void close()" - ], - "fields": [] - }, - "com.yahoo.log.RejectFilter": { - "superClass": "java.lang.Object", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>()", - "public boolean shouldReject(java.lang.String)", - "public void addRejectedMessage(java.lang.String)", - "public static com.yahoo.log.RejectFilter createDefaultRejectFilter()" - ], - "fields": [] - }, - "com.yahoo.log.StderrLogTarget": { - "superClass": "java.lang.Object", - "interfaces": [ - "com.yahoo.log.LogTarget" - ], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>()", - "public java.io.OutputStream open()", - "public void close()" - ], - "fields": [] - }, - "com.yahoo.log.StdoutLogTarget": { - "superClass": "java.lang.Object", - "interfaces": [ - "com.yahoo.log.LogTarget" - ], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>()", - "public java.io.OutputStream open()", - "public void close()" - ], - "fields": [] - }, - "com.yahoo.log.Util": { - "superClass": "java.lang.Object", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>()", - "public static java.lang.String getHostName()", - "public static java.lang.String getPID()" - ], - "fields": [] - }, - "com.yahoo.log.VespaFormat": { - "superClass": "java.lang.Object", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>()", - "public static java.lang.String escape(java.lang.String)", - "public static java.lang.String formatTime(java.time.Instant)" - ], - "fields": [] - }, "com.yahoo.log.VespaFormatter": { "superClass": "java.util.logging.SimpleFormatter", "interfaces": [], @@ -271,267 +141,5 @@ "fields": [ "public static final java.lang.String serviceNameUnsetValue" ] - }, - "com.yahoo.log.VespaLevelControllerRepo": { - "superClass": "java.lang.Object", - "interfaces": [ - "com.yahoo.log.LevelControllerRepo" - ], - "attributes": [ - "public" - ], - "methods": [ - "public com.yahoo.log.LevelController getLevelController(java.lang.String)", - "public void close()" - ], - "fields": [] - }, - "com.yahoo.log.event.Collection": { - "superClass": "com.yahoo.log.event.Event", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>()", - "public void <init>(long, java.lang.String)" - ], - "fields": [] - }, - "com.yahoo.log.event.Count": { - "superClass": "com.yahoo.log.event.Event", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>()", - "public void <init>(java.lang.String, double)", - "public com.yahoo.log.event.Event setValue(java.lang.String, java.lang.String)" - ], - "fields": [] - }, - "com.yahoo.log.event.CountGroup": { - "superClass": "com.yahoo.log.event.Event", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>()", - "public void <init>(java.lang.String, java.lang.String)" - ], - "fields": [] - }, - "com.yahoo.log.event.Crash": { - "superClass": "com.yahoo.log.event.Event", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>()", - "public void <init>(java.lang.String, int, int)" - ], - "fields": [] - }, - "com.yahoo.log.event.Event": { - "superClass": "java.lang.Object", - "interfaces": [ - "java.io.Serializable" - ], - "attributes": [ - "public", - "abstract" - ], - "methods": [ - "protected void <init>()", - "public com.yahoo.log.event.Event setValue(java.lang.String, java.lang.String)", - "public java.lang.String getValue(java.lang.String)", - "public void setTime(long)", - "public long getTime()", - "public com.yahoo.log.event.Event setVersion(int)", - "public int getVersion()", - "public java.lang.String getValuePossiblyQuote(java.lang.String)", - "public java.lang.String getName()", - "public java.lang.String toString()", - "public static com.yahoo.log.event.Event parse(java.lang.String)", - "public static final void starting(java.lang.String)", - "public static final void started(java.lang.String)", - "public static final void stopping(java.lang.String, java.lang.String)", - "public static final void stopped(java.lang.String, int, int)", - "public static final void reloading(java.lang.String)", - "public static final void reloaded(java.lang.String)", - "public static final void count(java.lang.String, long)", - "public static final void value(java.lang.String, double)", - "public static final void histogram(java.lang.String, java.lang.String, java.lang.String)", - "public static final void valueGroup(java.lang.String, java.lang.String)", - "public static final void countGroup(java.lang.String, java.lang.String)", - "public static final void progress(java.lang.String, long, long)", - "public static final void state(java.lang.String, java.lang.String)", - "public static final void crash(java.lang.String, int, int)" - ], - "fields": [] - }, - "com.yahoo.log.event.Histogram": { - "superClass": "com.yahoo.log.event.Event", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>()", - "public void <init>(java.lang.String, java.lang.String, java.lang.String)" - ], - "fields": [] - }, - "com.yahoo.log.event.MalformedEventException": { - "superClass": "java.lang.Exception", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>(java.lang.Throwable)", - "public void <init>(java.lang.String)", - "public void <init>()" - ], - "fields": [] - }, - "com.yahoo.log.event.Progress": { - "superClass": "com.yahoo.log.event.Event", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>()", - "public void <init>(java.lang.String, java.lang.String, java.lang.String)", - "public void <init>(java.lang.String, double, double)", - "public void <init>(java.lang.String, java.lang.String)", - "public void <init>(java.lang.String, double)" - ], - "fields": [] - }, - "com.yahoo.log.event.Reloaded": { - "superClass": "com.yahoo.log.event.Event", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>()", - "public void <init>(java.lang.String)" - ], - "fields": [] - }, - "com.yahoo.log.event.Reloading": { - "superClass": "com.yahoo.log.event.Event", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>()", - "public void <init>(java.lang.String)" - ], - "fields": [] - }, - "com.yahoo.log.event.Started": { - "superClass": "com.yahoo.log.event.Event", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>()", - "public void <init>(java.lang.String)" - ], - "fields": [] - }, - "com.yahoo.log.event.Starting": { - "superClass": "com.yahoo.log.event.Event", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>()", - "public void <init>(java.lang.String)" - ], - "fields": [] - }, - "com.yahoo.log.event.State": { - "superClass": "com.yahoo.log.event.Event", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>()", - "public void <init>(java.lang.String, java.lang.String)" - ], - "fields": [] - }, - "com.yahoo.log.event.Stopped": { - "superClass": "com.yahoo.log.event.Event", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>()", - "public void <init>(java.lang.String, int, int)" - ], - "fields": [] - }, - "com.yahoo.log.event.Stopping": { - "superClass": "com.yahoo.log.event.Event", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>()", - "public void <init>(java.lang.String, java.lang.String)" - ], - "fields": [] - }, - "com.yahoo.log.event.Unknown": { - "superClass": "com.yahoo.log.event.Event", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>()", - "public com.yahoo.log.event.Unknown setName(java.lang.String)", - "public java.lang.String getName()" - ], - "fields": [] - }, - "com.yahoo.log.event.Value": { - "superClass": "com.yahoo.log.event.Event", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>()", - "public void <init>(java.lang.String, double)" - ], - "fields": [] - }, - "com.yahoo.log.event.ValueGroup": { - "superClass": "com.yahoo.log.event.Event", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>()", - "public void <init>(java.lang.String, java.lang.String)" - ], - "fields": [] } }
\ No newline at end of file diff --git a/vespalog/src/main/java/com/yahoo/log/event/Collection.java b/vespalog/src/main/java/com/yahoo/log/event/Collection.java deleted file mode 100644 index 331fdf33d9f..00000000000 --- a/vespalog/src/main/java/com/yahoo/log/event/Collection.java +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.log.event; - -/** - * - * @author Bjorn Borud - */ -@Deprecated(forRemoval = true, since = "7") -public class Collection extends Event { - public Collection () { - } - - public Collection (long collectionId, String name) { - setValue("collectionId", Long.toString(collectionId)); - setValue("name", name); - } -} diff --git a/vespalog/src/main/java/com/yahoo/log/event/Count.java b/vespalog/src/main/java/com/yahoo/log/event/Count.java index 284d23e6999..bc411628776 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/Count.java +++ b/vespalog/src/main/java/com/yahoo/log/event/Count.java @@ -5,8 +5,7 @@ package com.yahoo.log.event; * * @author Bjorn Borud */ -@Deprecated(forRemoval = true, since = "7") -public class Count extends Event { +class Count extends Event { public Count () { } diff --git a/vespalog/src/main/java/com/yahoo/log/event/CountGroup.java b/vespalog/src/main/java/com/yahoo/log/event/CountGroup.java deleted file mode 100755 index fc52c577bda..00000000000 --- a/vespalog/src/main/java/com/yahoo/log/event/CountGroup.java +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.log.event; - -@Deprecated(forRemoval = true, since = "7") -public class CountGroup extends Event { - public CountGroup () { - } - - public CountGroup (String name, String values) { - init(name, values); - } - - private void init (String name, String counts) { - setValue("name", name); - setValue("values", counts); - } -} diff --git a/vespalog/src/main/java/com/yahoo/log/event/Crash.java b/vespalog/src/main/java/com/yahoo/log/event/Crash.java index bcfaed4cce7..93efc64b061 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/Crash.java +++ b/vespalog/src/main/java/com/yahoo/log/event/Crash.java @@ -5,8 +5,7 @@ package com.yahoo.log.event; * * @author Bjorn Borud */ -@Deprecated(forRemoval = true, since = "7") -public class Crash extends Event { +class Crash extends Event { public Crash () { } diff --git a/vespalog/src/main/java/com/yahoo/log/event/Event.java b/vespalog/src/main/java/com/yahoo/log/event/Event.java index 288fd1f56dc..925b90dbf1d 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/Event.java +++ b/vespalog/src/main/java/com/yahoo/log/event/Event.java @@ -29,9 +29,8 @@ import java.util.regex.Pattern; * * @author Bjorn Borud * - * @deprecated Only for internal Vespa usage + * Only for internal Vespa usage */ -@Deprecated(forRemoval = true, since = "7") public abstract class Event implements Serializable { private static Logger log = Logger.getLogger(Event.class.getName()); @@ -426,20 +425,6 @@ public abstract class Event implements Serializable { } /** - * Static method for logging the <b>reloading</b> event. - */ - public static final void reloading (String name) { - log(getCallerLogger(), new Reloading(name)); - } - - /** - * Static method for logging the <b>reloaded</b> event. - */ - public static final void reloaded (String name) { - log(getCallerLogger(), new Reloaded(name)); - } - - /** * Static method for logging the <b>count</b> event. */ public static final void count (String name, long value) { @@ -454,29 +439,6 @@ public abstract class Event implements Serializable { } /** - * Static method for logging the <b>histogram</b> event. - */ - public static final void histogram (String name, String value, - String representation) { - log(getCallerLogger(), new Histogram(name, value, - representation)); - } - - /** - * Static method for logging a set of <b>value</b> events. - */ - public static final void valueGroup (String name, String value) { - log(getCallerLogger(), new ValueGroup(name, value)); - } - - /** - * Static method for logging a set of <b>count</b> events. - */ - public static final void countGroup (String name, String value) { - log(getCallerLogger(), new CountGroup(name, value)); - } - - /** * Static method for logging the <b>progress</b> event. */ public static final void progress (String name, long value, long total) { diff --git a/vespalog/src/main/java/com/yahoo/log/event/Histogram.java b/vespalog/src/main/java/com/yahoo/log/event/Histogram.java deleted file mode 100755 index 08875063a4e..00000000000 --- a/vespalog/src/main/java/com/yahoo/log/event/Histogram.java +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.log.event; - -@Deprecated(forRemoval = true, since = "7") -public class Histogram extends Event { - public Histogram () { - } - - public Histogram (String name, String value, String representation) { - init(name, value, representation); - } - - private void init (String name, String value, String representation) { - setValue("name", name); - setValue("counts", value); - setValue("representation", representation); - } -} diff --git a/vespalog/src/main/java/com/yahoo/log/event/MalformedEventException.java b/vespalog/src/main/java/com/yahoo/log/event/MalformedEventException.java index 6283832ff6d..a9f9774fd9f 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/MalformedEventException.java +++ b/vespalog/src/main/java/com/yahoo/log/event/MalformedEventException.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.log.event; -@Deprecated(forRemoval = true, since = "7") public class MalformedEventException extends Exception { public MalformedEventException (Throwable cause) { super(cause); diff --git a/vespalog/src/main/java/com/yahoo/log/event/Progress.java b/vespalog/src/main/java/com/yahoo/log/event/Progress.java index 2e54e72cb17..14ef9efe520 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/Progress.java +++ b/vespalog/src/main/java/com/yahoo/log/event/Progress.java @@ -5,8 +5,7 @@ package com.yahoo.log.event; * * @author Bjorn Borud */ -@Deprecated(forRemoval = true, since = "7") -public class Progress extends Event { +class Progress extends Event { public Progress () { } diff --git a/vespalog/src/main/java/com/yahoo/log/event/Reloaded.java b/vespalog/src/main/java/com/yahoo/log/event/Reloaded.java deleted file mode 100644 index 517c28f5f2e..00000000000 --- a/vespalog/src/main/java/com/yahoo/log/event/Reloaded.java +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.log.event; - -/** - * - * @author Bjorn Borud - */ -@Deprecated(forRemoval = true, since = "7") -public class Reloaded extends Event { - public Reloaded () { - } - - public Reloaded (String name) { - setValue("name", name); - } -} diff --git a/vespalog/src/main/java/com/yahoo/log/event/Reloading.java b/vespalog/src/main/java/com/yahoo/log/event/Reloading.java deleted file mode 100644 index ae537b84316..00000000000 --- a/vespalog/src/main/java/com/yahoo/log/event/Reloading.java +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.log.event; - -/** - * - * @author Bjorn Borud - */ -@Deprecated(forRemoval = true, since = "7") -public class Reloading extends Event { - public Reloading () { - } - - public Reloading (String name) { - setValue("name", name); - } -} diff --git a/vespalog/src/main/java/com/yahoo/log/event/Started.java b/vespalog/src/main/java/com/yahoo/log/event/Started.java index c3d90174893..af1e1bef7f7 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/Started.java +++ b/vespalog/src/main/java/com/yahoo/log/event/Started.java @@ -5,8 +5,7 @@ package com.yahoo.log.event; * * @author Bjorn Borud */ -@Deprecated(forRemoval = true, since = "7") -public class Started extends Event { +class Started extends Event { public Started () { } diff --git a/vespalog/src/main/java/com/yahoo/log/event/Starting.java b/vespalog/src/main/java/com/yahoo/log/event/Starting.java index 4f4af50a729..9a37a4b504e 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/Starting.java +++ b/vespalog/src/main/java/com/yahoo/log/event/Starting.java @@ -5,8 +5,7 @@ package com.yahoo.log.event; * * @author Bjorn Borud */ -@Deprecated(forRemoval = true, since = "7") -public class Starting extends Event { +class Starting extends Event { public Starting () { } diff --git a/vespalog/src/main/java/com/yahoo/log/event/State.java b/vespalog/src/main/java/com/yahoo/log/event/State.java index 106f4031fee..fd90ac3b95b 100755 --- a/vespalog/src/main/java/com/yahoo/log/event/State.java +++ b/vespalog/src/main/java/com/yahoo/log/event/State.java @@ -1,8 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.log.event; -@Deprecated(forRemoval = true, since = "7") -public class State extends Event { +class State extends Event { public State () { } diff --git a/vespalog/src/main/java/com/yahoo/log/event/Stopped.java b/vespalog/src/main/java/com/yahoo/log/event/Stopped.java index c6e95d877c4..15c7aee395e 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/Stopped.java +++ b/vespalog/src/main/java/com/yahoo/log/event/Stopped.java @@ -5,8 +5,7 @@ package com.yahoo.log.event; * * @author Bjorn Borud */ -@Deprecated(forRemoval = true, since = "7") -public class Stopped extends Event { +class Stopped extends Event { public Stopped () { } diff --git a/vespalog/src/main/java/com/yahoo/log/event/Stopping.java b/vespalog/src/main/java/com/yahoo/log/event/Stopping.java index daec0123e80..65693dc4a5b 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/Stopping.java +++ b/vespalog/src/main/java/com/yahoo/log/event/Stopping.java @@ -5,8 +5,7 @@ package com.yahoo.log.event; * * @author Bjorn Borud */ -@Deprecated(forRemoval = true, since = "7") -public class Stopping extends Event { +class Stopping extends Event { public Stopping () { } diff --git a/vespalog/src/main/java/com/yahoo/log/event/Unknown.java b/vespalog/src/main/java/com/yahoo/log/event/Unknown.java index b82cfebbaaa..388f8c5f363 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/Unknown.java +++ b/vespalog/src/main/java/com/yahoo/log/event/Unknown.java @@ -5,8 +5,7 @@ package com.yahoo.log.event; * * @author Bjorn Borud */ -@Deprecated(forRemoval = true, since = "7") -public class Unknown extends Event { +class Unknown extends Event { public Unknown() { } diff --git a/vespalog/src/main/java/com/yahoo/log/event/Value.java b/vespalog/src/main/java/com/yahoo/log/event/Value.java index d0d1f6424c7..2598a34ba14 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/Value.java +++ b/vespalog/src/main/java/com/yahoo/log/event/Value.java @@ -5,8 +5,7 @@ package com.yahoo.log.event; * * @author Bjorn Borud */ -@Deprecated(forRemoval = true, since = "7") -public class Value extends Event { +class Value extends Event { public Value () { } diff --git a/vespalog/src/main/java/com/yahoo/log/event/ValueGroup.java b/vespalog/src/main/java/com/yahoo/log/event/ValueGroup.java deleted file mode 100755 index 49835ca8ed4..00000000000 --- a/vespalog/src/main/java/com/yahoo/log/event/ValueGroup.java +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.log.event; - -@Deprecated(forRemoval = true, since = "7") -public class ValueGroup extends Event { - public ValueGroup () { - } - - public ValueGroup (String name, String values) { - init(name, values); - } - - private void init (String name, String value) { - setValue("name", name); - setValue("values", value); - } -} diff --git a/vespalog/src/test/java/com/yahoo/log/event/EventTestCase.java b/vespalog/src/test/java/com/yahoo/log/event/EventTestCase.java index 045c7cd874f..beac58e15b8 100644 --- a/vespalog/src/test/java/com/yahoo/log/event/EventTestCase.java +++ b/vespalog/src/test/java/com/yahoo/log/event/EventTestCase.java @@ -23,13 +23,10 @@ public class EventTestCase { Crash crashEvent; Progress progressEvent1; Progress progressEvent2; - Reloading reloadingEvent; - Reloaded reloadedEvent; Starting startingEvent; Started startedEvent; Stopping stoppingEvent; Stopped stoppedEvent; - Collection collectionEvent; Unknown unknownEvent; @Before @@ -41,13 +38,10 @@ public class EventTestCase { crashEvent = new Crash("appname", 1234, 11); progressEvent1 = new Progress("thename", 1); progressEvent2 = new Progress("thename", 1.0, 2.0); - reloadingEvent = new Reloading("thefilewereloading"); - reloadedEvent = new Reloaded("thefilewereloaded"); startingEvent = new Starting("startingName"); startedEvent = new Started("startedName"); stoppingEvent = new Stopping("stoppingName", "because we want to"); stoppedEvent = new Stopped("stoppedName", 1234, 1); - collectionEvent=new Collection(123456, "thename"); unknownEvent = new Unknown(); } @@ -61,13 +55,10 @@ public class EventTestCase { assertNotNull(crashEvent); assertNotNull(progressEvent1); assertNotNull(progressEvent2); - assertNotNull(reloadingEvent); - assertNotNull(reloadedEvent); assertNotNull(startingEvent); assertNotNull(startedEvent); assertNotNull(stoppingEvent); assertNotNull(stoppedEvent); - assertNotNull(collectionEvent); assertNotNull(unknownEvent); } @@ -88,12 +79,6 @@ public class EventTestCase { assertEquals("progress/1 name=thename value=1.0 total=2.0", progressEvent2.toString()); - assertEquals("reloaded/1 name=thefilewereloaded", - reloadedEvent.toString()); - - assertEquals("reloading/1 name=thefilewereloading", - reloadingEvent.toString()); - assertEquals("started/1 name=startedName", startedEvent.toString()); @@ -103,9 +88,6 @@ public class EventTestCase { assertEquals("stopping/1 name=stoppingName why=\"because we want to\"", stoppingEvent.toString()); - assertEquals("collection/1 collectionId=123456 name=thename", - collectionEvent.toString()); - assertEquals("stopped/1 name=stoppedName pid=1234 exitcode=1", stoppedEvent.toString()); } @@ -124,8 +106,6 @@ public class EventTestCase { parseEvent(crashEvent); parseEvent(progressEvent1); parseEvent(progressEvent2); - parseEvent(reloadingEvent); - parseEvent(reloadedEvent); parseEvent(startingEvent); parseEvent(startedEvent); parseEvent(stoppingEvent); @@ -166,8 +146,6 @@ public class EventTestCase { Event.started("startedName"); Event.stopping("stoppingName", "whyParam"); Event.stopped("stoppedName", 1, 2); - Event.reloading("reloadingName"); - Event.reloaded("reloadedName"); Event.count("countName", 1); Event.progress("progressName", 1, 2); Event.crash("crashName", 1, 2); @@ -176,7 +154,7 @@ public class EventTestCase { @Test public void testFunnyEvent () { - String funnyEvent = "collection/1 collectionId=1111111111 name=\"syncrows\" params=\"column=0 badrow=1 goodrow=0\""; + String funnyEvent = "value/1 collectionId=1111111111 name=\"syncrows\" params=\"column=0 badrow=1 goodrow=0\""; try { Event e = Event.parse(funnyEvent); } diff --git a/vespalog/src/test/logtest.cpp b/vespalog/src/test/logtest.cpp index bdbb5af0e94..8b012a92f5d 100644 --- a/vespalog/src/test/logtest.cpp +++ b/vespalog/src/test/logtest.cpp @@ -15,8 +15,6 @@ main(int, char **argv) EV_STARTING("logtest"); LOG(info, "Starting up, called as %s", argv[0]); EV_STARTED("logtest"); - EV_RELOADING("something"); - EV_RELOADED("something"); EV_CRASH("something", getpid(), SIGTERM); EV_PROGRESS("batch-index", 7, 100); EV_PROGRESS("unbounded-batch-index", 9); diff --git a/vespalog/src/test/simple/logtest.cpp b/vespalog/src/test/simple/logtest.cpp index 9e3d99cf0ed..b543f1f755d 100644 --- a/vespalog/src/test/simple/logtest.cpp +++ b/vespalog/src/test/simple/logtest.cpp @@ -15,8 +15,6 @@ main(int, char **argv) EV_STARTING("logtest"); LOG(info, "Starting up, called as %s", argv[0]); EV_STARTED("logtest"); - EV_RELOADING("something"); - EV_RELOADED("something"); EV_CRASH("something", getpid(), SIGTERM); EV_PROGRESS("batch-index", 7, 100); EV_PROGRESS("unbounded-batch-index", 9); diff --git a/vespalog/src/vespa/log/log.h b/vespalog/src/vespa/log/log.h index 48cc4211ffc..5b73aef5083 100644 --- a/vespalog/src/vespa/log/log.h +++ b/vespalog/src/vespa/log/log.h @@ -98,20 +98,6 @@ do { \ } \ } while (false) -#define EV_RELOADING(name) \ -do { \ - if (logger.wants(ns_log::Logger::event)) { \ - logger.doEventReloading(name); \ - } \ -} while (false) - -#define EV_RELOADED(name) \ -do { \ - if (logger.wants(ns_log::Logger::event)) { \ - logger.doEventReloaded(name); \ - } \ -} while (false) - #define EV_CRASH(name,pid,signal) \ do { \ if (logger.wants(ns_log::Logger::event)) { \ |