File tree Expand file tree Collapse file tree 6 files changed +16
-13
lines changed
main/java/com/uber/cadence/internal
test/java/com/uber/cadence Expand file tree Collapse file tree 6 files changed +16
-13
lines changed Original file line number Diff line number Diff line change 51
51
52
52
dependencies {
53
53
errorproneJavac(' com.google.errorprone:javac:9+181-r4173-1' )
54
- errorprone(' com.google.errorprone:error_prone_core:2.3.3 ' )
54
+ errorprone(' com.google.errorprone:error_prone_core:2.3.4 ' )
55
55
56
56
compile group : ' com.uber.tchannel' , name : ' tchannel-core' , version : ' 0.8.5'
57
57
compile group : ' org.slf4j' , name : ' slf4j-api' , version : ' 1.7.25'
@@ -61,6 +61,7 @@ dependencies {
61
61
compile group : ' com.google.guava' , name : ' guava' , version : ' 28.1-jre'
62
62
compile group : ' com.cronutils' , name : ' cron-utils' , version : ' 9.0.0'
63
63
compile group : ' io.micrometer' , name : ' micrometer-core' , version : ' 1.1.2'
64
+ compile group : ' javax.annotation' , name : ' javax.annotation-api' , version : ' 1.3.2'
64
65
65
66
testCompile group : ' junit' , name : ' junit' , version : ' 4.12'
66
67
testCompile group : ' com.googlecode.junit-toolbox' , name : ' junit-toolbox' , version : ' 2.4'
Original file line number Diff line number Diff line change 1
- FROM openjdk:8- alpine
1
+ FROM adoptopenjdk/openjdk11: alpine
2
2
3
3
# Apache Thrift version
4
4
ENV APACHE_THRIFT_VERSION=0.9.3
5
5
6
6
# Install dependencies using apk
7
7
RUN apk update && apk add --virtual wget ca-certificates wget && apk add --virtual build-dependencies build-base gcc
8
8
# Git is needed in order to update the dls submodule
9
- RUN apk add --virtual git
9
+ RUN apk add git libstdc++
10
10
11
11
# Compile source
12
12
RUN set -ex ;\
@@ -22,4 +22,4 @@ RUN set -ex ;\
22
22
RUN apk del build-dependencies wget && rm -rf /var/cache/apk/*
23
23
24
24
RUN mkdir /cadence-java-client
25
- WORKDIR /cadence-java-client
25
+ WORKDIR /cadence-java-client
Original file line number Diff line number Diff line change @@ -189,11 +189,13 @@ public Result handle(
189
189
isLocalActivity );
190
190
}
191
191
if (metricsRateLimiter .tryAcquire (1 )) {
192
- if (isLocalActivity ) {
193
- metricsScope .gauge (MetricsType .LOCAL_ACTIVITY_ACTIVE_THREAD_COUNT ).update (Thread .activeCount ());
194
- } else {
195
- metricsScope .gauge (MetricsType .ACTIVITY_ACTIVE_THREAD_COUNT ).update (Thread .activeCount ());
196
- }
192
+ if (isLocalActivity ) {
193
+ metricsScope
194
+ .gauge (MetricsType .LOCAL_ACTIVITY_ACTIVE_THREAD_COUNT )
195
+ .update (Thread .activeCount ());
196
+ } else {
197
+ metricsScope .gauge (MetricsType .ACTIVITY_ACTIVE_THREAD_COUNT ).update (Thread .activeCount ());
198
+ }
197
199
}
198
200
return activity .execute (activityTask , metricsScope );
199
201
}
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ final class DecisionTaskToken {
33
33
34
34
DecisionTaskToken (ExecutionId executionId , int historySize ) {
35
35
this .executionId = Objects .requireNonNull (executionId );
36
- this .historySize = Objects . requireNonNull ( historySize ) ;
36
+ this .historySize = historySize ;
37
37
}
38
38
39
39
ExecutionId getExecutionId () {
Original file line number Diff line number Diff line change @@ -260,7 +260,7 @@ public void testException() {
260
260
assertNotNull (causeFromConverted );
261
261
assertEquals (DataConverterException .class , causeFromConverted .getClass ());
262
262
assertNotNull (causeFromConverted .getCause ());
263
- assertEquals (StackOverflowError .class , causeFromConverted .getCause ().getClass ());
263
+ assertEquals (IllegalArgumentException .class , causeFromConverted .getCause ().getClass ());
264
264
265
265
assertNotNull (causeFromConverted .getSuppressed ());
266
266
assertEquals (1 , causeFromConverted .getSuppressed ().length );
Original file line number Diff line number Diff line change @@ -965,7 +965,7 @@ public void testUntypedAsyncStartWithTimeout() throws Exception {
965
965
WorkflowStub workflowStub =
966
966
workflowClient .newUntypedWorkflowStub (
967
967
"TestWorkflow1::execute" , newWorkflowOptionsBuilder (taskList ).build ());
968
- Long timeout = new Long (200 );
968
+ Long timeout = Long . valueOf (200 );
969
969
CompletableFuture <WorkflowExecution > future =
970
970
workflowStub .startAsyncWithTimeout (timeout , TimeUnit .MILLISECONDS , taskList );
971
971
testUntypedAndStackTraceHelper (workflowStub , future .get ());
@@ -3309,7 +3309,7 @@ public void testSignalWorkflowAsyncWithTimeout() throws Exception {
3309
3309
CompletableFuture <WorkflowExecution > future = workflowStub .startAsync (taskList );
3310
3310
future .get ();
3311
3311
3312
- Long timeout = new Long (200 );
3312
+ Long timeout = Long . valueOf (200 );
3313
3313
String testSignalInput = "hello" ;
3314
3314
CompletableFuture <String > resultFuture =
3315
3315
workflowStub
You can’t perform that action at this time.
0 commit comments