You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fp...@apache.org on 2022/02/17 10:55:36 UTC
[flink] branch release-1.14 updated: [FLINK-25698][connectors/elasticsearch] Enable logging for Elasticsearch containers
This is an automated email from the ASF dual-hosted git repository.
fpaul pushed a commit to branch release-1.14
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.14 by this push:
new 5408bc6 [FLINK-25698][connectors/elasticsearch] Enable logging for Elasticsearch containers
5408bc6 is described below
commit 5408bc60cf00bc03d3a61b582c05da39759ef602
Author: Alexander Preuß <11...@users.noreply.github.com>
AuthorDate: Mon Feb 14 14:07:23 2022 +0100
[FLINK-25698][connectors/elasticsearch] Enable logging for Elasticsearch containers
---
.../flink-connector-elasticsearch-base/pom.xml | 6 +++
.../testutils/ElasticsearchContainerUtil.java | 63 ++++++++++++++++++++++
.../table/Elasticsearch6DynamicSinkITCase.java | 9 +++-
.../elasticsearch6/ElasticsearchSinkITCase.java | 8 ++-
.../table/Elasticsearch7DynamicSinkITCase.java | 9 +++-
.../elasticsearch7/ElasticsearchSinkITCase.java | 9 +++-
6 files changed, 96 insertions(+), 8 deletions(-)
diff --git a/flink-connectors/flink-connector-elasticsearch-base/pom.xml b/flink-connectors/flink-connector-elasticsearch-base/pom.xml
index 07817ac..2007945 100644
--- a/flink-connectors/flink-connector-elasticsearch-base/pom.xml
+++ b/flink-connectors/flink-connector-elasticsearch-base/pom.xml
@@ -86,6 +86,12 @@ under the License.
<!-- Tests -->
<dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>elasticsearch</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils_${scala.binary.version}</artifactId>
<version>${project.version}</version>
diff --git a/flink-connectors/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/testutils/ElasticsearchContainerUtil.java b/flink-connectors/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/testutils/ElasticsearchContainerUtil.java
new file mode 100644
index 0000000..3706df5
--- /dev/null
+++ b/flink-connectors/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/testutils/ElasticsearchContainerUtil.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.streaming.connectors.elasticsearch.testutils;
+
+import org.apache.flink.annotation.Internal;
+
+import org.slf4j.Logger;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.elasticsearch.ElasticsearchContainer;
+import org.testcontainers.utility.DockerImageName;
+
+/** Utility class for creating {@link ElasticsearchContainer}s. */
+@Internal
+public class ElasticsearchContainerUtil {
+
+ private ElasticsearchContainerUtil() {}
+
+ /**
+ * Creates a preconfigured {@link ElasticsearchContainer} that aligns the internal Elasticsearch
+ * log levels with the ones used by the capturing logger.
+ *
+ * @param dockerImageVersion describing the Elasticsearch image
+ * @param log to derive the log level from
+ * @return configured Elasticsearch container
+ */
+ public static ElasticsearchContainer createElasticsearchContainer(
+ String dockerImageVersion, Logger log) {
+ String logLevel;
+ if (log.isTraceEnabled()) {
+ logLevel = "TRACE";
+ } else if (log.isDebugEnabled()) {
+ logLevel = "DEBUG";
+ } else if (log.isInfoEnabled()) {
+ logLevel = "INFO";
+ } else if (log.isWarnEnabled()) {
+ logLevel = "WARN";
+ } else if (log.isErrorEnabled()) {
+ logLevel = "ERROR";
+ } else {
+ logLevel = "OFF";
+ }
+
+ return new ElasticsearchContainer(DockerImageName.parse(dockerImageVersion))
+ .withEnv("logger.org.elasticsearch", logLevel)
+ .withLogConsumer(new Slf4jLogConsumer(log));
+ }
+}
diff --git a/flink-connectors/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkITCase.java b/flink-connectors/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkITCase.java
index 77449d5..bb7cbe0 100644
--- a/flink-connectors/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkITCase.java
+++ b/flink-connectors/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkITCase.java
@@ -22,6 +22,7 @@ import org.apache.flink.api.common.time.Deadline;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.streaming.api.functions.sink.SinkFunction;
+import org.apache.flink.streaming.connectors.elasticsearch.testutils.ElasticsearchContainerUtil;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.table.api.EnvironmentSettings;
import org.apache.flink.table.api.TableEnvironment;
@@ -47,8 +48,9 @@ import org.elasticsearch.search.SearchHits;
import org.elasticsearch.transport.client.PreBuiltTransportClient;
import org.junit.ClassRule;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.testcontainers.elasticsearch.ElasticsearchContainer;
-import org.testcontainers.utility.DockerImageName;
import java.time.Duration;
import java.time.LocalDate;
@@ -67,10 +69,13 @@ import static org.junit.Assert.assertThat;
/** IT tests for {@link Elasticsearch6DynamicSink}. */
public class Elasticsearch6DynamicSinkITCase extends TestLogger {
+ private static final Logger LOG =
+ LoggerFactory.getLogger(Elasticsearch6DynamicSinkITCase.class);
@ClassRule
public static ElasticsearchContainer elasticsearchContainer =
- new ElasticsearchContainer(DockerImageName.parse(DockerImageVersions.ELASTICSEARCH_6));
+ ElasticsearchContainerUtil.createElasticsearchContainer(
+ DockerImageVersions.ELASTICSEARCH_6, LOG);
@SuppressWarnings("deprecation")
protected final Client getClient() {
diff --git a/flink-connectors/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch6/ElasticsearchSinkITCase.java b/flink-connectors/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch6/ElasticsearchSinkITCase.java
index 0637ca5..96948ee 100644
--- a/flink-connectors/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch6/ElasticsearchSinkITCase.java
+++ b/flink-connectors/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch6/ElasticsearchSinkITCase.java
@@ -22,6 +22,7 @@ import org.apache.flink.api.java.tuple.Tuple2;
import org.apache.flink.streaming.connectors.elasticsearch.ElasticsearchSinkBase;
import org.apache.flink.streaming.connectors.elasticsearch.ElasticsearchSinkFunction;
import org.apache.flink.streaming.connectors.elasticsearch.ElasticsearchSinkTestBase;
+import org.apache.flink.streaming.connectors.elasticsearch.testutils.ElasticsearchContainerUtil;
import org.apache.flink.util.DockerImageVersions;
import org.apache.http.HttpHost;
@@ -32,8 +33,9 @@ import org.elasticsearch.common.transport.TransportAddress;
import org.elasticsearch.transport.client.PreBuiltTransportClient;
import org.junit.ClassRule;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.testcontainers.elasticsearch.ElasticsearchContainer;
-import org.testcontainers.utility.DockerImageName;
import java.util.ArrayList;
import java.util.List;
@@ -41,10 +43,12 @@ import java.util.List;
/** IT cases for the {@link ElasticsearchSink}. */
public class ElasticsearchSinkITCase
extends ElasticsearchSinkTestBase<RestHighLevelClient, HttpHost> {
+ private static final Logger LOG = LoggerFactory.getLogger(ElasticsearchSinkITCase.class);
@ClassRule
public static ElasticsearchContainer elasticsearchContainer =
- new ElasticsearchContainer(DockerImageName.parse(DockerImageVersions.ELASTICSEARCH_6));
+ ElasticsearchContainerUtil.createElasticsearchContainer(
+ DockerImageVersions.ELASTICSEARCH_6, LOG);
@Override
protected String getClusterName() {
diff --git a/flink-connectors/flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkITCase.java b/flink-connectors/flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkITCase.java
index a74496c..00bb118 100644
--- a/flink-connectors/flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkITCase.java
+++ b/flink-connectors/flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkITCase.java
@@ -22,6 +22,7 @@ import org.apache.flink.api.common.time.Deadline;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.streaming.api.functions.sink.SinkFunction;
+import org.apache.flink.streaming.connectors.elasticsearch.testutils.ElasticsearchContainerUtil;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.table.api.EnvironmentSettings;
import org.apache.flink.table.api.TableEnvironment;
@@ -47,8 +48,9 @@ import org.elasticsearch.search.SearchHits;
import org.elasticsearch.transport.client.PreBuiltTransportClient;
import org.junit.ClassRule;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.testcontainers.elasticsearch.ElasticsearchContainer;
-import org.testcontainers.utility.DockerImageName;
import java.time.Duration;
import java.time.LocalDate;
@@ -67,10 +69,13 @@ import static org.junit.Assert.assertThat;
/** IT tests for {@link Elasticsearch7DynamicSink}. */
public class Elasticsearch7DynamicSinkITCase extends TestLogger {
+ private static final Logger LOG =
+ LoggerFactory.getLogger(Elasticsearch7DynamicSinkITCase.class);
@ClassRule
public static ElasticsearchContainer elasticsearchContainer =
- new ElasticsearchContainer(DockerImageName.parse(DockerImageVersions.ELASTICSEARCH_7));
+ ElasticsearchContainerUtil.createElasticsearchContainer(
+ DockerImageVersions.ELASTICSEARCH_7, LOG);
@SuppressWarnings("deprecation")
protected final Client getClient() {
diff --git a/flink-connectors/flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch7/ElasticsearchSinkITCase.java b/flink-connectors/flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch7/ElasticsearchSinkITCase.java
index 65332a8..63f6565 100644
--- a/flink-connectors/flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch7/ElasticsearchSinkITCase.java
+++ b/flink-connectors/flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch7/ElasticsearchSinkITCase.java
@@ -22,6 +22,7 @@ import org.apache.flink.api.java.tuple.Tuple2;
import org.apache.flink.streaming.connectors.elasticsearch.ElasticsearchSinkBase;
import org.apache.flink.streaming.connectors.elasticsearch.ElasticsearchSinkFunction;
import org.apache.flink.streaming.connectors.elasticsearch.ElasticsearchSinkTestBase;
+import org.apache.flink.streaming.connectors.elasticsearch.testutils.ElasticsearchContainerUtil;
import org.apache.flink.util.DockerImageVersions;
import org.apache.http.HttpHost;
@@ -32,8 +33,9 @@ import org.elasticsearch.common.transport.TransportAddress;
import org.elasticsearch.transport.client.PreBuiltTransportClient;
import org.junit.ClassRule;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.testcontainers.elasticsearch.ElasticsearchContainer;
-import org.testcontainers.utility.DockerImageName;
import java.util.ArrayList;
import java.util.List;
@@ -42,9 +44,12 @@ import java.util.List;
public class ElasticsearchSinkITCase
extends ElasticsearchSinkTestBase<RestHighLevelClient, HttpHost> {
+ private static final Logger LOG = LoggerFactory.getLogger(ElasticsearchSinkITCase.class);
+
@ClassRule
public static ElasticsearchContainer elasticsearchContainer =
- new ElasticsearchContainer(DockerImageName.parse(DockerImageVersions.ELASTICSEARCH_7));
+ ElasticsearchContainerUtil.createElasticsearchContainer(
+ DockerImageVersions.ELASTICSEARCH_7, LOG);
@Override
protected String getClusterName() {