diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataApi.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataApi.java
index 5b2f6f6e823..9e70d1ffd34 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataApi.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataApi.java
@@ -102,7 +102,7 @@ public void uploadPackFile(String gitRemoteUrl, String currentCommitHash, Path p
     RequestBody packFileBody = RequestBody.create(OCTET_STREAM, packFileContents);
 
     String packFileName = packFile.getFileName().toString();
-    String packFileNameWithoutRandomPrefix = packFileName.substring(packFileName.indexOf("-") + 1);
+    String packFileNameWithoutRandomPrefix = packFileName.substring(packFileName.indexOf('-') + 1);
 
     RequestBody requestBody =
         new MultipartBody.Builder()
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/HeaderRegexpTokenizer.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/HeaderRegexpTokenizer.java
index 69e34773eb8..dd2f1921365 100644
--- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/HeaderRegexpTokenizer.java
+++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/sensitive/HeaderRegexpTokenizer.java
@@ -43,7 +43,7 @@ private Ranged buildNext() {
     if (!checked) {
       checked = true;
       // Header evidence format is <headerName>: <headerValue>
-      int separatorIndex = evidenceValue.indexOf(":");
+      int separatorIndex = evidenceValue.indexOf(':');
       if (separatorIndex < 1) {
         return null; // Wrong evidence format: there is no separator or <headerName>
       }
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java
index c055f709a74..ee88a09eed1 100644
--- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java
+++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java
@@ -1014,7 +1014,7 @@ private Flow<Void> maybePublishRequestData(AppSecRequestContext ctx) {
     }
 
     Map<String, List<String>> queryParams = EMPTY_QUERY_PARAMS;
-    int i = savedRawURI.indexOf("?");
+    int i = savedRawURI.indexOf('?');
     if (i != -1) {
       String qs = savedRawURI.substring(i + 1);
       // ideally we'd have the query string as parsed by the server
diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy
index b36e61fe784..4179677a12a 100644
--- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy
+++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy
@@ -209,7 +209,7 @@ class TagsAssert {
       if (paramString != null && !paramString.isEmpty()) {
         String[] pairs = paramString.split("&")
         for (String pair : pairs) {
-          int idx = pair.indexOf("=")
+          int idx = pair.indexOf('=')
           if (idx > 0) {
             spanQueryParams.add(pair.substring(0, idx))
           } else {
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/TracingConfigPoller.java b/dd-trace-core/src/main/java/datadog/trace/core/TracingConfigPoller.java
index 60bb3a4a3bc..ad3a57c1505 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/TracingConfigPoller.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/TracingConfigPoller.java
@@ -246,7 +246,7 @@ private Map<String, String> parseTagListToMap(List<String> input) {
 
     Map<String, String> resultMap = new HashMap<>(input.size());
     for (String s : input) {
-      int colonIndex = s.indexOf(":");
+      int colonIndex = s.indexOf(':');
       if (colonIndex > -1
           && colonIndex < s.length() - 1) { // ensure there's a colon that's not at the start or end
         String key = s.substring(0, colonIndex);
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/B3HttpCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/B3HttpCodec.java
index ef807f6b080..75f3e280c89 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/B3HttpCodec.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/B3HttpCodec.java
@@ -320,8 +320,8 @@ private boolean extractB3(final String firstValue) {
       if (firstValue.length() == 1) {
         samplingPriority = convertSamplingPriority(firstValue);
       } else {
-        final int firstIndex = firstValue.indexOf("-");
-        final int secondIndex = firstValue.indexOf("-", firstIndex + 1);
+        final int firstIndex = firstValue.indexOf('-');
+        final int secondIndex = firstValue.indexOf('-', firstIndex + 1);
         if (firstIndex != -1) {
           final String b3TraceId = firstValue.substring(0, firstIndex);
           if (!setTraceId(b3TraceId)) {
diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java
index ba79642bd06..518520b6ead 100644
--- a/internal-api/src/main/java/datadog/trace/api/Config.java
+++ b/internal-api/src/main/java/datadog/trace/api/Config.java
@@ -4639,7 +4639,7 @@ private Map<String, String> getAzureAppServicesTags() {
     // Example: 8c500027-5f00-400e-8f00-60000000000f+apm-dotnet-EastUSwebspace
     // Format: {subscriptionId}+{planResourceGroup}-{hostedInRegion}
     String websiteOwner = getEnv("WEBSITE_OWNER_NAME");
-    int plusIndex = websiteOwner == null ? -1 : websiteOwner.indexOf("+");
+    int plusIndex = websiteOwner == null ? -1 : websiteOwner.indexOf('+');
 
     // The subscription ID of the site instance in Azure App Services
     String subscriptionId = null;