Skip to content

Commit

Permalink
Upgrade slf4j and logback (#137)
Browse files Browse the repository at this point in the history
  • Loading branch information
wsargent authored Feb 21, 2022
1 parent 1c2e040 commit 7257179
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 16 deletions.
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ junitVersion = 4.12
junitJupiterVersion = 5.0.1
junitVintageVersion = 4.12.1
junitPlatformVersion = 1.0.1
slf4jVersion = 1.7.30
slf4jVersion = 1.7.36
logstashVersion = 6.3
logbackVersion = 1.2.3
logbackVersion = 1.2.10
configVersion = 1.4.0
zstdVersion = 1.4.0-1
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,20 @@
import ch.qos.logback.core.Context;
import ch.qos.logback.core.spi.ContextAware;
import com.tersesystems.logback.core.ComponentContainer;

import java.time.Instant;
import java.util.Iterator;
import java.util.Optional;

import org.slf4j.Marker;

/**
* This class pulls an Instant from a StartTimeSupplier.
*/
/** This class pulls an Instant from a StartTimeSupplier. */
public final class StartTime {

/**
* Returns a start time from the event, then marker, then finally if not found will use the
* event's timestamp as the marker.
*
* @param context the logging context
* @param event the logging event
* @param event the logging event
* @return an instant representing the start time.
*/
public static Instant from(Context context, ILoggingEvent event) {
Expand All @@ -58,6 +54,7 @@ public static Optional<Instant> fromOptional(Context context, ILoggingEvent even

/**
* Looks for a StartTimeMarker in the marker and in all the children of the marker.
*
* @param context the logback context
* @param m the logback marker
* @return an optional start time.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,5 @@ public void write(ExceptionProperty exceptionProperty) {
sb.append("\"");
}
}
}
;
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ public HoneycombPlayWSClient(
@Override
public CompletionStage<HoneycombResponse> post(HoneycombRequest<E> request) {
return post(request, this.defaultEncodeFunction);
}
;
};

@Override
public <F> CompletionStage<HoneycombResponse> post(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ interface ExitCondition {
* <p><b>WARNING</b>: Explicit assumptions are made with regards to {@link Consumer#accept} make
* sure you have read and understood these before using this method.
*
* @param c the consumer
* @param c the consumer
* @param limit the limit
* @return the number of polled elements
* @throws IllegalArgumentException c is {@code null}
Expand All @@ -206,7 +206,7 @@ interface ExitCondition {
* <p><b>WARNING</b>: Explicit assumptions are made with regards to {@link Supplier#get} make sure
* you have read and understood these before using this method.
*
* @param s the supplier
* @param s the supplier
* @param limit the limit
* @return the number of offered elements
* @throws IllegalArgumentException s is {@code null}
Expand Down Expand Up @@ -279,7 +279,7 @@ interface ExitCondition {
* <p><b>WARNING</b>: Explicit assumptions are made with regards to {@link Consumer#accept} make
* sure you have read and understood these before using this method.
*
* @param c the consumer
* @param c the consumer
* @param wait the wait strategy
* @param exit the exit condition
* @throws IllegalArgumentException c OR wait OR exit are {@code null}
Expand Down Expand Up @@ -310,7 +310,7 @@ interface ExitCondition {
* <p><b>WARNING</b>: Explicit assumptions are made with regards to {@link Supplier#get} make sure
* you have read and understood these before using this method.
*
* @param s the supplier
* @param s the supplier
* @param wait the wait strategy
* @param exit the exit condition
* @throws IllegalArgumentException s OR wait OR exit are {@code null}
Expand Down

0 comments on commit 7257179

Please sign in to comment.