File tree Expand file tree Collapse file tree 4 files changed +7
-4
lines changed
exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal
sdk-extensions/jaeger-remote-sampler/src/test/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler Expand file tree Collapse file tree 4 files changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ val DEPENDENCY_BOMS = listOf(
1111 " com.fasterxml.jackson:jackson-bom:2.18.1" ,
1212 " com.google.guava:guava-bom:33.3.1-jre" ,
1313 " com.google.protobuf:protobuf-bom:3.25.5" ,
14- " com.linecorp.armeria:armeria-bom:1.30.1 " ,
14+ " com.linecorp.armeria:armeria-bom:1.31.0 " ,
1515 " com.squareup.okhttp3:okhttp-bom:4.12.0" ,
1616 " com.squareup.okio:okio-bom:3.9.1" , // applies to transitive dependencies of okhttp
1717 " io.grpc:grpc-bom:1.68.1" ,
Original file line number Diff line number Diff line change 1616import com .google .protobuf .InvalidProtocolBufferException ;
1717import com .google .protobuf .Message ;
1818import com .linecorp .armeria .common .HttpRequest ;
19+ import com .linecorp .armeria .common .TlsKeyPair ;
1920import com .linecorp .armeria .common .grpc .protocol .ArmeriaStatusException ;
2021import com .linecorp .armeria .server .ServerBuilder ;
2122import com .linecorp .armeria .server .ServiceRequestContext ;
@@ -137,7 +138,7 @@ protected void configure(ServerBuilder sb) {
137138
138139 sb .http (0 );
139140 sb .https (0 );
140- sb .tls (certificate .certificateFile (), certificate .privateKeyFile ( ));
141+ sb .tls (TlsKeyPair . of ( certificate .privateKey (), certificate .certificate () ));
141142 sb .tlsCustomizer (ssl -> ssl .trustManager (clientCertificate .certificate ()));
142143 sb .decorator (LoggingService .newDecorator ());
143144 }
Original file line number Diff line number Diff line change 1919import com .linecorp .armeria .common .HttpStatus ;
2020import com .linecorp .armeria .common .MediaType ;
2121import com .linecorp .armeria .common .RequestHeaders ;
22+ import com .linecorp .armeria .common .TlsKeyPair ;
2223import com .linecorp .armeria .server .HttpService ;
2324import com .linecorp .armeria .server .ServerBuilder ;
2425import com .linecorp .armeria .server .ServiceRequestContext ;
@@ -144,7 +145,7 @@ protected void configure(ServerBuilder sb) {
144145
145146 sb .http (0 );
146147 sb .https (0 );
147- sb .tls (certificate .certificateFile (), certificate .privateKeyFile ( ));
148+ sb .tls (TlsKeyPair . of ( certificate .privateKey (), certificate .certificate () ));
148149 sb .tlsCustomizer (ssl -> ssl .trustManager (clientCertificate .certificate ()));
149150 sb .decorator (LoggingService .newDecorator ());
150151 }
Original file line number Diff line number Diff line change 1212import static org .junit .jupiter .api .Named .named ;
1313import static org .junit .jupiter .params .provider .Arguments .arguments ;
1414
15+ import com .linecorp .armeria .common .TlsKeyPair ;
1516import com .linecorp .armeria .common .grpc .protocol .ArmeriaStatusException ;
1617import com .linecorp .armeria .server .ServerBuilder ;
1718import com .linecorp .armeria .server .ServiceRequestContext ;
@@ -117,7 +118,7 @@ protected CompletionStage<byte[]> handleMessage(
117118 });
118119 sb .http (0 );
119120 sb .https (0 );
120- sb .tls (certificate .certificateFile (), certificate .privateKeyFile ( ));
121+ sb .tls (TlsKeyPair . of ( certificate .privateKey (), certificate .certificate () ));
121122 sb .tlsCustomizer (
122123 ssl -> {
123124 ssl .clientAuth (ClientAuth .OPTIONAL );
You can’t perform that action at this time.
0 commit comments