-
Notifications
You must be signed in to change notification settings - Fork 80
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Supports OpenSearch V2 through ES_* environment variables (#229)
Add Zipkin Dependencies support of for OpenSearch storage (see please openzipkin/zipkin#3765). Tested with Zipkin 3.4.0-SNAPSHOT locally: --------- Signed-off-by: Andriy Redko <drreta@gmail.com>
- Loading branch information
Showing
19 changed files
with
1,101 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| # | ||
| # Copyright The OpenZipkin Authors | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # | ||
|
|
||
| # This file uses the version 2 docker-compose file format, described here: | ||
| # https://docs.docker.com/compose/compose-file/#version-2 | ||
| # | ||
| # It extends the default configuration from docker-compose.yml to run the | ||
| # zipkin-opensearch2 container instead of the zipkin-mysql container. | ||
|
|
||
| version: '2.4' | ||
|
|
||
| services: | ||
| storage: | ||
| image: ghcr.io/openzipkin/zipkin-opensearch2:${TAG:-latest} | ||
| container_name: opensearch | ||
| # Uncomment to expose the storage port for testing | ||
| # ports: | ||
| # - 9200:9200 | ||
|
|
||
| # Use OpenSearch instead of in-memory storage | ||
| zipkin: | ||
| extends: | ||
| file: docker-compose.yml | ||
| service: zipkin | ||
| environment: | ||
| - STORAGE_TYPE=elasticsearch | ||
| # Point the zipkin at the storage backend | ||
| - ES_HOSTS=opensearch:9200 | ||
| # Uncomment to see requests to and from elasticsearch | ||
| # - ES_HTTP_LOGGING=BODY | ||
|
|
||
| dependencies: | ||
| extends: | ||
| file: docker-compose.yml | ||
| service: dependencies | ||
| environment: | ||
| - STORAGE_TYPE=elasticsearch | ||
| - ES_HOSTS=opensearch |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
163 changes: 163 additions & 0 deletions
163
main/src/main/java/zipkin2/dependencies/ZipkinElasticsearchStorage.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,163 @@ | ||
| /* | ||
| * Copyright The OpenZipkin Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package zipkin2.dependencies; | ||
|
|
||
| import java.io.IOException; | ||
| import java.net.Authenticator; | ||
| import java.net.PasswordAuthentication; | ||
| import java.net.Socket; | ||
| import java.net.URI; | ||
| import java.net.http.HttpClient; | ||
| import java.net.http.HttpRequest; | ||
| import java.net.http.HttpResponse; | ||
| import java.net.http.HttpResponse.BodyHandlers; | ||
| import java.security.KeyManagementException; | ||
| import java.security.NoSuchAlgorithmException; | ||
| import java.security.SecureRandom; | ||
| import java.security.cert.CertificateException; | ||
| import java.security.cert.X509Certificate; | ||
| import java.time.Duration; | ||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
| import java.util.regex.Matcher; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| import javax.net.ssl.SSLContext; | ||
| import javax.net.ssl.SSLEngine; | ||
| import javax.net.ssl.TrustManager; | ||
| import javax.net.ssl.X509ExtendedTrustManager; | ||
|
|
||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| final class ZipkinElasticsearchStorage { | ||
| private static final Logger LOG = LoggerFactory.getLogger(ZipkinElasticsearchStorage.class); | ||
| private static final Pattern DISTRIBUTION = Pattern.compile("\"distribution\"\s*[:]\s*\"([^\"]+)\""); | ||
|
|
||
| static final String HOSTS = getEnv("ES_HOSTS", "127.0.0.1"); | ||
| static final String USERNAME = getEnv("ES_USERNAME", null); | ||
| static final String PASSWORD = getEnv("ES_PASSWORD", null); | ||
|
|
||
| static TrustManager[] TRUST_ALL = new TrustManager [] { | ||
| new X509ExtendedTrustManager() { | ||
| @Override | ||
| public X509Certificate[] getAcceptedIssuers() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public void checkClientTrusted(X509Certificate[] certs, String authType) { | ||
| } | ||
|
|
||
| @Override | ||
| public void checkServerTrusted(X509Certificate[] certs, String authType) { | ||
| } | ||
|
|
||
| @Override | ||
| public void checkServerTrusted(X509Certificate[] chain, String authType, SSLEngine engine) throws CertificateException { | ||
| } | ||
|
|
||
| @Override | ||
| public void checkServerTrusted(X509Certificate[] chain, String authType, Socket socket) throws CertificateException { | ||
| } | ||
|
|
||
| @Override | ||
| public void checkClientTrusted(X509Certificate[] chain, String authType, SSLEngine engine) throws CertificateException { | ||
| } | ||
|
|
||
| @Override | ||
| public void checkClientTrusted(X509Certificate[] chain, String authType, Socket socket) throws CertificateException { | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| static String flavor() { | ||
| return flavor(HOSTS, USERNAME, PASSWORD); | ||
| } | ||
|
|
||
| static String flavor(String hosts, String username, String password) { | ||
| final HttpClient.Builder builder = HttpClient | ||
| .newBuilder() | ||
| .connectTimeout(Duration.ofSeconds(5)); | ||
|
|
||
| if (username != null && password != null) { | ||
| builder.authenticator(new Authenticator() { | ||
| @Override | ||
| protected PasswordAuthentication getPasswordAuthentication() { | ||
| return new PasswordAuthentication(username, password.toCharArray()); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| try { | ||
| final SSLContext sslContext = SSLContext.getInstance("TLS"); | ||
| sslContext.init(null, TRUST_ALL, new SecureRandom()); | ||
|
|
||
| final HttpClient client = builder.sslContext(sslContext).build(); | ||
| try { | ||
| for (String host: parseHosts(hosts)) { | ||
| final HttpRequest request = HttpRequest.newBuilder().GET().uri(URI.create(host)).build(); | ||
| try { | ||
| final HttpResponse<String> response = client.send(request, BodyHandlers.ofString()); | ||
| final Matcher matcher = DISTRIBUTION.matcher(response.body()); | ||
| if (matcher.find()) { | ||
| return matcher.group(1).toLowerCase(); | ||
| } | ||
| } catch (InterruptedException | IOException ex) { | ||
| LOG.warn("Unable issue HTTP GET request to '" + host + "'", ex); | ||
| } | ||
| } | ||
| } finally { | ||
| if (client instanceof AutoCloseable) { | ||
| try { | ||
| // Since JDK-21, the HttpClient is AutoCloseable | ||
| ((AutoCloseable) client).close(); | ||
| } catch (Exception ex) { | ||
| /* Ignore */ | ||
| } | ||
| } | ||
| } | ||
| } catch (final NoSuchAlgorithmException | KeyManagementException ex) { | ||
| LOG.warn("Unable to configure HttpClient", ex); | ||
| } | ||
|
|
||
| return "elasticsearch"; | ||
| } | ||
|
|
||
| private static String getEnv(String key, String defaultValue) { | ||
| String result = System.getenv(key); | ||
| return result != null && !result.isEmpty() ? result : defaultValue; | ||
| } | ||
|
|
||
| static String[] parseHosts(String hosts) { | ||
| final String[] hostParts = hosts.split(",", -1); | ||
|
|
||
| // Detect default scheme to use if not specified | ||
| String defaultScheme = "http"; | ||
| for (int i = 0; i < hostParts.length; i++) { | ||
| String host = hostParts[i]; | ||
| if (host.startsWith("https")) { | ||
| defaultScheme = "https"; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| Collection<String> list = new ArrayList<>(); | ||
| for (int i = 0; i < hostParts.length; i++) { | ||
| String host = hostParts[i]; | ||
| URI httpUri = host.startsWith("http") ? URI.create(host) : URI.create(defaultScheme + "://" + host); | ||
|
|
||
| int port = httpUri.getPort(); | ||
| if (port == -1) { | ||
| port = 9200; /* default Elasticsearch / OpenSearch port */ | ||
| } | ||
|
|
||
| list.add(httpUri.getScheme() + "://" + httpUri.getHost() + ":" + port); | ||
| } | ||
|
|
||
| return list.toArray(new String[0]); | ||
| } | ||
| } |
Oops, something went wrong.