Skip to content

Commit 4e04609

Browse files
Bump com.diffplug.spotless from 6.25.0 to 7.0.3 (aws-observability#1070)
Bumps com.diffplug.spotless from 6.25.0 to 7.0.3. [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.diffplug.spotless&package-manager=gradle&previous-version=6.25.0&new-version=7.0.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) You can trigger a rebase of this PR by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) Dependabot will merge this PR once CI passes on it, as requested by @thpierce. [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> > **Note** > Automatic rebases have been disabled on this pull request as it has been open for over 30 days. --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Thomas Pierce <[email protected]>
1 parent e01ce04 commit 4e04609

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/base/JMXMetricsContractTestBase.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ protected void assertMetrics() {
6060
protected long getThreshold(String metricName) {
6161
long threshold = 0;
6262
switch (metricName) {
63-
// If maximum memory size is undefined, then value is -1
64-
// https://docs.oracle.com/en/java/javase/17/docs/api/java.management/java/lang/management/MemoryUsage.html#getMax()
65-
// Thread count can be negative when excutor is null
66-
// https://github.com/apache/tomcat/blob/1afe41491f0e56ec0a776db5ff84607f87ce6640/java/org/apache/tomcat/util/net/AbstractEndpoint.java#L1204
63+
// If maximum memory size is undefined, then value is -1
64+
// https://docs.oracle.com/en/java/javase/17/docs/api/java.management/java/lang/management/MemoryUsage.html#getMax()
65+
// Thread count can be negative when excutor is null
66+
// https://github.com/apache/tomcat/blob/1afe41491f0e56ec0a776db5ff84607f87ce6640/java/org/apache/tomcat/util/net/AbstractEndpoint.java#L1204
6767
case JMXMetricsConstants.TOMCAT_THREADS:
6868
threshold = -2;
6969
break;

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGenerator.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -455,17 +455,17 @@ private static String normalizeRemoteServiceName(SpanData span, String serviceNa
455455
case "AmazonSQS": // AWS SDK v1
456456
case "Sqs": // AWS SDK v2
457457
return NORMALIZED_SQS_SERVICE_NAME;
458-
// For Bedrock, Bedrock Agent, and Bedrock Agent Runtime, we can align with AWS Cloud
459-
// Control and use AWS::Bedrock for RemoteService.
458+
// For Bedrock, Bedrock Agent, and Bedrock Agent Runtime, we can align with AWS Cloud
459+
// Control and use AWS::Bedrock for RemoteService.
460460
case "AmazonBedrock": // AWS SDK v1
461461
case "Bedrock": // AWS SDK v2
462462
case "AWSBedrockAgentRuntime": // AWS SDK v1
463463
case "BedrockAgentRuntime": // AWS SDK v2
464464
case "AWSBedrockAgent": // AWS SDK v1
465465
case "BedrockAgent": // AWS SDK v2
466466
return NORMALIZED_BEDROCK_SERVICE_NAME;
467-
// For BedrockRuntime, we are using AWS::BedrockRuntime as the associated remote resource
468-
// (Model) is not listed in Cloud Control.
467+
// For BedrockRuntime, we are using AWS::BedrockRuntime as the associated remote resource
468+
// (Model) is not listed in Cloud Control.
469469
case "AmazonBedrockRuntime": // AWS SDK v1
470470
case "BedrockRuntime": // AWS SDK v2
471471
return NORMALIZED_BEDROCK_RUNTIME_SERVICE_NAME;

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
pluginManagement {
1717
plugins {
18-
id("com.diffplug.spotless") version "6.25.0"
18+
id("com.diffplug.spotless") version "7.0.3"
1919
id("com.github.ben-manes.versions") version "0.50.0"
2020
id("com.github.jk1.dependency-license-report") version "2.5"
2121
id("com.gradleup.shadow") version "8.3.5"

0 commit comments

Comments
 (0)