Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RANGER-5061: checkstyle compliance updates - security-admin org.apach… #505

Merged
merged 2 commits into from
Jan 11, 2025
Merged

RANGER-5061: checkstyle compliance updates - security-admin org.apach… #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfcb373
RANGER-5061: checkstyle compliance updates - security-admin org.apach…
pradeepagrawal8184 Jan 9, 2025
1f23f02
RANGER-5061: checkstyle compliance updates - security-admin org.apach…
mneethiraj Jan 11, 2025
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
1,335 changes: 616 additions & 719 deletions security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java
View file
Open in desktop

Large diffs are not rendered by default.

849 changes: 423 additions & 426 deletions security-admin/src/main/java/org/apache/ranger/rest/GdsREST.java
View file
Open in desktop

Large diffs are not rendered by default.

68 changes: 32 additions & 36 deletions security-admin/src/main/java/org/apache/ranger/rest/MetricsREST.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,6 @@

package org.apache.ranger.rest;

import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
import java.util.LinkedHashMap;
import java.util.Map;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;

import org.apache.ranger.metrics.RangerAdminMetricsWrapper;
import org.apache.ranger.plugin.model.RangerMetrics;
import org.apache.ranger.util.RangerMetricsUtil;
Expand All @@ -40,17 +30,28 @@
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;

import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
import java.util.LinkedHashMap;
import java.util.Map;

@Path("metrics")
@Component
@Scope("request")
@Transactional(propagation = Propagation.REQUIRES_NEW)
public class MetricsREST {
private static final Logger LOG = LoggerFactory.getLogger(MetricsREST.class);
private static final RuntimeMXBean RUNTIME = ManagementFactory.getRuntimeMXBean();
private static final String JVM_MACHINE_ACTUAL_NAME = RUNTIME.getVmName();
private static final String VERSION = RUNTIME.getVmVersion();
private static final String JVM_MACHINE_REPRESENTATION_NAME = RUNTIME.getName();
private static final String JVM_VENDOR_NAME = RUNTIME.getVmVendor();

private static final RuntimeMXBean RUNTIME = ManagementFactory.getRuntimeMXBean();
private static final String JVM_MACHINE_ACTUAL_NAME = RUNTIME.getVmName();
private static final String VERSION = RUNTIME.getVmVersion();
private static final String JVM_MACHINE_REPRESENTATION_NAME = RUNTIME.getName();
private static final String JVM_VENDOR_NAME = RUNTIME.getVmVendor();

@Autowired
RangerMetricsUtil jvmMetricUtil;
Expand All @@ -60,25 +61,23 @@ public class MetricsREST {

@GET
@Path("/status")
@Produces({ "application/json" })
@Produces("application/json")
public RangerMetrics getStatus() {
if (LOG.isDebugEnabled()) {
LOG.debug("==> MetricsREST.getStatus()");
}
LOG.debug("==> MetricsREST.getStatus()");

Map<String, Object> jvm = new LinkedHashMap<>();
Map<String, Object> jvm = new LinkedHashMap<>();
Map<String, Object> vmDetails = new LinkedHashMap<>();

vmDetails.put("JVM Machine Actual Name", JVM_MACHINE_ACTUAL_NAME);
vmDetails.put("version", VERSION);
vmDetails.put("JVM Machine Representation Name", JVM_MACHINE_REPRESENTATION_NAME);
vmDetails.put("Up time of JVM", RUNTIME.getUptime());
vmDetails.put("JVM Vendor Name", JVM_VENDOR_NAME);
vmDetails.putAll(jvmMetricUtil.getValues());
jvm.put("jvm",vmDetails);

if (LOG.isDebugEnabled()) {
LOG.debug("<== MetricsREST.getStatus(): jvm=" + jvm);
}
jvm.put("jvm", vmDetails);

LOG.debug("<== MetricsREST.getStatus(): jvm={}", jvm);

return new RangerMetrics(jvm);
}
Expand All @@ -87,40 +86,37 @@ public RangerMetrics getStatus() {
@Path("/prometheus")
@Produces(MediaType.TEXT_PLAIN)
public String getMetricsPrometheus() {
if (LOG.isDebugEnabled()) {
LOG.debug("==> MetricsREST.getMetricsPrometheus()");
}
LOG.debug("==> MetricsREST.getMetricsPrometheus()");

String ret = "";

try {
ret = rangerAdminMetricsWrapper.getRangerMetricsInPrometheusFormat();
} catch (Exception e) {
LOG.error("MetricsREST.getMetricsPrometheus(): Exception occurred while getting metric.", e);
}

if (LOG.isDebugEnabled()) {
LOG.debug("<== MetricsREST.getMetricsPrometheus(): ret=" + ret);
}
LOG.debug("<== MetricsREST.getMetricsPrometheus(): ret={}", ret);

return ret;
}

@GET
@Path("/json")
@Produces(MediaType.APPLICATION_JSON)
public Map<String, Map<String, Object>> getMetricsJson() {
if (LOG.isDebugEnabled()) {
LOG.debug("==> MetricsREST.getMetricsJson()");
}
LOG.debug("==> MetricsREST.getMetricsJson()");

Map<String, Map<String, Object>> ret = null;

try {
ret = rangerAdminMetricsWrapper.getRangerMetrics();
} catch (Exception e) {
LOG.error("MetricsREST.getMetricsJson(): Exception occurred while getting metric.", e);
}

if (LOG.isDebugEnabled()) {
LOG.debug("<== MetricsREST.getMetricsJson(): ret=" + ret);
}
LOG.debug("<== MetricsREST.getMetricsJson(): ret={}", ret);

return ret;
}
}
Loading
Loading