Skip to content

Commit

Permalink
Update statsbeat metric name to follow upstream spec (#36865)
Browse files Browse the repository at this point in the history
  • Loading branch information
@heyams
heyams authored Oct 6, 2023
1 parent 306cf71 commit 820a992
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions ...a/com/azure/monitor/opentelemetry/exporter/implementation/statsbeat/NetworkStatsbeat.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@

public class NetworkStatsbeat extends BaseStatsbeat {

private static final String REQUEST_SUCCESS_COUNT_METRIC_NAME = "Request Success Count";
private static final String REQUEST_FAILURE_COUNT_METRIC_NAME = "Request Failure Count";
private static final String REQUEST_DURATION_METRIC_NAME = "Request Duration";
private static final String RETRY_COUNT_METRIC_NAME = "Retry Count";
private static final String THROTTLE_COUNT_METRIC_NAME = "Throttle Count";
private static final String EXCEPTION_COUNT_METRIC_NAME = "Exception Count";
private static final String REQUEST_SUCCESS_COUNT_METRIC_NAME = "Request_Success_Count";
private static final String REQUEST_FAILURE_COUNT_METRIC_NAME = "Request_Failure_Count";
private static final String REQUEST_DURATION_METRIC_NAME = "Request_Duration";
private static final String RETRY_COUNT_METRIC_NAME = "Retry_Count";
private static final String THROTTLE_COUNT_METRIC_NAME = "Throttle_Count";
private static final String EXCEPTION_COUNT_METRIC_NAME = "Exception_Count";
private static final String BREEZE_ENDPOINT = "breeze";

private static final Pattern hostPattern = Pattern.compile("^https?://(?:www\\.)?([^/.]+)");
Expand Down
4 changes: 2 additions & 2 deletions .../azure/monitor/opentelemetry/exporter/implementation/statsbeat/NonessentialStatsbeat.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ public class NonessentialStatsbeat extends BaseStatsbeat implements LocalStorage
// kinds of non-essential statsbeat into different classes.

// Track local storage IO success and failure
private static final String READ_FAILURE_COUNT = "Read Failure Count";
private static final String WRITE_FAILURE_COUNT = "Write Failure Count";
private static final String READ_FAILURE_COUNT = "Read_Failure_Count";
private static final String WRITE_FAILURE_COUNT = "Write_Failure_Count";
private final AtomicLong readFailureCount = new AtomicLong();
private final AtomicLong writeFailureCount = new AtomicLong();

Expand Down
4 changes: 2 additions & 2 deletions sdk/monitor/azure-monitor-opentelemetry-exporter/src/test/resources/write-transmission.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{"ver":1,"name":"Metric","time":"2021-06-14T17:24:28.983-0700","sampleRate":100,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.cloud.roleInstance":"test-role-instance"},"data":{"baseType":"MetricData","baseData":{"ver":2,"metrics":[{"name":"jvm_memory_used","value":12958128}],"properties":{"area":"nonheap","id":"Compressed Class Space"}}}}
{"ver":1,"name":"Metric","time":"2021-06-14T17:24:28.983-0700","sampleRate":100,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.cloud.roleInstance":"test-role-instance"},"data":{"baseType":"MetricData","baseData":{"ver":2,"metrics":[{"name":"jvm_threads_live","value":150}],"properties":{"state":"runnable"}}}}
{"ver":1,"name":"Metric","time":"2021-06-14T17:24:28.983-0700","sampleRate":100,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.cloud.roleInstance":"test-role-instance"},"data":{"baseType":"MetricData","baseData":{"ver":2,"metrics":[{"name":"jdbc_connections_min","value":110}],"properties":{"name":"dataSource"}}}}
{"ver":1,"name":"Statsbeat","time":"2021-06-15T12:01:02.852-0700","sampleRate":100.0,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.cloud.roleInstance":"test-role-instance"},"data":{"baseType":"MetricData","baseData":{"ver":2,"metrics":[{"name":"Request Success Count","value":2.0}],"properties":{"runtimeVersion":"11.0.7","os":"Windows","language":"java","attach":"codeless","instrumentation":"0","cikey":"00000000-0000-0000-0000-0FEEDDADBEEF","version":"3.1.1","rp":"unknown"}}}}
{"ver":1,"name":"Statsbeat","time":"2021-06-15T12:01:02.852-0700","sampleRate":100.0,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.cloud.roleInstance":"test-role-instance"},"data":{"baseType":"MetricData","baseData":{"ver":2,"metrics":[{"name":"Request_Success_Count","value":2.0}],"properties":{"runtimeVersion":"11.0.7","os":"Windows","language":"java","attach":"codeless","instrumentation":"0","cikey":"00000000-0000-0000-0000-0FEEDDADBEEF","version":"3.1.1","rp":"unknown"}}}}
{"ver":1,"name":"Message","time":"2021-06-15T08:36:09.569-0700","sampleRate":100.0,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.cloud.roleInstance":"test-role-instance"},"data":{"baseType":"MessageData","baseData":{"ver":2,"message":"Tomcat initialized with port(s): 8080 (http)","severityLevel":"Information","properties":{"LoggerName":"org.springframework.boot.web.embedded.tomcat.TomcatWebServer","SourceType":"Logger"}}}}
{"ver":1,"name":"RemoteDependency","time":"2021-06-15T08:36:15.229-0700","sampleRate":100.0,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.operation.id":"891b332db33c65cc6497c014f02db26d","ai.cloud.roleInstance":"test-role-instance"},"data":{"baseType":"RemoteDependencyData","baseData":{"ver":2,"name":"DROP TABLE vet_specialties IF EXISTS","id":"d54e451407c13ad2","duration":"00:00:00.0130000","success":true,"data":"DROP TABLE vet_specialties IF EXISTS","type":"SQL","target":"b8f14b49-a2ad-4fa9-967e-c00b1d6addc4"}}}
{"ver":1,"name":"Request","time":"2021-06-16T12:15:50.433-0700","sampleRate":100.0,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.operation.id":"0cb22c0f071802f7f314569b007c9a1e","ai.operation.name":"GET /webjars/**","ai.cloud.roleInstance":"test-role-instance","ai.user.userAgent":"Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.77 Safari/537.36"},"data":{"baseType":"RequestData","baseData":{"ver":2,"id":"c0bfdc8f7963802c","duration":"00:00:00.0210000","responseCode":"304","success":true,"name":"GET /webjars/**","url":"http://localhost:8080/webjars/jquery/2.2.4/jquery.min.js"}}}
{"ver":1,"name":"Request","time":"2021-06-16T12:15:50.433-0700","sampleRate":100.0,"iKey":"00000000-0000-0000-0000-0FEEDDADBEEF","tags":{"ai.internal.sdkVersion":"java:3.1.1","ai.internal.nodeName":"test-role-name","ai.operation.id":"0cb22c0f071802f7f314569b007c9a1e","ai.operation.name":"GET /webjars/**","ai.cloud.roleInstance":"test-role-instance","ai.user.userAgent":"Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.77 Safari/537.36"},"data":{"baseType":"RequestData","baseData":{"ver":2,"id":"c0bfdc8f7963802c","duration":"00:00:00.0210000","responseCode":"304","success":true,"name":"GET /webjars/**","url":"http://localhost:8080/webjars/jquery/2.2.4/jquery.min.js"}}}

0 comments on commit 820a992

Please sign in to comment.