Skip to content
This repository was archived by the owner on Jul 11, 2024. It is now read-only.

Commit 6d19385

Browse files
chokoswitchchokoswitch
authored
Update dependencies (#443)
* Update armeria * Update tool dependencies * Update dependencies * Use BOMs where possible * Fix test template * More logging for curiostack test * More logging * Try disabling * Disable all curiostack-plugin tests for now.
1 parent b882950 commit 6d19385

File tree

46 files changed

+651
-668
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+651
-668
lines changed

‎build.gradle

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -60,47 +60,45 @@ allprojects {
6060
}
6161
}
6262
}
63-
publications = ['maven']
63+
publications = publishing.publications.collect { it.name }
6464
}
6565

6666
publishing {
67-
publications {
68-
maven(MavenPublication) {
69-
artifactId = project.archivesBaseName
70-
71-
if (project.name != 'curiostack-bom') {
72-
from components.java
67+
publications.configureEach {publication->
68+
artifactId = project.archivesBaseName
7369

70+
// Plugin and BOM publications do not need this.
71+
if (publication.name == 'maven' && project.name != 'curiostack-bom') {
72+
from components.java
73+
}
7474

75-
artifact project.tasks.javadocJar
76-
artifact project.tasks.sourceJar
77-
} else {
78-
from components.javaPlatform
79-
}
75+
if (project.name != 'curiostack-bom') {
76+
artifact project.tasks.javadocJar
77+
artifact project.tasks.sourceJar
78+
}
8079

81-
pom {
82-
licenses {
83-
license {
84-
name = 'MIT License'
85-
url = 'https://opensource.org/licenses/MIT'
86-
distribution = 'repo'
87-
}
80+
pom {
81+
licenses {
82+
license {
83+
name = 'MIT License'
84+
url = 'https://opensource.org/licenses/MIT'
85+
distribution = 'repo'
8886
}
89-
developers {
90-
developer {
91-
id = 'chokoswitch'
92-
name = 'Choko'
93-
email = 'choko@curioswitch.org'
94-
organization = 'CurioSwitch'
95-
organizationUrl = 'https://github.com/curioswitch/curiostack'
96-
}
87+
}
88+
developers {
89+
developer {
90+
id = 'chokoswitch'
91+
name = 'Choko'
92+
email = 'choko@curioswitch.org'
93+
organization = 'CurioSwitch'
94+
organizationUrl = 'https://github.com/curioswitch/curiostack'
9795
}
96+
}
9897

99-
scm {
100-
connection = 'scm:git:git://github.com/curioswitch/curiostack.git'
101-
developerConnection = 'scm:git:ssh://github.com:curioswitch/curiostack.git'
102-
url = 'https://github.com/curioswitch/curiostack'
103-
}
98+
scm {
99+
connection = 'scm:git:git://github.com/curioswitch/curiostack.git'
100+
developerConnection = 'scm:git:ssh://github.com:curioswitch/curiostack.git'
101+
url = 'https://github.com/curioswitch/curiostack'
104102
}
105103
}
106104
}

‎common/google-cloud/cloud-storage/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
# SOFTWARE.
2323
#
2424

25-
version = 0.0.37
25+
version = 0.0.38

‎common/google-cloud/core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ dependencies {
3434
api 'com.google.api-client:google-api-client'
3535
api 'com.google.guava:guava'
3636
api 'com.linecorp.armeria:armeria'
37+
api 'com.linecorp.armeria:armeria-brave'
3738
api 'com.linecorp.armeria:armeria-retrofit2'
38-
api 'com.linecorp.armeria:armeria-zipkin'
3939
api 'com.typesafe:config'
4040
api 'io.zipkin.brave:brave'
4141
api 'javax.inject:javax.inject'

‎common/google-cloud/core/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
# SOFTWARE.
2323
#
2424

25-
version = 0.0.37
25+
version = 0.0.38

‎common/google-cloud/core/src/main/java/org/curioswitch/curiostack/gcloud/core/grpc/GrpcApiClientBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
import com.linecorp.armeria.client.ClientBuilder;
2828
import com.linecorp.armeria.client.ClientRequestContext;
2929
import com.linecorp.armeria.client.SimpleDecoratingClient;
30+
import com.linecorp.armeria.client.brave.BraveClient;
3031
import com.linecorp.armeria.client.logging.LoggingClientBuilder;
3132
import com.linecorp.armeria.client.metric.MetricCollectingClient;
32-
import com.linecorp.armeria.client.tracing.HttpTracingClient;
3333
import com.linecorp.armeria.common.HttpHeaderNames;
3434
import com.linecorp.armeria.common.HttpRequest;
3535
import com.linecorp.armeria.common.HttpResponse;
@@ -69,7 +69,7 @@ public HttpResponse execute(ClientRequestContext ctx, HttpRequest req)
6969
}
7070
})
7171
.decorator(credentialsDecorator.newAccessTokenDecorator())
72-
.decorator(HttpRequest.class, HttpResponse.class, HttpTracingClient.newDecorator(tracing))
72+
.decorator(HttpRequest.class, HttpResponse.class, BraveClient.newDecorator(tracing))
7373
.decorator(
7474
HttpRequest.class,
7575
HttpResponse.class,

‎common/google-cloud/iam/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
# SOFTWARE.
2323
#
2424

25-
version = 0.0.37
25+
version = 0.0.38

‎common/google-cloud/pubsub/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
# SOFTWARE.
2323
#
2424

25-
version = 0.0.37
25+
version = 0.0.38

‎common/google-cloud/trace/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
# SOFTWARE.
2323
#
2424

25-
version = 0.0.37
25+
version = 0.0.38

‎common/server/framework/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ dependencies {
5656
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
5757
implementation 'com.github.ben-manes.caffeine:caffeine'
5858
implementation 'com.google.protobuf:protobuf-java'
59+
implementation 'com.linecorp.armeria:armeria-brave'
5960
implementation 'com.linecorp.armeria:armeria-grpc'
60-
implementation 'com.linecorp.armeria:armeria-zipkin'
6161
implementation 'com.zaxxer:HikariCP'
6262
implementation 'io.zipkin.brave:brave-instrumentation-mysql8'
6363
implementation 'io.dropwizard.metrics:metrics-json'

‎common/server/framework/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
# SOFTWARE.
2323
#
2424

25-
version = 0.0.109
25+
version = 0.0.110

‎common/server/framework/src/main/java/org/curioswitch/common/server/framework/ServerModule.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@
4747
import com.linecorp.armeria.server.ServiceWithRoutes;
4848
import com.linecorp.armeria.server.auth.HttpAuthServiceBuilder;
4949
import com.linecorp.armeria.server.auth.OAuth2Token;
50+
import com.linecorp.armeria.server.brave.BraveService;
5051
import com.linecorp.armeria.server.docs.DocServiceBuilder;
5152
import com.linecorp.armeria.server.grpc.GrpcServiceBuilder;
53+
import com.linecorp.armeria.server.healthcheck.HealthCheckService;
5254
import com.linecorp.armeria.server.healthcheck.HealthChecker;
53-
import com.linecorp.armeria.server.healthcheck.HttpHealthCheckService;
5455
import com.linecorp.armeria.server.healthcheck.SettableHealthChecker;
5556
import com.linecorp.armeria.server.logging.LoggingService;
5657
import com.linecorp.armeria.server.metric.MetricCollectingService;
5758
import com.linecorp.armeria.server.metric.PrometheusExpositionService;
58-
import com.linecorp.armeria.server.tracing.HttpTracingService;
5959
import com.typesafe.config.Config;
6060
import com.typesafe.config.ConfigBeanFactory;
6161
import dagger.BindsOptionalOf;
@@ -418,7 +418,7 @@ static Server armeriaServer(
418418

419419
sb.service(
420420
"/internal/health",
421-
internalService(new HttpHealthCheckService(healthCheckers), ipFilter, serverConfig));
421+
internalService(HealthCheckService.of(healthCheckers), ipFilter, serverConfig));
422422
sb.service("/internal/dropwizard", internalService(metricsHttpService, ipFilter, serverConfig));
423423
sb.service(
424424
"/internal/metrics",
@@ -657,7 +657,7 @@ private static Service<HttpRequest, HttpResponse> decorateService(
657657
.decorate(
658658
MetricCollectingService.newDecorator(
659659
RpcMetricLabels.grpcRequestLabeler("grpc_services")))
660-
.decorate(HttpTracingService.newDecorator(tracing))
660+
.decorate(BraveService.newDecorator(tracing))
661661
.decorate(
662662
(delegate, ctx, req) -> {
663663
TraceContext traceCtx = tracing.currentTraceContext().get();

‎common/server/framework/src/main/java/org/curioswitch/common/server/framework/armeria/ClientBuilderFactory.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,14 @@
3030
import com.linecorp.armeria.client.ClientBuilder;
3131
import com.linecorp.armeria.client.ClientFactory;
3232
import com.linecorp.armeria.client.ClientFactoryBuilder;
33+
import com.linecorp.armeria.client.brave.BraveClient;
3334
import com.linecorp.armeria.client.endpoint.EndpointGroupRegistry;
3435
import com.linecorp.armeria.client.endpoint.EndpointSelectionStrategy;
3536
import com.linecorp.armeria.client.endpoint.dns.DnsAddressEndpointGroup;
3637
import com.linecorp.armeria.client.endpoint.dns.DnsAddressEndpointGroupBuilder;
37-
import com.linecorp.armeria.client.endpoint.healthcheck.HttpHealthCheckedEndpointGroup;
38-
import com.linecorp.armeria.client.endpoint.healthcheck.HttpHealthCheckedEndpointGroupBuilder;
38+
import com.linecorp.armeria.client.endpoint.healthcheck.HealthCheckedEndpointGroup;
3939
import com.linecorp.armeria.client.logging.LoggingClient;
4040
import com.linecorp.armeria.client.metric.MetricCollectingClient;
41-
import com.linecorp.armeria.client.tracing.HttpTracingClient;
4241
import com.linecorp.armeria.common.HttpRequest;
4342
import com.linecorp.armeria.common.HttpResponse;
4443
import com.linecorp.armeria.common.SessionProtocol;
@@ -173,8 +172,8 @@ public ClientBuilder create(String name, String url) {
173172
endpoints.stream()
174173
.map(e -> MoreObjects.firstNonNull(e.ipAddr(), e.authority()))
175174
.collect(Collectors.joining(","))));
176-
HttpHealthCheckedEndpointGroup endpointGroup =
177-
new HttpHealthCheckedEndpointGroupBuilder(dnsEndpointGroup, "/internal/health")
175+
HealthCheckedEndpointGroup endpointGroup =
176+
HealthCheckedEndpointGroup.builder(dnsEndpointGroup, "/internal/health")
178177
.clientFactory(clientFactory)
179178
.protocol(SessionProtocol.HTTPS)
180179
.retryInterval(Duration.ofSeconds(3))
@@ -190,7 +189,7 @@ public ClientBuilder create(String name, String url) {
190189
return builder
191190
.decorator(
192191
MetricCollectingClient.newDecorator(RpcMetricLabels.grpcRequestLabeler("grpc_clients")))
193-
.decorator(HttpTracingClient.newDecorator(tracing))
192+
.decorator(BraveClient.newDecorator(tracing))
194193
.decorator(loggingClient);
195194
}
196195
}

‎common/server/framework/src/main/java/org/curioswitch/common/server/framework/monitoring/MonitoringModule.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
import com.codahale.metrics.jvm.ThreadStatesGaugeSet;
3535
import com.google.common.collect.ImmutableSet;
3636
import com.google.common.io.Resources;
37+
import com.linecorp.armeria.common.brave.RequestContextCurrentTraceContext;
3738
import com.linecorp.armeria.common.metric.PrometheusMeterRegistries;
38-
import com.linecorp.armeria.common.tracing.RequestContextCurrentTraceContext;
3939
import com.typesafe.config.Config;
4040
import com.typesafe.config.ConfigBeanFactory;
4141
import dagger.Lazy;
@@ -107,7 +107,7 @@ static Tracing tracing(Lazy<StackdriverReporter> reporter, MonitoringConfig conf
107107
.traceId128Bit(true)
108108
.supportsJoin(false)
109109
.propagationFactory(StackdriverTracePropagation.FACTORY)
110-
.currentTraceContext(RequestContextCurrentTraceContext.DEFAULT)
110+
.currentTraceContext(RequestContextCurrentTraceContext.ofDefault())
111111
.sampler(new CountingSampler((float) config.getTraceSamplingRate()));
112112
if (config.isReportTraces()) {
113113
builder.spanReporter(reporter.get());

‎eggworld/client/web/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,7 @@ tasks.register('install', org.curioswitch.gradle.plugins.nodejs.tasks.NodeTask.c
4242
!file("node_modules/.bin/build").exists()
4343
}
4444
}
45+
46+
tasks.named('buildWeb') {
47+
dependsOn('install')
48+
}

‎gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@ version = 0.0.0
2626

2727
org.curioswitch.curiostack.tools.terraform = 0.12.6
2828

29-
org.curioswitch.curiostack.version = 0.0.185.5
29+
org.curioswitch.curiostack.version = 0.0.186
3030
org.curioswitch.curiostack.is_curiostack = true
3131

3232
org.gradle.caching = true
3333
org.gradle.parallel = true
3434

3535
org.gradle.jvmargs=-Xmx1024m -Djib.console=plain
36+
37+
org.gradle.logging.level=info

‎gradle/get-jdk.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,22 @@ fi
3232

3333
OPENJDK_DIR="$GRADLE_HOME/curiostack/openjdk"
3434

35-
export JAVA_HOME="$OPENJDK_DIR/jdk-11.0.3+7"
35+
export JAVA_HOME="$OPENJDK_DIR/jdk-11.0.4+11"
3636

3737
if "$linux" = "true"; then
38-
SRC="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz"
39-
DEST="$OPENJDK_DIR/OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz"
38+
SRC="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_x64_linux_hotspot_11.0.4_11.tar.gz"
39+
DEST="$OPENJDK_DIR/OpenJDK11U-jdk_x64_linux_hotspot_11.0.4_11.tar.gz"
4040
fi
4141

4242
if "$darwin" = "true"; then
43-
SRC="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.3_7.tar.gz"
44-
DEST="$OPENJDK_DIR/OpenJDK11U-jdk_x64_mac_hotspot_11.0.3_7.tar.gz"
43+
SRC="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_x64_mac_hotspot_11.0.4_11.tar.gz"
44+
DEST="$OPENJDK_DIR/OpenJDK11U-jdk_x64_mac_hotspot_11.0.4_11.tar.gz"
4545
export JAVA_HOME="$JAVA_HOME/Contents/Home"
4646
fi
4747

4848
if "$windows" = "true"; then
49-
SRC="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_x64_windows_hotspot_11.0.3_7.zip"
50-
DEST="$OPENJDK_DIR/OpenJDK11U-jdk_x64_windows_hotspot_11.0.3_7.zip"
49+
SRC="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_x64_windows_hotspot_11.0.4_11.zip"
50+
DEST="$OPENJDK_DIR/OpenJDK11U-jdk_x64_windows_hotspot_11.0.4_11.zip"
5151
fi
5252

5353
if [ ! -d "$JAVA_HOME" ]; then

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎gradlew

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,4 +187,4 @@ if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
187187
cd "$(dirname "$0")"
188188
fi
189189

190-
exec "$JAVACMD" "$@"
190+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)