Skip to content

Commit 68a17ad

Browse files
fix(deps): update errorproneversion to v2.39.0 (minor) (#14122)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent e2db7c1 commit 68a17ad

File tree

20 files changed

+52
-45
lines changed

20 files changed

+52
-45
lines changed

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ val DEPENDENCY_BOMS = listOf(
3838

3939
val autoServiceVersion = "1.1.1"
4040
val autoValueVersion = "1.11.0"
41-
val errorProneVersion = "2.38.0"
41+
val errorProneVersion = "2.39.0"
4242
val byteBuddyVersion = "1.17.6"
4343
val asmVersion = "9.8"
4444
val jmhVersion = "1.37"

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsConnector.java

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -99,33 +99,39 @@ String getQueueArn(String queueUrl) {
9999
}
100100

101101
void setTopicPublishingPolicy(String topicArn) {
102-
String snsPolicy =
103-
"{"
104-
+ " \"Statement\": ["
105-
+ " {"
106-
+ " \"Effect\": \"Allow\","
107-
+ " \"Principal\": \"*\","
108-
+ " \"Action\": \"sns:Publish\","
109-
+ " \"Resource\": \"%s\""
110-
+ " }]"
111-
+ "}";
112102
snsClient.setTopicAttributes(
113-
new SetTopicAttributesRequest(topicArn, "Policy", String.format(snsPolicy, topicArn)));
103+
new SetTopicAttributesRequest(
104+
topicArn,
105+
"Policy",
106+
String.format(
107+
"{"
108+
+ " \"Statement\": ["
109+
+ " {"
110+
+ " \"Effect\": \"Allow\","
111+
+ " \"Principal\": \"*\","
112+
+ " \"Action\": \"sns:Publish\","
113+
+ " \"Resource\": \"%s\""
114+
+ " }]"
115+
+ "}",
116+
topicArn)));
114117
}
115118

116119
void setQueuePublishingPolicy(String queueUrl, String queueArn) {
117-
String sqsPolicy =
118-
"{"
119-
+ " \"Statement\": ["
120-
+ " {"
121-
+ " \"Effect\": \"Allow\","
122-
+ " \"Principal\": \"*\","
123-
+ " \"Action\": \"sqs:SendMessage\","
124-
+ " \"Resource\": \"%s\""
125-
+ " }]"
126-
+ "}";
127120
sqsClient.setQueueAttributes(
128-
queueUrl, Collections.singletonMap("Policy", String.format(sqsPolicy, queueArn)));
121+
queueUrl,
122+
Collections.singletonMap(
123+
"Policy",
124+
String.format(
125+
"{"
126+
+ " \"Statement\": ["
127+
+ " {"
128+
+ " \"Effect\": \"Allow\","
129+
+ " \"Principal\": \"*\","
130+
+ " \"Action\": \"sqs:SendMessage\","
131+
+ " \"Resource\": \"%s\""
132+
+ " }]"
133+
+ "}",
134+
queueArn)));
129135
}
130136

131137
void createBucket(String bucketName) {

instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/TracingRequestHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void beforeRequest(Request<?> request) {
8181
Context context = InstrumenterUtil.suppressSpan(instrumenter, parentContext, request);
8282
context = context.with(REQUEST_TIMER_KEY, Timer.start());
8383
context = context.with(PARENT_CONTEXT_KEY, parentContext);
84-
context = context.with(REQUEST_SPAN_SUPPRESSED_KEY, Boolean.TRUE);
84+
context = context.with(REQUEST_SPAN_SUPPRESSED_KEY, true);
8585
request.addHandlerContext(CONTEXT, context);
8686
return;
8787
}

instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53NodeClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ static void setUp(@TempDir File esWorkingDir) {
7474
new ClusterUpdateSettingsRequest()
7575
.transientSettings(
7676
Collections.singletonMap(
77-
"cluster.routing.allocation.disk.threshold_enabled", Boolean.FALSE)));
77+
"cluster.routing.allocation.disk.threshold_enabled", false)));
7878
});
7979
testing.waitForTraces(1);
8080
testing.clearData();

instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ static void setUp(@TempDir File esWorkingDir) {
8787
new ClusterUpdateSettingsRequest()
8888
.transientSettings(
8989
Collections.singletonMap(
90-
"cluster.routing.allocation.disk.threshold_enabled", Boolean.FALSE)));
90+
"cluster.routing.allocation.disk.threshold_enabled", false)));
9191
});
9292
testing.waitForTraces(1);
9393
testing.clearData();

instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/springdata/Config.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Node elasticSearchNode() throws Exception {
7171
new ClusterUpdateSettingsRequest()
7272
.transientSettings(
7373
Collections.singletonMap(
74-
"cluster.routing.allocation.disk.threshold_enabled", Boolean.FALSE)));
74+
"cluster.routing.allocation.disk.threshold_enabled", false)));
7575

7676
return testNode;
7777
}

instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/springdata/Elasticsearch53SpringTemplateTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ static void setUp(@TempDir File esWorkingDir) {
140140
new ClusterUpdateSettingsRequest()
141141
.transientSettings(
142142
Collections.singletonMap(
143-
"cluster.routing.allocation.disk.threshold_enabled", Boolean.FALSE)));
143+
"cluster.routing.allocation.disk.threshold_enabled", false)));
144144
});
145145
testing.waitForTraces(1);
146146
testing.clearData();

instrumentation/elasticsearch/elasticsearch-transport-6.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/AbstractElasticsearch6NodeClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void setUp(@TempDir File esWorkingDir) {
6868
new ClusterUpdateSettingsRequest()
6969
.transientSettings(
7070
Collections.singletonMap(
71-
"cluster.routing.allocation.disk.threshold_enabled", Boolean.FALSE)));
71+
"cluster.routing.allocation.disk.threshold_enabled", false)));
7272
});
7373
testing.waitForTraces(1);
7474
testing.clearData();

instrumentation/elasticsearch/elasticsearch-transport-6.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/AbstractElasticsearch6TransportClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ void setUp(@TempDir File esWorkingDir) {
8181
new ClusterUpdateSettingsRequest()
8282
.transientSettings(
8383
Collections.singletonMap(
84-
"cluster.routing.allocation.disk.threshold_enabled", Boolean.FALSE)));
84+
"cluster.routing.allocation.disk.threshold_enabled", false)));
8585
});
8686
testing.waitForTraces(1);
8787
testing.clearData();

instrumentation/executors/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/executors/ExecutorAdviceHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public final class ExecutorAdviceHelper {
2424
* to re-enable the propagation.
2525
*/
2626
public static void disablePropagation() {
27-
propagationDisabled.set(Boolean.TRUE);
27+
propagationDisabled.set(true);
2828
}
2929

3030
/**

0 commit comments

Comments
 (0)