You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by eo...@apache.org on 2020/05/10 14:19:12 UTC
[maven-studies] branch maven-metrics updated: revert transfer time
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch maven-metrics
in repository https://gitbox.apache.org/repos/asf/maven-studies.git
The following commit(s) were added to refs/heads/maven-metrics by this push:
new c18362a revert transfer time
c18362a is described below
commit c18362af13164abf1a27068510be8e700d5b1842
Author: Enrico Olivelli <eo...@apache.org>
AuthorDate: Sun May 10 16:19:00 2020 +0200
revert transfer time
---
.../main/java/org/apache/maven/cli/MavenCli.java | 4 ++--
.../transfer/AbstractMavenTransferListener.java | 22 +++-------------------
.../transfer/BatchModeMavenTransferListener.java | 5 ++---
.../cli/transfer/ConsoleMavenTransferListener.java | 7 +++----
.../cli/transfer/Slf4jMavenTransferListener.java | 21 ++-------------------
5 files changed, 12 insertions(+), 47 deletions(-)
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index b8dc9b9..ffbd3ed 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -1744,12 +1744,12 @@ public class MavenCli
protected TransferListener getConsoleTransferListener( boolean printResourceNames )
{
- return new ConsoleMavenTransferListener( System.out, printResourceNames, metricsSystem.getMetricsContext() );
+ return new ConsoleMavenTransferListener( System.out, printResourceNames );
}
protected TransferListener getBatchTransferListener()
{
- return new Slf4jMavenTransferListener( metricsSystem.getMetricsContext() );
+ return new Slf4jMavenTransferListener();
}
protected void customizeContainer( PlexusContainer container )
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
index 15b8371..72bffc3 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
@@ -25,7 +25,6 @@ import java.text.DecimalFormatSymbols;
import java.util.Locale;
import org.apache.commons.lang3.Validate;
-import org.apache.maven.metrics.MetricsContext;
import org.eclipse.aether.transfer.AbstractTransferListener;
import org.eclipse.aether.transfer.TransferCancelledException;
import org.eclipse.aether.transfer.TransferEvent;
@@ -211,13 +210,11 @@ public abstract class AbstractMavenTransferListener
}
}
- protected final PrintStream out;
- private final MetricsContext metricsContext;
+ protected PrintStream out;
- protected AbstractMavenTransferListener( PrintStream out , MetricsContext metricsContext )
+ protected AbstractMavenTransferListener( PrintStream out )
{
this.out = out;
- this.metricsContext = metricsContext;
}
@Override
@@ -250,7 +247,7 @@ public abstract class AbstractMavenTransferListener
{
String action = ( event.getRequestType() == TransferEvent.RequestType.PUT ? "Uploaded" : "Downloaded" );
String direction = event.getRequestType() == TransferEvent.RequestType.PUT ? "to" : "from";
- String metricDescription = event.getRequestType() == TransferEvent.RequestType.PUT ? "uploads" : "downloads";
+
TransferResource resource = event.getResource();
long contentLength = event.getTransferredBytes();
FileSizeFormat format = new FileSizeFormat( Locale.ENGLISH );
@@ -270,19 +267,6 @@ public abstract class AbstractMavenTransferListener
message.append( ')' );
out.println( message.toString() );
-
- metricsContext
- .getContext( "transfer" )
- .getSummary( event.getRequestType().name().toLowerCase() + "_bytes",
- "total bytes ( " + metricDescription + ")" )
- .add( contentLength );
-
- metricsContext
- .getContext( "transfer" )
- .getSummary( event.getRequestType().name().toLowerCase() + "_time",
- "total time (" + metricDescription + ") " )
- .add( duration );
-
}
}
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java
index 38adf53..2eee8f6 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java
@@ -20,7 +20,6 @@ package org.apache.maven.cli.transfer;
*/
import java.io.PrintStream;
-import org.apache.maven.metrics.MetricsContext;
/**
* BatchModeMavenTransferListener
@@ -28,9 +27,9 @@ import org.apache.maven.metrics.MetricsContext;
public class BatchModeMavenTransferListener
extends AbstractMavenTransferListener
{
- public BatchModeMavenTransferListener( PrintStream out, MetricsContext metricsContext )
+ public BatchModeMavenTransferListener( PrintStream out )
{
- super( out, metricsContext );
+ super( out );
}
}
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java
index e9e6125..950b5d0 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java
@@ -27,7 +27,6 @@ import java.util.Locale;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import org.apache.maven.metrics.MetricsContext;
import org.eclipse.aether.transfer.TransferCancelledException;
import org.eclipse.aether.transfer.TransferEvent;
import org.eclipse.aether.transfer.TransferResource;
@@ -44,12 +43,12 @@ public class ConsoleMavenTransferListener
private Map<TransferResource, Long> transfers = Collections.synchronizedMap(
new LinkedHashMap<>() );
- private final boolean printResourceNames;
+ private boolean printResourceNames;
private int lastLength;
- public ConsoleMavenTransferListener( PrintStream out, boolean printResourceNames, MetricsContext metricsContext )
+ public ConsoleMavenTransferListener( PrintStream out, boolean printResourceNames )
{
- super( out, metricsContext );
+ super( out );
this.printResourceNames = printResourceNames;
}
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
index 88cb37c..57e69ba 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
@@ -22,7 +22,6 @@ package org.apache.maven.cli.transfer;
import java.util.Locale;
import org.apache.maven.cli.transfer.AbstractMavenTransferListener.FileSizeFormat;
-import org.apache.maven.metrics.MetricsContext;
import org.eclipse.aether.transfer.AbstractTransferListener;
import org.eclipse.aether.transfer.TransferCancelledException;
import org.eclipse.aether.transfer.TransferEvent;
@@ -38,19 +37,16 @@ public class Slf4jMavenTransferListener
{
protected final Logger out;
- private final MetricsContext metricsContext;
- public Slf4jMavenTransferListener( MetricsContext metricsContext )
+ public Slf4jMavenTransferListener()
{
this.out = LoggerFactory.getLogger( Slf4jMavenTransferListener.class );
- this.metricsContext = metricsContext;
}
// TODO should we deprecate?
- public Slf4jMavenTransferListener( Logger out, MetricsContext metricsContext )
+ public Slf4jMavenTransferListener( Logger out )
{
this.out = out;
- this.metricsContext = metricsContext;
}
@Override
@@ -82,7 +78,6 @@ public class Slf4jMavenTransferListener
{
String action = ( event.getRequestType() == TransferEvent.RequestType.PUT ? "Uploaded" : "Downloaded" );
String direction = event.getRequestType() == TransferEvent.RequestType.PUT ? "to" : "from";
- String metricDescription = event.getRequestType() == TransferEvent.RequestType.PUT ? "uploads" : "downloads";
TransferResource resource = event.getResource();
long contentLength = event.getTransferredBytes();
@@ -103,18 +98,6 @@ public class Slf4jMavenTransferListener
message.append( ')' );
out.info( message.toString() );
-
- metricsContext
- .getContext( "transfer" )
- .getSummary( event.getRequestType().name().toLowerCase() + "_bytes",
- "total bytes ( " + metricDescription + ")" )
- .add( contentLength );
-
- metricsContext
- .getContext( "transfer" )
- .getSummary( event.getRequestType().name().toLowerCase() + "_time",
- "total time (" + metricDescription + ") " )
- .add( duration );
}
}