Skip to content

String metrics now include the actual value as a qualifier #249

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

Merged
merged 2 commits into from
Jan 18, 2023
Merged

String metrics now include the actual value as a qualifier #249

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4674900
Enhance string metrics to include the actual value
russgold Jan 17, 2023
0492525
minor code cleanup
russgold Jan 17, 2023
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
91 changes: 56 additions & 35 deletions wls-exporter-core/src/main/java/com/oracle/wls/exporter/domain/MetricsScraper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
// Copyright (c) 2017, 2022, Oracle and/or its affiliates.
// Copyright (c) 2017, 2023, Oracle and/or its affiliates.
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.

package com.oracle.wls.exporter.domain;

import java.util.HashMap;
import java.util.Map;
import java.util.Optional;

import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;

import java.util.HashMap;
import java.util.Map;
import java.util.Optional;

import static com.oracle.wls.exporter.domain.MapUtils.isNullOrEmptyString;

/**
Expand Down Expand Up @@ -134,42 +134,63 @@ private String asQuotedString(JsonElement jsonElement) {
}

private void addMetric(String itemQualifiers, String valueName, JsonElement value) {
if (value != null && value.isJsonPrimitive()) {
addMetric(itemQualifiers, valueName, value.getAsJsonPrimitive());
}
new ScrapedMetric(itemQualifiers, valueName, value).add();
}

private void addMetric(String itemQualifiers, String valueName, JsonPrimitive jsonPrimitive) {
Optional.ofNullable(getMetricValue(valueName, jsonPrimitive))
.ifPresent(value -> addMetric(getMetricName(itemQualifiers, valueName), value));
}

private void addMetric(String metricName, Object value) {
metrics.put(metricName, value);
}
class ScrapedMetric {
private final JsonPrimitive jsonPrimitive;
String itemQualifiers;
String valueName;

private Object getMetricValue(String valueName, JsonPrimitive jsonPrimitive) {
if (jsonPrimitive.isNumber())
return jsonPrimitive.getAsNumber();
else if (selector.isStringMetric(valueName) && jsonPrimitive.isString())
return selector.getStringMetricValue(valueName, jsonPrimitive.getAsString());
else if (selector.acceptsStrings() && jsonPrimitive.isString())
return jsonPrimitive.getAsString();
else
return null;
}
ScrapedMetric(String itemQualifiers, String valueName, JsonElement value) {
this.itemQualifiers = itemQualifiers;
this.valueName = valueName;

private String getMetricName(String itemQualifiers, String valueName) {
StringBuilder sb = new StringBuilder();
if (selector.getPrefix() != null) sb.append(getCorrectCase(selector.getPrefix()));
sb.append(getCorrectCase(valueName));
if (!isNullOrEmptyString(itemQualifiers))
sb.append('{').append(itemQualifiers).append('}');
return sb.toString();
}
this.jsonPrimitive = Optional.ofNullable(value)
.filter(JsonElement::isJsonPrimitive)
.map(JsonElement::getAsJsonPrimitive)
.orElse(null);
}

void add() {
Optional.ofNullable(jsonPrimitive).map(this::toMetricValue).ifPresent(v -> metrics.put(getMetricName(), v));
}

private String getCorrectCase(String valueName) {
return metricNameSnakeCase ? SnakeCaseUtil.convert(valueName) : valueName;
private Object toMetricValue(JsonPrimitive jsonPrimitive) {
if (jsonPrimitive.isNumber())
return jsonPrimitive.getAsNumber();
else if (isStringMetric())
return selector.getStringMetricValue(valueName, jsonPrimitive.getAsString());
else if (selector.acceptsStrings() && jsonPrimitive.isString())
return jsonPrimitive.getAsString();
else
return null;
}

private boolean isStringMetric() {
return selector.isStringMetric(valueName) && jsonPrimitive.isString();
}

private String getMetricName() {
StringBuilder sb = new StringBuilder();
if (selector.getPrefix() != null) sb.append(getCorrectCase(selector.getPrefix()));
sb.append(getCorrectCase(valueName));
if (!isNullOrEmptyString(itemQualifiers))
sb.append('{').append(augmented(itemQualifiers)).append('}');
return sb.toString();
}

private String getCorrectCase(String valueName) {
return metricNameSnakeCase ? SnakeCaseUtil.convert(valueName) : valueName;
}

private String augmented(String itemQualifiers) {
if (isStringMetric())
return itemQualifiers + ",value=\"" + jsonPrimitive.getAsString() + '"';
else
return itemQualifiers;
}
}
}

Expand Down
12 changes: 6 additions & 6 deletions wls-exporter-core/src/test/java/com/oracle/wls/exporter/ExporterServletTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,12 +353,12 @@ void onGetWithStringValues_displayMetrics() throws Exception {

servlet.doGet(request, this.response);

assertThat(toHtml(this.response), containsString("color{name=\"fred\"} 0"));
assertThat(toHtml(this.response), containsString("color{name=\"george\"} 1"));
assertThat(toHtml(this.response), containsString("color{name=\"ron\"} -1"));
assertThat(toHtml(this.response), containsString("size{name=\"fred\"} 0"));
assertThat(toHtml(this.response), containsString("size{name=\"george\"} 1"));
assertThat(toHtml(this.response), containsString("size{name=\"ron\"} 2"));
assertThat(toHtml(this.response), containsString("color{name=\"fred\",value=\"red\"} 0"));
assertThat(toHtml(this.response), containsString("color{name=\"george\",value=\"green\"} 1"));
assertThat(toHtml(this.response), containsString("color{name=\"ron\",value=\"blue\"} -1"));
assertThat(toHtml(this.response), containsString("size{name=\"fred\",value=\"tall\"} 0"));
assertThat(toHtml(this.response), containsString("size{name=\"george\",value=\"grande\"} 1"));
assertThat(toHtml(this.response), containsString("size{name=\"ron\",value=\"venti\"} 2"));
}

private Map<String,Object> getStringResponseMap() {
Expand Down
10 changes: 5 additions & 5 deletions wls-exporter-core/src/test/java/com/oracle/wls/exporter/domain/MetricsScraperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017, 2022, Oracle and/or its affiliates.
// Copyright (c) 2017, 2023, Oracle and/or its affiliates.
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.

package com.oracle.wls.exporter.domain;
Expand Down Expand Up @@ -202,13 +202,13 @@ private ImmutableMap<String, Object> getAllValuesServletsMap() {
}

@Test
void whenStringValuesSpecified_generateEnumeration() {
void whenStringValuesSpecified_generateEnumerationAndQualifier() {
generateNestedMetrics(getStringValuedServletsMap(), SERVLET_RESPONSE);

assertThat(scraper.getMetrics(),
allOf(hasMetric("servlet_state{servletName=\"JspServlet\"}", 1),
hasMetric("servlet_state{servletName=\"FileServlet\"}", 0),
hasMetric("servlet_state{servletName=\"ready\"}", 2)));
allOf(hasMetric("servlet_state{servletName=\"JspServlet\",value=\"running\"}", 1),
hasMetric("servlet_state{servletName=\"FileServlet\",value=\"stopped\"}", 0),
hasMetric("servlet_state{servletName=\"ready\",value=\"confused\"}", 2)));
}

private ImmutableMap<String, Object> getStringValuedServletsMap() {
Expand Down