Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<url>https://github.com/apache/accumulo-proxy/actions</url>
</ciManagement>
<properties>
<accumulo.version>2.1.3</accumulo.version>
<accumulo.version>2.1.4</accumulo.version>
<eclipseFormatterStyle>contrib/Eclipse-Accumulo-Codestyle.xml</eclipseFormatterStyle>
<!-- extra release args for testing -->
<extraReleaseArguments />
Expand All @@ -98,7 +98,7 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<slf4j.version>2.0.12</slf4j.version>
<slf4j.version>2.0.17</slf4j.version>
<sourceReleaseAssemblyDescriptor>source-release-tar</sourceReleaseAssemblyDescriptor>
<spotbugs.excludeFilterFile>src/main/spotbugs/exclude-filter.xml</spotbugs.excludeFilterFile>
<thrift.version>0.17.0</thrift.version>
Expand All @@ -108,14 +108,14 @@
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-bom</artifactId>
<version>1.12.2</version>
<version>1.14.5</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-bom</artifactId>
<version>2.23.1</version>
<version>2.24.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -131,7 +131,7 @@
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<version>4.8.3</version>
<version>4.9.3</version>
<optional>true</optional>
</dependency>
<dependency>
Expand All @@ -143,7 +143,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.0-jre</version>
<version>33.4.6-jre</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Expand Down Expand Up @@ -222,13 +222,13 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>5.1.0</version>
<version>5.5.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.10.1</version>
<version>5.12.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
39 changes: 6 additions & 33 deletions src/main/java/org/apache/accumulo/proxy/Proxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.io.UncheckedIOException;
import java.nio.file.Files;
import java.util.Collection;
import java.util.List;
import java.util.Properties;

import org.apache.accumulo.core.cli.Help;
Expand Down Expand Up @@ -61,7 +60,6 @@
import com.google.auto.service.AutoService;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Tag;

@AutoService(KeywordExecutable.class)
Expand Down Expand Up @@ -267,53 +265,28 @@ public static ServerAddress createProxyServer(HostAndPort address,
serverSocketTimeout, address);
}

// TODO: This MetricsInfo is a stub Metrics Info to allow the timed processor to build. If Metrics
// are wanted or needed in a later version of the proxy, this can be updated.
// This MetricsInfo is a stub MetricsInfo to allow the timed processor to build.
// Issue #85 in the GitHub regards updating this with a proper implementation.
static private class ProxyMetricsInfo implements MetricsInfo {

@Override
public boolean isMetricsEnabled() {
return false;
}

@Override
public void addServiceTags(String applicationName, HostAndPort hostAndPort) {
throw new UnsupportedOperationException("Unimplemented method 'addServiceTags'");
}

@Override
public void addCommonTags(List<Tag> updates) {
throw new UnsupportedOperationException("Unimplemented method 'addCommonTags'");
}

@Override
public Collection<Tag> getCommonTags() {
throw new UnsupportedOperationException("Unimplemented method 'getCommonTags'");
}

@Override
public void addRegistry(MeterRegistry registry) {
throw new UnsupportedOperationException("Unimplemented method 'addRegistry'");
}

@Override
public void addMetricsProducers(MetricsProducer... producer) {
return;
}

@Override
public void init() {
throw new UnsupportedOperationException("Unimplemented method 'init'");
}

@Override
public MeterRegistry getRegistry() {
throw new UnsupportedOperationException("Unimplemented method 'getRegistry'");
public void close() {
throw new UnsupportedOperationException("Unimplemented method 'close'");
}

@Override
public void close() {
throw new UnsupportedOperationException("Unimplemented method 'close'");
public void init(Collection<Tag> commonTags) {
throw new UnsupportedOperationException("Unimplemented method 'init'");
}

}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/apache/accumulo/proxy/TServerUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -505,11 +505,11 @@ public static ServerAddress startTServer(ThriftServerType serverType, TimedProce

final TServer finalServer = serverAddress.server;

Threads.createThread(threadName, () -> {
Threads.createNonCriticalThread(threadName, () -> {
try {
finalServer.serve();
} catch (Error e) {
Halt.halt("Unexpected error in TThreadPoolServer " + e + ", halting.", 1);
Halt.halt(1, "Unexpected error in TThreadPoolServer " + e + ", halting.");
}
}).start();

Expand Down