From 92e8023155cf10692b7138f2c5f9a83e76a8b3e4 Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Tue, 26 Nov 2024 09:10:16 +0100 Subject: [PATCH] Replace StringBuilder#append(String) with StringBuilder#append(char) (#8008) --- .../parsers/HotspotCrashLogParser.java | 2 +- .../debugger/agent/StringTemplateBuilder.java | 2 +- .../debugger/probe/ProbeDefinition.java | 2 +- .../debugger/sink/IntakeBatchHelper.java | 6 ++--- .../debugger/util/StringTokenWriter.java | 24 +++++++++---------- .../debugger/sink/DebuggerSinkTest.java | 6 ++--- .../util/CapturedValueAdapterTest.java | 4 ++-- .../logging/simplelogger/SLCompatHelper.java | 4 ++-- .../trace/logging/intake/LogsDispatcher.java | 6 ++--- .../profiling/ddprof/DatadogProfiler.java | 2 +- .../agent/tooling/InstrumenterMetrics.java | 2 +- .../muzzle/MuzzleVersionScanPlugin.java | 10 ++++---- .../eventbridge/EventBridgeInterceptor.java | 4 ++-- .../aws/v1/sns/SnsInterceptor.java | 4 ++-- .../aws/v1/sns/TextMapInjectAdapter.java | 2 +- .../aws/v2/sns/SnsInterceptor.java | 4 ++-- .../aws/v2/sns/TextMapInjectAdapter.java | 2 +- .../JakartaRsAnnotationsDecorator.java | 4 ++-- .../jaxrs1/JaxRsAnnotationsDecorator.java | 4 ++-- .../jaxrs2/JaxRsAnnotationsDecorator.java | 4 ++-- .../instrumentation/jdbc/JDBCDecorator.java | 2 +- .../maven3/MavenProjectConfigurator.java | 8 +++---- .../rabbitmq/amqp/RabbitDecorator.java | 2 +- .../instrumentation/testng/TestNGUtils.java | 6 ++--- .../ClassInjectingTestInstrumentation.java | 2 +- .../smoketest/CrashtrackingSmokeTest.java | 16 ++++++------- .../datadog/trace/core/DDSpanContext.java | 4 ++-- .../trace/core/propagation/W3CHttpCodec.java | 2 +- .../datadog/trace/core/util/GlobPattern.java | 2 +- .../instrumentation/api/URIUtils.java | 2 +- .../ProcessImplInstrumentationHelpers.java | 2 +- .../main/java/datadog/trace/util/Strings.java | 12 +++++----- .../java/datadog/trace/util/TagsHelper.java | 2 +- .../datadog/trace/util/TagsHelperTest.java | 2 +- 34 files changed, 81 insertions(+), 81 deletions(-) diff --git a/dd-java-agent/agent-crashtracking/src/main/java/com/datadog/crashtracking/parsers/HotspotCrashLogParser.java b/dd-java-agent/agent-crashtracking/src/main/java/com/datadog/crashtracking/parsers/HotspotCrashLogParser.java index 1ee3b7efec1..e869981ff61 100644 --- a/dd-java-agent/agent-crashtracking/src/main/java/com/datadog/crashtracking/parsers/HotspotCrashLogParser.java +++ b/dd-java-agent/agent-crashtracking/src/main/java/com/datadog/crashtracking/parsers/HotspotCrashLogParser.java @@ -157,7 +157,7 @@ public CrashLog parse(String crashLog) { pid = line.substring(pidIdx + 4, endIdx); } } else { - message.append(line.substring(2)).append("\n"); + message.append(line.substring(2)).append('\n'); } } break; diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StringTemplateBuilder.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StringTemplateBuilder.java index 9095a1fcfbc..754d5cc06b7 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StringTemplateBuilder.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StringTemplateBuilder.java @@ -56,7 +56,7 @@ public String evaluate(CapturedContext context, LogProbe.LogStatus status) { status.addError(new EvaluationError(ex.getExpr(), ex.getMessage())); String msg = ex instanceof RedactedException ? Redaction.REDACTED_VALUE : ex.getMessage(); - sb.append("{").append(msg).append("}"); + sb.append('{').append(msg).append('}'); } if (!status.getErrors().isEmpty()) { status.setLogTemplateErrors(true); diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java index 6754404f903..042ac86ff54 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java @@ -85,7 +85,7 @@ public String concatTags() { StringBuilder sb = new StringBuilder(); for (Tag tag : tags) { if (sb.length() > 0) { - sb.append(","); + sb.append(','); } sb.append(tag); } diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/IntakeBatchHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/IntakeBatchHelper.java index 6ea5fe83e3e..dd58de2fe3a 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/IntakeBatchHelper.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/IntakeBatchHelper.java @@ -61,7 +61,7 @@ private static int buildPayloadBatch( List payloads, int start, int count, StringBuilder sb) { int totalSize = 0; int elementCount = 0; - sb.append("["); + sb.append('['); for (int i = start; i < start + count; i++) { String jsonStr = payloads.get(i); totalSize += jsonStr.length(); @@ -71,13 +71,13 @@ private static int buildPayloadBatch( break; } sb.append(jsonStr); - sb.append(","); + sb.append(','); elementCount++; } if (elementCount > 0) { sb.delete(sb.lastIndexOf(","), sb.length()); } - sb.append("]"); + sb.append(']'); return elementCount; } diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/StringTokenWriter.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/StringTokenWriter.java index 389ad14c7e5..d62c5e6d6d0 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/StringTokenWriter.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/StringTokenWriter.java @@ -31,7 +31,7 @@ public StringTokenWriter(StringBuilder sb, List evalErrors) { @Override public void prologue(Object value, String type) { if (inMapEntry && !initial) { - sb.append("="); + sb.append('='); } else if (inCollection && !initial) { sb.append(", "); } @@ -85,7 +85,7 @@ public void primitiveArrayElement(String value, String type) { @Override public void collectionPrologue(Object value) { - sb.append("["); + sb.append('['); initial = true; inCollection = true; } @@ -98,7 +98,7 @@ public void collectionEpilogue(Object value, boolean isComplete, int size) { @Override public void mapPrologue(Object value) { - sb.append("{"); + sb.append('{'); initial = true; inCollection = true; } @@ -108,14 +108,14 @@ public void mapEntryPrologue(Map.Entry entry) { if (!initial) { sb.append(", "); } - sb.append("["); + sb.append('['); initial = true; inMapEntry = true; } @Override public void mapEntryEpilogue(Map.Entry entry) { - sb.append("]"); + sb.append(']'); inMapEntry = false; } @@ -127,7 +127,7 @@ public void mapEpilogue(boolean isComplete, int size) { @Override public void objectPrologue(Object value) { - sb.append("{"); + sb.append('{'); initial = true; } @@ -137,12 +137,12 @@ public void objectFieldPrologue(String fieldName, Object value, int maxDepth) { sb.append(", "); } initial = false; - sb.append(fieldName).append("="); + sb.append(fieldName).append('='); } @Override public void objectEpilogue(Object value) { - sb.append("}"); + sb.append('}'); } @Override @@ -167,16 +167,16 @@ public void notCaptured(SerializerWithLimits.NotCapturedReason reason) { sb.append("..."); break; case TIMEOUT: - sb.append("{").append(TIMEOUT_REASON).append("}"); + sb.append('{').append(TIMEOUT_REASON).append('}'); break; case FIELD_COUNT: sb.append(", ..."); break; case REDACTED_IDENT: - sb.append("{").append(REDACTED_IDENT_REASON).append("}"); + sb.append('{').append(REDACTED_IDENT_REASON).append('}'); break; case REDACTED_TYPE: - sb.append("{").append(REDACTED_TYPE_REASON).append("}"); + sb.append('{').append(REDACTED_TYPE_REASON).append('}'); break; default: throw new RuntimeException("Unsupported NotCapturedReason: " + reason); @@ -185,6 +185,6 @@ public void notCaptured(SerializerWithLimits.NotCapturedReason reason) { @Override public void notCaptured(String reason) throws Exception { - sb.append("(Error: ").append(reason).append(")"); + sb.append("(Error: ").append(reason).append(')'); } } diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/DebuggerSinkTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/DebuggerSinkTest.java index add348f3d83..7b8c5996677 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/DebuggerSinkTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/DebuggerSinkTest.java @@ -322,7 +322,7 @@ public void splitDiagnosticsBatch() { DebuggerSink sink = createDebuggerSink(diagnosticUploader, false); StringBuilder largeMessageBuilder = new StringBuilder(100_001); for (int i = 0; i < 100_000; i++) { - largeMessageBuilder.append("f"); + largeMessageBuilder.append('f'); } String largeMessage = largeMessageBuilder.toString(); for (int i = 0; i < 100; i++) { @@ -342,7 +342,7 @@ public void splitDiagnosticsBatchDebuggerTrack() { DebuggerSink sink = createDebuggerSink(diagnosticUploader, true); StringBuilder largeMessageBuilder = new StringBuilder(100_001); for (int i = 0; i < 100_000; i++) { - largeMessageBuilder.append("f"); + largeMessageBuilder.append('f'); } String largeMessage = largeMessageBuilder.toString(); for (int i = 0; i < 100; i++) { @@ -362,7 +362,7 @@ public void tooLargeDiagnostic() { DebuggerSink sink = createDefaultDebuggerSink(); StringBuilder tooLargeMessageBuilder = new StringBuilder(MAX_PAYLOAD + 1); for (int i = 0; i < MAX_PAYLOAD; i++) { - tooLargeMessageBuilder.append("f"); + tooLargeMessageBuilder.append('f'); } String tooLargeMessage = tooLargeMessageBuilder.toString(); sink.getProbeDiagnosticsSink().addError(new ProbeId("1", 1), tooLargeMessage); diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/CapturedValueAdapterTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/CapturedValueAdapterTest.java index cbf91c6ead5..ea16400ce84 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/CapturedValueAdapterTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/CapturedValueAdapterTest.java @@ -55,7 +55,7 @@ void collection() throws IOException { StringBuilder sb = new StringBuilder(); for (int i = 0; i < 10; i++) { if (i > 0) { - sb.append(","); + sb.append(','); } sb.append(String.format(CAPTURED_VALUE_SIMPLE_TEMPLATE, int.class.getTypeName(), i)); } @@ -66,7 +66,7 @@ void collection() throws IOException { sb = new StringBuilder(); for (int i = 0; i < 10; i++) { if (i > 0) { - sb.append(","); + sb.append(','); } sb.append( String.format(CAPTURED_VALUE_SIMPLE_TEMPLATE, String.class.getTypeName(), "foo" + i)); diff --git a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/simplelogger/SLCompatHelper.java b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/simplelogger/SLCompatHelper.java index a8037c2fbdd..463c5f42f76 100644 --- a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/simplelogger/SLCompatHelper.java +++ b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/simplelogger/SLCompatHelper.java @@ -108,12 +108,12 @@ private void embedException(StringBuilder buf, Throwable t) { if (t != null) { buf.append(" [exception:"); buf.append(t.toString()); - buf.append("."); + buf.append('.'); for (StackTraceElement element : t.getStackTrace()) { buf.append(" at "); buf.append(element.toString()); } - buf.append("]"); + buf.append(']'); } } } diff --git a/dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsDispatcher.java b/dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsDispatcher.java index 503be5ca14b..79e9ae580d1 100644 --- a/dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsDispatcher.java +++ b/dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsDispatcher.java @@ -66,21 +66,21 @@ public void dispatch(List> messages) { } if (batchCount + 1 > maxBatchRecords || batchLength + bytes.length >= maxBatchBytes) { - flush(batch.append("]")); + flush(batch.append(']')); batch = new StringBuilder("["); batchCount = 0; batchLength = 0; } if (batchCount != 0) { - batch.append(","); + batch.append(','); } batch.append(json); batchCount += 1; batchLength += bytes.length; } - flush(batch.append("]")); + flush(batch.append(']')); } private void flush(StringBuilder batch) { diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java index 5bec75d9436..21c7eafc206 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java +++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java @@ -299,7 +299,7 @@ String cmdStartProfiling(Path file) throws IllegalStateException { // wall profiling is enabled. cmd.append(",wall="); if (getWallCollapsing(configProvider)) { - cmd.append("~"); + cmd.append('~'); } cmd.append(getWallInterval(configProvider)).append('m'); if (getWallContextFilter(configProvider)) { diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterMetrics.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterMetrics.java index e855e9528e7..bc54ebf5777 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterMetrics.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterMetrics.java @@ -206,7 +206,7 @@ private static void summarize(StringBuilder buf, String prefix, AtomicLong stat) long value = stat.get(); buf.append(prefix) .append(String.format("%-12d", value >>> COUNT_SHIFT)) - .append(" ") + .append(' ') .append(String.format("%.1f", (value & NANOS_MASK) / 1_000_000.0)) .append(" ms\n"); } diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleVersionScanPlugin.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleVersionScanPlugin.java index 026f218de7c..c4dc304ffcc 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleVersionScanPlugin.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleVersionScanPlugin.java @@ -159,26 +159,26 @@ private static String prettyPrint(final String prefix, final Reference ref) { builder.append(Reference.prettyPrint(ref.flags)); builder.append(ref.className); if (ref.superName != null) { - builder.append(" extends<").append(ref.superName).append(">"); + builder.append(" extends<").append(ref.superName).append('>'); } if (ref.interfaces.length > 0) { builder.append(" implements "); for (final String iface : ref.interfaces) { - builder.append(" <").append(iface).append(">"); + builder.append(" <").append(iface).append('>'); } } for (final String source : ref.sources) { - builder.append("\n").append(prefix).append(prefix); + builder.append('\n').append(prefix).append(prefix); builder.append("Source: ").append(source); } for (final Reference.Field field : ref.fields) { - builder.append("\n").append(prefix).append(prefix); + builder.append('\n').append(prefix).append(prefix); builder.append("Field: "); builder.append(Reference.prettyPrint(field.flags)); builder.append(field); } for (final Reference.Method method : ref.methods) { - builder.append("\n").append(prefix).append(prefix); + builder.append('\n').append(prefix).append(prefix); builder.append("Method: "); builder.append(Reference.prettyPrint(method.flags)); builder.append(method); diff --git a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java b/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java index b1be20cccc6..a1a975d8491 100644 --- a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java +++ b/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java @@ -65,7 +65,7 @@ public SdkRequest modifyRequest( } detailBuilder - .append("\"") + .append('\"') .append(PathwayContext.DATADOG_KEY) .append("\": ") .append(traceContext) @@ -104,7 +104,7 @@ private String getTraceContextToInject( .append(RESOURCE_NAME_KEY) .append("\": \"") .append(eventBusName) - .append("\""); + .append('\"'); jsonBuilder.append('}'); return jsonBuilder.toString(); diff --git a/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java b/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java index 3f1d6162d17..c0521bbea5e 100644 --- a/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java +++ b/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java @@ -36,13 +36,13 @@ private ByteBuffer getMessageAttributeValueToInject( AmazonWebServiceRequest request, String snsTopicName) { final AgentSpan span = newSpan(request); StringBuilder jsonBuilder = new StringBuilder(); - jsonBuilder.append("{"); + jsonBuilder.append('{'); propagate().inject(span, jsonBuilder, SETTER, TracePropagationStyle.DATADOG); if (traceConfig().isDataStreamsEnabled()) { propagate().injectPathwayContext(span, jsonBuilder, SETTER, getTags(snsTopicName)); } jsonBuilder.setLength(jsonBuilder.length() - 1); // Remove the last comma - jsonBuilder.append("}"); + jsonBuilder.append('}'); return ByteBuffer.wrap(jsonBuilder.toString().getBytes(StandardCharsets.UTF_8)); } diff --git a/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/TextMapInjectAdapter.java b/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/TextMapInjectAdapter.java index 6f2bb8f888b..6ec5a9dd5ab 100644 --- a/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/TextMapInjectAdapter.java +++ b/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/TextMapInjectAdapter.java @@ -8,6 +8,6 @@ public class TextMapInjectAdapter implements AgentPropagation.Setter 0 ? "-01" : "-00"); return sb.toString(); diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java b/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java index 2f16c40ed21..13758cefd1e 100644 --- a/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java +++ b/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java @@ -60,9 +60,9 @@ public void configureTracer( addedArgLine .append("-D") .append(e.getKey()) - .append("=") + .append('=') .append(escapeForCommandLine(e.getValue())) - .append(" "); + .append(' '); } Integer ciVisibilityDebugPort = config.getCiVisibilityDebugPort(); @@ -70,12 +70,12 @@ public void configureTracer( addedArgLine .append("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=") .append(ciVisibilityDebugPort) - .append(" "); + .append(' '); } String additionalArgs = config.getCiVisibilityAdditionalChildProcessJvmArgs(); if (additionalArgs != null) { - addedArgLine.append(additionalArgs).append(" "); + addedArgLine.append(additionalArgs).append(' '); } File agentJar = config.getCiVisibilityAgentJarFile(); diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java index 4ee4ced8f21..6ba59b6734a 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java @@ -181,7 +181,7 @@ private String buildResourceName( final StringBuilder prefix = new StringBuilder(opName.length() + exchangeName.length() + routingKey.length() + 5) .append(opName) - .append(" ") + .append(' ') .append(exchangeName); if (Config.get().isRabbitIncludeRoutingKeyInResource()) { prefix.append(" -> ").append(routingKey); diff --git a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java index e8f2a0d3625..4ec7cb4d464 100644 --- a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java +++ b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java @@ -77,13 +77,13 @@ public static String getParameters(Object[] parameters) { // Example: {"arguments":{"0":"param1","1":"param2"}} final StringBuilder sb = new StringBuilder("{\"arguments\":{"); for (int i = 0; i < parameters.length; i++) { - sb.append("\"") + sb.append('\"') .append(i) .append("\":\"") .append(Strings.escapeToJson(String.valueOf(parameters[i]))) - .append("\""); + .append('\"'); if (i != parameters.length - 1) { - sb.append(","); + sb.append(','); } } sb.append("}}"); diff --git a/dd-java-agent/testing/src/test/java/locator/ClassInjectingTestInstrumentation.java b/dd-java-agent/testing/src/test/java/locator/ClassInjectingTestInstrumentation.java index 7f24d053219..9de4a6138b6 100644 --- a/dd-java-agent/testing/src/test/java/locator/ClassInjectingTestInstrumentation.java +++ b/dd-java-agent/testing/src/test/java/locator/ClassInjectingTestInstrumentation.java @@ -56,7 +56,7 @@ public ToBeInstrumented(String message) { public String getMessage() { StringBuilder msg = new StringBuilder(message); for (Class iface : getClass().getInterfaces()) { - msg.append(":"); + msg.append(':'); msg.append(iface.getName()); } return msg.toString(); diff --git a/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java b/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java index 119b433db39..469f86f0620 100644 --- a/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java +++ b/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java @@ -121,7 +121,7 @@ void testCrashTracking() throws Exception { .forEach( l -> { System.out.println(l); - stdoutStr.append(l).append("\n"); + stdoutStr.append(l).append('\n'); }); } catch (Exception e) { throw new RuntimeException(e); @@ -136,7 +136,7 @@ void testCrashTracking() throws Exception { .forEach( l -> { System.err.println(l); - stderrStr.append(l).append("\n"); + stderrStr.append(l).append('\n'); }); } catch (Exception e) { throw new RuntimeException(e); @@ -196,7 +196,7 @@ void testCrashTrackingLegacy() throws Exception { .forEach( l -> { System.out.println(l); - stdoutStr.append(l).append("\n"); + stdoutStr.append(l).append('\n'); }); } catch (Exception e) { throw new RuntimeException(e); @@ -211,7 +211,7 @@ void testCrashTrackingLegacy() throws Exception { .forEach( l -> { System.err.println(l); - stderrStr.append(l).append("\n"); + stderrStr.append(l).append('\n'); }); } catch (Exception e) { throw new RuntimeException(e); @@ -268,7 +268,7 @@ void testOomeTracking() throws Exception { .forEach( l -> { System.out.println(l); - stdoutStr.append(l).append("\n"); + stdoutStr.append(l).append('\n'); }); } catch (Exception e) { throw new RuntimeException(e); @@ -283,7 +283,7 @@ void testOomeTracking() throws Exception { .forEach( l -> { System.err.println(l); - stderrStr.append(l).append("\n"); + stderrStr.append(l).append('\n'); }); } catch (Exception e) { throw new RuntimeException(e); @@ -339,7 +339,7 @@ void testCombineTracking() throws Exception { .forEach( l -> { System.out.println(l); - stdoutStr.append(l).append("\n"); + stdoutStr.append(l).append('\n'); }); } catch (Exception e) { throw new RuntimeException(e); @@ -354,7 +354,7 @@ void testCombineTracking() throws Exception { .forEach( l -> { System.err.println(l); - stderrStr.append(l).append("\n"); + stderrStr.append(l).append('\n'); }); } catch (Exception e) { throw new RuntimeException(e); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java index b05d008aafa..3634dab847e 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java @@ -890,9 +890,9 @@ public String toString() { .append(parentId) .append(" ] trace=") .append(getServiceName()) - .append("/") + .append('/') .append(getOperationName()) - .append("/") + .append('/') .append(getResourceName()); if (errorFlag) { s.append(" *errored*"); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CHttpCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CHttpCodec.java index 25f414db3a1..4ae2fc4efee 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CHttpCodec.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CHttpCodec.java @@ -74,7 +74,7 @@ private void injectTraceParent( StringBuilder sb = new StringBuilder(TRACE_PARENT_LENGTH); sb.append("00-"); sb.append(context.getTraceId().toHexString()); - sb.append("-"); + sb.append('-'); sb.append(DDSpanId.toHexStringPadded(context.getSpanId())); sb.append(context.getSamplingPriority() > 0 ? "-01" : "-00"); setter.set(carrier, TRACE_PARENT_KEY, sb.toString()); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/util/GlobPattern.java b/dd-trace-core/src/main/java/datadog/trace/core/util/GlobPattern.java index df736770380..2b46a2181d4 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/util/GlobPattern.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/util/GlobPattern.java @@ -32,7 +32,7 @@ private static String globToRegex(String globPattern) { case ']': case '{': case '}': - sb.append("\\").append(ch); + sb.append('\\').append(ch); break; default: sb.append(ch); diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIUtils.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIUtils.java index ea41bec4b23..37756757630 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIUtils.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIUtils.java @@ -294,7 +294,7 @@ public static URI safeConcat(final String schemeHostPort, final String theRest) PropagationUtils.onStringBuilderAppend(part1, sb.append(part1)); if (addSlash) { // it happens for http async client 4 with relative URI - sb.append("/"); + sb.append('/'); } PropagationUtils.onStringBuilderAppend(part2, sb.append(part2)); return safeParse(PropagationUtils.onStringBuilderToString(sb, sb.toString())); diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/java/lang/ProcessImplInstrumentationHelpers.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/java/lang/ProcessImplInstrumentationHelpers.java index fc4a252170a..1d19fccc298 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/java/lang/ProcessImplInstrumentationHelpers.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/java/lang/ProcessImplInstrumentationHelpers.java @@ -79,7 +79,7 @@ public static void setTags(final AgentSpan span, final String[] origCommand) { sb.append(cur.replace("\\", "\\\\").replace("\"", "\\\"")); sb.append('"'); } - sb.append("]"); + sb.append(']'); span.setTag("cmd.exec", sb.toString()); } diff --git a/internal-api/src/main/java/datadog/trace/util/Strings.java b/internal-api/src/main/java/datadog/trace/util/Strings.java index 666eee21d77..6715604260f 100644 --- a/internal-api/src/main/java/datadog/trace/util/Strings.java +++ b/internal-api/src/main/java/datadog/trace/util/Strings.java @@ -251,19 +251,19 @@ public static String toJson(final Map map, boolean valuesAreJson) { while (entriesIter.hasNext()) { final Entry entry = entriesIter.next(); - sb.append("\"").append(escapeToJson(entry.getKey())).append("\":"); + sb.append('\"').append(escapeToJson(entry.getKey())).append("\":"); if (valuesAreJson) { sb.append(entry.getValue()); } else { - sb.append("\"").append(escapeToJson(String.valueOf(entry.getValue()))).append("\""); + sb.append('\"').append(escapeToJson(String.valueOf(entry.getValue()))).append('\"'); } if (entriesIter.hasNext()) { - sb.append(","); + sb.append(','); } } - sb.append("}"); + sb.append('}'); return sb.toString(); } @@ -277,10 +277,10 @@ public static String toJson(final Iterable items) { String item = it.next(); json.append('"').append(escapeToJson(item)).append('"'); if (it.hasNext()) { - json.append(","); + json.append(','); } } - json.append("]"); + json.append(']'); return json.toString(); } diff --git a/internal-api/src/main/java/datadog/trace/util/TagsHelper.java b/internal-api/src/main/java/datadog/trace/util/TagsHelper.java index a142873b4cf..3627cb47648 100644 --- a/internal-api/src/main/java/datadog/trace/util/TagsHelper.java +++ b/internal-api/src/main/java/datadog/trace/util/TagsHelper.java @@ -79,7 +79,7 @@ public static String concatTags(String... tags) { continue; } sb.append(tag); - sb.append(","); + sb.append(','); } return sb.substring(0, sb.length() - 1); // Remove last comma } diff --git a/internal-api/src/test/java/datadog/trace/util/TagsHelperTest.java b/internal-api/src/test/java/datadog/trace/util/TagsHelperTest.java index 45ee5b1057a..180af3a8dca 100644 --- a/internal-api/src/test/java/datadog/trace/util/TagsHelperTest.java +++ b/internal-api/src/test/java/datadog/trace/util/TagsHelperTest.java @@ -41,7 +41,7 @@ public void invalidCharsConvertedToUnderscore() { public void tagTrimmedToMaxLength() { StringBuilder tag = new StringBuilder(401); for (int i = 0; i < 400; i++) { - tag.append("a"); + tag.append('a'); } assertEquals(200, TagsHelper.sanitize(tag.toString()).length()); assertEquals(200, TagsHelper.sanitize(tag.toString()).getBytes(StandardCharsets.UTF_8).length);