This is an automated email from the ASF dual-hosted git repository.
domgarguilo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new ecaf48a8ba Remove trace tables and their supporting code from the
Monitor (#2822)
ecaf48a8ba is described below
commit ecaf48a8ba34009b753931e940779d5f4c203fbe
Author: Dom G <dominic.gargu...@gmail.com>
AuthorDate: Mon Jul 25 09:11:22 2022 -0400
Remove trace tables and their supporting code from the Monitor (#2822)
* remove trace tables and their supporting code
---
.../monitor/rest/trace/AddlInformation.java | 54 -----------
.../monitor/rest/trace/AnnotationInformation.java | 46 ---------
.../monitor/rest/trace/DataInformation.java | 46 ---------
.../rest/trace/RecentTracesInformation.java | 51 ----------
.../monitor/rest/trace/RecentTracesList.java | 43 --------
.../monitor/rest/trace/TraceInformation.java | 66 -------------
.../accumulo/monitor/rest/trace/TraceList.java | 68 -------------
.../accumulo/monitor/rest/trace/TraceType.java | 57 -----------
.../rest/trace/TracesForTypeInformation.java | 37 -------
.../monitor/rest/trace/TracesResource.java | 101 -------------------
.../org/apache/accumulo/monitor/view/WebViews.java | 76 ---------------
.../accumulo/monitor/resources/js/functions.js | 28 ------
.../accumulo/monitor/resources/js/listType.js | 79 ---------------
.../apache/accumulo/monitor/resources/js/show.js | 108 ---------------------
.../accumulo/monitor/resources/js/summary.js | 84 ----------------
.../apache/accumulo/monitor/templates/listType.ftl | 51 ----------
.../apache/accumulo/monitor/templates/navbar.ftl | 1 -
.../org/apache/accumulo/monitor/templates/show.ftl | 81 ----------------
.../apache/accumulo/monitor/templates/summary.ftl | 52 ----------
19 files changed, 1129 deletions(-)
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/AddlInformation.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/AddlInformation.java
deleted file mode 100644
index 5075f48be4..0000000000
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/AddlInformation.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.monitor.rest.trace;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Generates additional information for the selected trace
- *
- * @since 2.0.0
- */
-public class AddlInformation {
-
- // Variable names become JSON keys
- public List<DataInformation> data = new ArrayList<>();
- public List<AnnotationInformation> annotations = new ArrayList<>();
-
- /**
- * Add a new data
- *
- * @param data
- * Data to add
- */
- public void addData(DataInformation data) {
- this.data.add(data);
- }
-
- /**
- * Add a new annotation
- *
- * @param annotations
- * Annotation to add
- */
- public void addAnnotations(AnnotationInformation annotations) {
- this.annotations.add(annotations);
- }
-}
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/AnnotationInformation.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/AnnotationInformation.java
deleted file mode 100644
index e2e8589027..0000000000
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/AnnotationInformation.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.monitor.rest.trace;
-
-/**
- * Generates annotation information for the trace
- *
- * @since 2.0.0
- */
-public class AnnotationInformation {
-
- // Variable names become JSON keys
- public String annotation;
- public long time;
-
- public AnnotationInformation() {}
-
- /**
- * Stores a trace annotation
- *
- * @param annotation
- * Annotation message
- * @param time
- * Annotation time
- */
- public AnnotationInformation(String annotation, long time) {
- this.annotation = annotation;
- this.time = time;
- }
-}
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/DataInformation.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/DataInformation.java
deleted file mode 100644
index 73b891a8ba..0000000000
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/DataInformation.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.monitor.rest.trace;
-
-/**
- * Generate a new data information for a trace
- *
- * @since 2.0.0
- */
-public class DataInformation {
-
- // Variable names become JSON keys
- public String key;
- public String value;
-
- public DataInformation() {}
-
- /**
- * Creates new data table with key/value
- *
- * @param key
- * Key for the data
- * @param value
- * Value for the data
- */
- public DataInformation(String key, String value) {
- this.key = key;
- this.value = value;
- }
-}
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecentTracesInformation.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecentTracesInformation.java
deleted file mode 100644
index 3bf23dc39d..0000000000
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecentTracesInformation.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.monitor.rest.trace;
-
-/**
- * Generates a recent trace
- *
- * @since 2.0.0
- */
-public class RecentTracesInformation {
-
- // Variable names become JSON keys
- public String type;
- public Long avg;
-
- public int total = 0;
-
- public long min = Long.MAX_VALUE;
- public long max = Long.MIN_VALUE;
-
- public long[] histogram = {0L, 0L, 0L, 0L, 0L, 0L};
-
- public RecentTracesInformation() {}
-
- /**
- * Adds the type of the trace
- *
- * @param type
- * Trace type
- */
- public RecentTracesInformation(String type) {
- this.type = type;
- }
-
-}
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecentTracesList.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecentTracesList.java
deleted file mode 100644
index 666c54ecf6..0000000000
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecentTracesList.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.monitor.rest.trace;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Generates a list of recent traces
- *
- * @since 2.0.0
- */
-public class RecentTracesList {
-
- // Variable names become JSON keys
- public List<RecentTracesInformation> recentTraces = new ArrayList<>();
-
- /**
- * Adds a new trace to the list
- *
- * @param trace
- * Trace to add
- */
- public void addTrace(RecentTracesInformation trace) {
- recentTraces.add(trace);
- }
-}
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TraceInformation.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TraceInformation.java
deleted file mode 100644
index 2a7965c955..0000000000
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TraceInformation.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.monitor.rest.trace;
-
-/**
- * Generates a list of traces for an ID
- *
- * @since 2.0.0
- */
-public class TraceInformation {
-
- // Variable names become JSON keys
- public int level;
- public long time;
- public long start;
- public long spanID;
- public String location, name;
- public AddlInformation addlData;
-
- public TraceInformation() {}
-
- /**
- * Generates a trace
- *
- * @param level
- * Level of the trace
- * @param time
- * Amount of time the trace ran
- * @param start
- * Start time of the trace
- * @param spanID
- * ID of the span
- * @param location
- * Location of the trace
- * @param name
- * Name of the trace
- * @param addlData
- * Additional data for the trace
- */
- public TraceInformation(int level, long time, long start, long spanID,
String location,
- String name, AddlInformation addlData) {
- this.level = level;
- this.time = time;
- this.start = start;
- this.spanID = spanID;
- this.location = location;
- this.name = name;
- this.addlData = addlData;
- }
-}
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TraceList.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TraceList.java
deleted file mode 100644
index 066205357e..0000000000
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TraceList.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.monitor.rest.trace;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Generates a list of traces for an ID
- *
- * @since 2.0.0
- */
-public class TraceList {
-
- // Variable names become JSON keys
- public String id;
- public Long start;
- public List<TraceInformation> traces = new ArrayList<>();
-
- public TraceList() {}
-
- /**
- * Creates a new trace list grouped by ID
- *
- * @param id
- * ID of the trace
- */
- public TraceList(String id) {
- this.id = id;
- this.traces = new ArrayList<>();
- }
-
- /**
- * Adds a trace to the list
- *
- * @param traces
- * Trace to add
- */
- public void addTrace(TraceInformation traces) {
- this.traces.add(traces);
- }
-
- /**
- * Adds a start time to the trace
- *
- * @param start
- * Trace start time
- */
- public void addStartTime(Long start) {
- this.start = start;
- }
-}
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TraceType.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TraceType.java
deleted file mode 100644
index 385a49b4e6..0000000000
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TraceType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.monitor.rest.trace;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Generates a list of traces grouped by type
- *
- * @since 2.0.0
- */
-public class TraceType {
-
- // Variable names become JSON objects
- public String traceType;
- public List<TracesForTypeInformation> traces = new ArrayList<>();
-
- public TraceType() {}
-
- /**
- * Creates a new list grouped by type
- *
- * @param type
- * Type of the trace group
- */
- public TraceType(String type) {
- this.traceType = type;
- this.traces = new ArrayList<>();
- }
-
- /**
- * Adds a new trace to the list
- *
- * @param traces
- * Trace to add
- */
- public void addTrace(TracesForTypeInformation traces) {
- this.traces.add(traces);
- }
-}
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesForTypeInformation.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesForTypeInformation.java
deleted file mode 100644
index 47deaedf85..0000000000
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesForTypeInformation.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.monitor.rest.trace;
-
-/**
- * Generates a list of traces per type
- *
- * @since 2.0.0
- */
-public class TracesForTypeInformation {
-
- // Variable names become JSON keys
- public String id;
- public String source;
-
- public Long start;
- public Long ms;
-
- public TracesForTypeInformation() {}
-
-}
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesResource.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesResource.java
deleted file mode 100644
index 75fcce5494..0000000000
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/TracesResource.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.monitor.rest.trace;
-
-import static
org.apache.accumulo.monitor.util.ParameterValidator.ALPHA_NUM_REGEX;
-import static
org.apache.accumulo.monitor.util.ParameterValidator.RESOURCE_REGEX;
-
-import jakarta.inject.Inject;
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
-import jakarta.ws.rs.DefaultValue;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.MediaType;
-
-import org.apache.accumulo.monitor.Monitor;
-
-/**
- * Generates a list of traces with the summary, by type, and trace details
- *
- * @since 2.0.0
- */
-@Path("/trace")
-@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-public class TracesResource {
-
- @Inject
- private Monitor monitor;
-
- /**
- * Generates a trace summary
- *
- * @param minutes
- * Range of minutes to filter traces Min of 0 minutes, Max of 30
days
- * @return Trace summary in specified range
- */
- @Path("summary/{minutes}")
- @GET
- public RecentTracesList getTraces(
- @DefaultValue("10") @PathParam("minutes") @NotNull @Min(0) @Max(2592000)
int minutes)
- throws Exception {
-
- return new RecentTracesList();
-
- }
-
- /**
- * Generates a list of traces filtered by type and range of minutes
- *
- * @param type
- * Type of the trace
- * @param minutes
- * Range of minutes, Min of 0 and Max 0f 30 days
- * @return List of traces filtered by type and range
- */
- @Path("listType/{type}/{minutes}")
- @GET
- public TraceType getTracesType(
- @PathParam("type") @NotNull @Pattern(regexp = RESOURCE_REGEX) final
String type,
- @PathParam("minutes") @Min(0) @Max(2592000) int minutes) throws
Exception {
-
- return new TraceType(type);
- }
-
- /**
- * Generates a list of traces filtered by ID
- *
- * @param id
- * ID of the trace to display
- * @return traces by ID
- */
- @Path("show/{id}")
- @GET
- public TraceList getTracesType(
- @PathParam("id") @NotNull @Pattern(regexp = ALPHA_NUM_REGEX) String id)
throws Exception {
-
- return new TraceList(id);
-
- }
-
-}
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
index 5b31c5f854..42a26e0638 100644
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
+++
b/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
@@ -18,11 +18,9 @@
*/
package org.apache.accumulo.monitor.view;
-import static
org.apache.accumulo.monitor.util.ParameterValidator.ALPHA_NUM_REGEX;
import static
org.apache.accumulo.monitor.util.ParameterValidator.ALPHA_NUM_REGEX_BLANK_OK;
import static
org.apache.accumulo.monitor.util.ParameterValidator.ALPHA_NUM_REGEX_TABLE_ID;
import static
org.apache.accumulo.monitor.util.ParameterValidator.HOSTNAME_PORT_REGEX;
-import static
org.apache.accumulo.monitor.util.ParameterValidator.RESOURCE_REGEX;
import java.io.IOException;
import java.util.ArrayList;
@@ -32,11 +30,8 @@ import java.util.List;
import java.util.Map;
import jakarta.inject.Inject;
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Pattern;
-import jakarta.ws.rs.DefaultValue;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
@@ -314,77 +309,6 @@ public class WebViews {
return model;
}
- /**
- * Returns trace summary template
- *
- * @param minutes
- * Range of minutes, default 10 minutes Min of 0 Max of 30 days in
minutes
- * @return Trace summary model
- */
- @GET
- @Path("trace/summary")
- @Template(name = "/default.ftl")
- public Map<String,Object> getTracesSummary(
- @QueryParam("minutes") @DefaultValue("10") @Min(0) @Max(2592000) int
minutes) {
- Map<String,Object> model = getModel();
- model.put("title", "Traces for the last " + minutes +
" minute(s)");
-
- model.put("template", "summary.ftl");
- model.put("js", "summary.js");
- model.put("minutes", String.valueOf(minutes));
-
- return model;
- }
-
- /**
- * Returns traces by type template
- *
- * @param type
- * Type of trace
- * @param minutes
- * Range of minutes, default 10 minutes Min of 0 Max of 30 days in
minutes
- * @return Traces by type model
- */
- @GET
- @Path("trace/listType")
- @Template(name = "/default.ftl")
- public Map<String,Object> getTracesForType(
- @QueryParam("type") @NotNull @Pattern(regexp = RESOURCE_REGEX) String
type,
- @QueryParam("minutes") @DefaultValue("10") @Min(0) @Max(2592000) int
minutes) {
- Map<String,Object> model = getModel();
- model.put("title", "Traces for " + type + " for the last " + minutes + "
minute(s)");
-
- model.put("template", "listType.ftl");
- model.put("js", "listType.js");
- model.put("type", type);
- model.put("minutes", String.valueOf(minutes));
-
- return model;
- }
-
- /**
- * Returns traces by ID template
- *
- * @param id
- * ID of the traces
- * @return Traces by ID model
- */
- @GET
- @Path("trace/show")
- @Template(name = "/default.ftl")
- public Map<String,Object>
- getTraceShow(@QueryParam("id") @NotNull @Pattern(regexp =
ALPHA_NUM_REGEX) String id) {
-
- Map<String,Object> model = getModel();
- model.put("title", "Trace ID " + id);
-
- model.put("template", "show.ftl");
- model.put("js", "show.js");
- model.put("id", id);
-
- return model;
- }
-
/**
* Returns log report template
*
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/functions.js
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/functions.js
index f42dad3a36..158825dfb0 100644
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/functions.js
+++
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/functions.js
@@ -441,34 +441,6 @@ function getTableServers(tableID) {
return getJSONForTable('/rest/tables/' + tableID, 'tableServers');
}
-/**
- * REST GET call for the trace summary, stores it on a sessionStorage variable
- *
- * @param {string} minutes Number of minutes to display trace summary
- */
-function getTraceSummary(minutes) {
- return getJSONForTable('/rest/trace/summary/' + minutes, 'traceSummary');
-}
-
-/**
- * REST GET call for the trace type, stores it on a sessionStorage variable
- *
- * @param {string} type Type of the trace
- * @param {string} minutes Number of minutes to display trace
- */
-function getTraceOfType(type, minutes) {
- return getJSONForTable('/rest/trace/listType/' + type + '/' + minutes,
'traceType');
-}
-
-/**
- * REST GET call for the trace id, stores it on a sessionStorage variable
- *
- * @param {string} id Trace ID
- */
-function getTraceShow(id) {
- return getJSONForTable('/rest/trace/show/' + id, 'traceShow');
-}
-
/**
* REST GET call for the logs, stores it on a sessionStorage variable
*/
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/listType.js
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/listType.js
deleted file mode 100644
index 906f5ce39a..0000000000
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/listType.js
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-"use strict";
-
-var type, minutes;
-
-/**
- * Makes the REST calls, generates the tables with the new information
- */
-function refreshListType() {
- getTraceOfType(type, minutes).then(function () {
- refreshTypeTraceTable(minutes);
- });
-}
-
-/**
- * Used to redraw the page
- */
-function refresh() {
- refreshListType();
-}
-
-/**
- * Generates the trace per type table
- *
- * @param {string} minutes Minutes to display the trace
- */
-function refreshTypeTraceTable(minutes) {
- clearTableBody('trace');
-
- /*
- * Get the trace type value obtained earlier,
- * if it doesn't exists, create an empty array
- */
- var data = sessionStorage.traceType === undefined ? [] :
JSON.parse(sessionStorage.traceType);
- /*
- * If the data is empty, create an empty row, otherwise,
- * create the rows for the table
- */
- if (data.length === 0 || data.traces.length === 0) {
- var items = [];
- items.push(createEmptyRow(3, 'No traces for the last ' +
- minutes + ' minute(s)'));
- $('<tr/>', {
- html: items.join('')
- }).appendTo('#trace tbody');
- } else {
- $.each(data.traces, function (key, val) {
- var items = [];
-
- // Convert start value to a date
- var date = new Date(val.start);
- items.push(createFirstCell('', '<a href="/trace/show?id=' +
- val.id + '">' + date.toLocaleString() + '</a>'));
- items.push(createRightCell('', timeDuration(val.ms)));
- items.push(createLeftCell('', val.source));
-
- $('<tr/>', {
- html: items.join('')
- }).appendTo('#trace tbody');
- });
- }
-}
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/show.js
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/show.js
deleted file mode 100644
index 890d31d3de..0000000000
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/show.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-"use strict";
-
-var id;
-/**
- * Makes the REST calls, generates the tables with the new information
- */
-function refreshTraceShow() {
- getTraceShow(id).then(function () {
- refreshTraceShowTable();
- });
-}
-
-/**
- * Used to redraw the page
- */
-function refresh() {
- refreshTraceShow();
-}
-
-/**
- * Generates the trace show table
- */
-function refreshTraceShowTable() {
- clearTableBody('trace');
- $('#trace caption span span').remove();
- var data = sessionStorage.traceShow === undefined ? [] :
JSON.parse(sessionStorage.traceShow);
-
- if (data.traces.length !== 0) {
- var date = new Date(data.start);
- $('#caption').append('<span>' + date.toLocaleString() + '</span>');
-
- $.each(data.traces, function (key, val) {
- var id = val.spanID.toString(16);
- var items = [];
-
- items.push('<tr>');
- items.push(createRightCell('', val.time + '+'));
- items.push(createLeftCell('', val.start));
- items.push('<td style="text-indent: ' + val.level + '0px">' +
- val.location + '</td>');
- items.push(createLeftCell('', val.name));
-
- if (val.addlData.data.length !== 0 ||
- val.addlData.annotations.length !== 0) {
-
- items.push('<td><input type="checkbox" id="' + id +
- '_checkbox" onclick="toggle(\'' + id + '\')"></td>');
- items.push('</tr>');
- items.push('<tr id="' + id + '" style="display:none">');
- items.push('<td colspan="5">');
- items.push('<table class="table table-bordered table-striped' +
- ' table-condensed">');
-
- if (val.addlData.data.length !== 0) {
- items.push('<tr><th>Key</th><th>Value</th></tr>');
-
- $.each(val.addlData.data, function (key2, val2) {
- items.push('<tr><td>' + val2.key + '</td><td>' + val2.value +
- '</td></tr>');
- });
- }
-
- if (val.addlData.annotations.length !== 0) {
- items.push('<tr><th>Annotation</th><th>Time Offset</th></tr>');
-
- $.each(val.addlData.annotations, function (key2, val2) {
- items.push('<tr><td>' + val2.annotation + '</td><td>' + val2.time +
- '</td></tr>');
- });
- }
-
- items.push('</table>');
- items.push('</td>');
- } else {
- items.push('<td></td>');
- }
-
- items.push('</tr>');
-
- $('#trace tbody').append(items.join(''));
- });
- } else {
- var items = [];
- items.push('<tr>');
- items.push(createEmptyRow(5, 'No trace information for ID ' + id));
- items.push('</tr>');
- $('#trace tbody').append(items.join(''));
- }
-
-}
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/summary.js
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/summary.js
deleted file mode 100644
index 957c0ab915..0000000000
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/summary.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-"use strict";
-
-var minutes;
-/**
- * Makes the REST calls, generates the tables with the new information
- */
-function refreshSummary() {
- getTraceSummary(minutes).then(function () {
- refreshTraceSummaryTable(minutes);
- });
-}
-
-/**
- * Used to redraw the page
- */
-function refresh() {
- refreshSummary();
-}
-
-/**
- * Generates the trace summary table
- *
- * @param {string} minutes Minutes to display traces
- */
-function refreshTraceSummaryTable(minutes) {
- clearTableBody('traceSummary');
-
- var data = sessionStorage.traceSummary === undefined ? [] :
JSON.parse(sessionStorage.traceSummary);
-
- if (data.length === 0 || data.recentTraces.length === 0) {
- var items = [];
- items.push(createEmptyRow(6, 'No traces available for the last ' +
- minutes + ' minute(s)'));
- $('<tr/>', {
- html: items.join('')
- }).appendTo('#traceSummary tbody');
- } else {
- $.each(data.recentTraces, function (key, val) {
-
- var items = [];
-
- items.push(createFirstCell('', '<a href="/trace/listType?type=' +
- val.type + '&minutes=' + minutes + '">' + val.type + '</a>'));
- items.push(createRightCell('', bigNumberForQuantity(val.total)));
- items.push(createRightCell('', timeDuration(val.min)));
- items.push(createRightCell('', timeDuration(val.max)));
- items.push(createRightCell('', timeDuration(val.avg)));
- items.push('<td class="left">');
- items.push('<table style="width: 100%;">');
- items.push('<tr>');
-
- $.each(val.histogram, function (key2, val2) {
- items.push('<td style="width:5em">' + (val2 == 0 ? '-' : val2) +
- '</td>');
- });
- items.push('</tr>');
- items.push('</table>');
- items.push('</td>');
-
- $('<tr/>', {
- html: items.join('')
- }).appendTo('#traceSummary tbody');
-
- });
- }
-}
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/listType.ftl
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/listType.ftl
deleted file mode 100644
index 43316da2e0..0000000000
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/listType.ftl
+++ /dev/null
@@ -1,51 +0,0 @@
-<#--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
- <script>
- /**
- * Creates initial trace list type table, and passes type and minutes
values from template
- */
- $(document).ready(function() {
- type = '${type}';
- minutes = '${minutes}';
- refreshListType();
- });
- </script>
-
- <div class="row">
- <div class="col-xs-12">
- <h3>${title}</h3>
- </div>
- </div>
- <div class="row">
- <div class="col-xs-12">
- <table id="trace" class="table table-bordered table-striped
table-condensed">
- <caption><span class="table-caption">Traces for
managerReplicationDriver</span><br/></caption>
- <thead>
- <tr>
- <th class="firstcell" title="Start Time of selected trace
type">Start</th>
- <th title="Span Time of selected trace type">ms</th>
- <th title="Service and Location of selected trace
type">Source</th>
- </tr>
- </thead>
- <tbody></tbody>
- </table>
- </div>
- </div>
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
index 1ee0a8ebab..a797e90670 100644
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
+++
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
@@ -62,7 +62,6 @@
<a class="dropdown-toggle" data-toggle="dropdown" href="#"
role="button" aria-haspopup="true" aria-expanded="false">Debug <span
id="errorsNotification" class="badge"></span><span class="caret"></span>
</a>
<ul class="dropdown-menu">
- <li><a
href="/trace/summary?minutes=10">Recent Traces</a></li>
<li><a href="/log">Recent Logs <span
id="recentLogsNotifications" class="badge"></span></a></li>
<li><a href="/problems">Table Problems <span
id="tableProblemsNotifications" class="badge"></span></a></li>
</ul>
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/show.ftl
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/show.ftl
deleted file mode 100644
index dd02a5e72e..0000000000
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/show.ftl
+++ /dev/null
@@ -1,81 +0,0 @@
-<#--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
- <style>
- td.right { text-align: right }
- table.indent { position: relative; left: 10% }
- td.left { text-align: left }
- </style>
- <script>
- /**
- * Creates trace id initial table, passes id from template
- */
- $(document).ready(function() {
-
- id = '${id}';
- refreshTraceShow();
- });
-
- /**
- * Toggles row
- *
- * @param {string} id Row id to toggle
- */
- function toggle(id) {
- var elt = document.getElementById(id);
- if (elt.style.display=='none') {
- elt.style.display='table-row';
- } else {
- elt.style.display='none';
- }
- }
-
- /**
- * Selects where to display the row
- */
- function pageload() {
- var checkboxes = document.getElementsByTagName('input');
- for (var i = 0; i < checkboxes.length; i++) {
- if (checkboxes[i].checked) {
- var idSuffixOffset = checkboxes[i].id.indexOf('_checkbox');
- var id = checkboxes[i].id.substring(0, idSuffixOffset);
- document.getElementById(id).style.display='table-row';
- }
- }
- }
- </script>
- <div class="row">
- <div class="col-xs-12">
- <h3>${title}</h3>
- </div>
- </div>
- <div class="row">
- <div class="col-xs-12">
- <table id="trace" class="table table-bordered table-striped
table-condensed">
- <caption><span id="caption" class="table-caption">Trace ${id}
started at<br/></span></caption>
- <thead>
- <tr>
-
<th>Time </th><th>Start </th><th>Service@Location </th><th>Name </th><th>Addl Data </th>
- </tr>
- </thead>
- <tbody></tbody>
- </table>
- </div>
- </div>
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/summary.ftl
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/summary.ftl
deleted file mode 100644
index f5dbfed5f0..0000000000
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/summary.ftl
+++ /dev/null
@@ -1,52 +0,0 @@
-<#--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
- <script>
- /**
- * Creates trace summary initial table, passes the minutes from the
template
- */
- $(document).ready(function() {
- minutes = '${minutes}';
- refreshSummary();
- });
- </script>
-
- <div class="row">
- <div class="col-xs-12">
- <h3>${title}</h3>
- </div>
- </div>
- <div class="row">
- <div class="col-xs-12">
- <table id="traceSummary" class="table table-bordered table-striped
table-condensed">
- <thead>
- <tr>
- <th class="firstcell" title="Trace Type">Type </th>
- <th title="Number of spans of this type">Total </th>
- <th title="Shortest span duration">min </th>
- <th title="Longest span duration">max </th>
- <th title="Average span duration">avg </th>
- <th title="Counts of spans of different duration. Columns
start at milliseconds, and each column is ten times longer: tens of
milliseconds, seconds, tens of seconds, etc.">Histogram </th>
- </tr>
- </thead>
- <tbody></tbody>
- </table>
- </div>
- </div>
