Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 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
2 changes: 1 addition & 1 deletion agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.26=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.29.2=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.30.0=runtimeClasspath
io.netty:netty-bom:4.1.112.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.6.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.6.0=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This file is expected to be part of source control.
com.azure:azure-sdk-bom:1.2.26=runtimeClasspath
com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.29.2=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.30.0=runtimeClasspath
io.netty:netty-bom:4.1.112.Final=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.6.0-alpha=runtimeClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.6.0=runtimeClasspath
Expand Down
2 changes: 1 addition & 1 deletion agent/agent-tooling/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ com.fasterxml.jackson:jackson-bom:2.17.2=runtimeClasspath
com.fasterxml.woodstox:woodstox-core:6.7.0=runtimeClasspath
com.github.oshi:oshi-core:6.6.2=runtimeClasspath
com.github.stephenc.jcip:jcip-annotations:1.0-1=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.29.2=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.30.0=runtimeClasspath
com.microsoft.azure:msal4j-persistence-extension:1.3.0=runtimeClasspath
com.microsoft.azure:msal4j:1.16.1=runtimeClasspath
com.nimbusds:content-type:2.3=runtimeClasspath
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.azure.monitor.opentelemetry.exporter.implementation.utils.ThreadPoolUtils;
import com.microsoft.applicationinsights.agent.internal.telemetry.TelemetryClient;
import java.util.List;
import java.util.Locale;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -76,9 +77,11 @@ public void setCollectionFrequencyInSec(long collectionFrequencyInSec) {
if (collectionFrequencyInSec < MIN_COLLECTION_FREQUENCY_IN_SEC) {
String errorMessage =
String.format(
Locale.ROOT,
"Collecting Interval: illegal value '%d'. The minimum value, '%d', "
+ "is used instead.",
collectionFrequencyInSec, MIN_COLLECTION_FREQUENCY_IN_SEC);
collectionFrequencyInSec,
MIN_COLLECTION_FREQUENCY_IN_SEC);
logger.error(errorMessage);

collectionFrequencyInSec = MIN_COLLECTION_FREQUENCY_IN_SEC;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

package com.microsoft.applicationinsights.telemetry;

import java.util.Locale;
import java.util.Objects;

/**
Expand Down Expand Up @@ -106,11 +107,11 @@ public long getTotalMilliseconds() {
public String toString() {
StringBuilder sb = new StringBuilder();
if (days != 0) {
sb.append(String.format("%02d.", days));
sb.append(String.format(Locale.ROOT, "%02d.", days));
}
sb.append(String.format("%02d:%02d:%02d", hours, minutes, seconds));
sb.append(String.format(Locale.ROOT, "%02d:%02d:%02d", hours, minutes, seconds));
if (milliseconds > 0) {
sb.append(String.format(".%03d0000", milliseconds));
sb.append(String.format(Locale.ROOT, ".%03d0000", milliseconds));
Comment on lines +110 to +114

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here.. it's better to using string.format to keep number of digits

}
return sb.toString();
}
Expand Down
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ val DEPENDENCY_BOMS = listOf(

val autoServiceVersion = "1.1.1"
val autoValueVersion = "1.11.0"
val errorProneVersion = "2.29.2"
val errorProneVersion = "2.30.0"
val jmhVersion = "1.37"
val mockitoVersion = "4.11.0"
val slf4jVersion = "2.0.16"
Expand Down
4 changes: 2 additions & 2 deletions licenses/more-licenses.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# agent
## Dependency License Report
_2024-08-12 03:55:29 UTC_
_2024-08-12 03:55:56 UTC_
## Apache License, Version 2.0

**1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.17.2`
Expand Down Expand Up @@ -36,7 +36,7 @@ _2024-08-12 03:55:29 UTC_
> - **POM Project URL**: [http://stephenc.github.com/jcip-annotations](http://stephenc.github.com/jcip-annotations)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)

**6** **Group:** `com.google.errorprone` **Name:** `error_prone_annotations` **Version:** `2.29.2`
**6** **Group:** `com.google.errorprone` **Name:** `error_prone_annotations` **Version:** `2.30.0`
> - **Manifest Project URL**: [https://errorprone.info/error_prone_annotations](https://errorprone.info/error_prone_annotations)
> - **Manifest License**: Apache License, Version 2.0 (Not Packaged)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
Expand Down