Skip to content
This repository was archived by the owner on Feb 8, 2023. It is now read-only.

Commit f138ec2

Browse files
author
川石
committed
update version to 1.4.11
1 parent 98d3f2f commit f138ec2

File tree

46 files changed

+87
-65
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

+87
-65
lines changed

‎README.md

+16-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
1-
# Tauris - 日志处理、清洗与转发工具
1+
# Tauris
22

3-
## 背景
3+
日志处理、清洗与传输工具，你可以使用tauris作为
44

5+
* 日志传输工具
6+
* 消息适配器
7+
* 阿里云日志服务和消息服务的客户端
8+
* 分析日志输出监控指标数据的转换器
59

610

7-
## Tauris能做什么？
8-
* 它可以作为日志传输工具
9-
* 它可以作为消息适配器
10-
* 它可以作为阿里云日志服务和消息服务的客户端
11-
* 它可以分析日志得到监控数据
1211

1312

14-
15-
Tauris在设计思想和配置方式方面借鉴了[logstash](https://www.elastic.co/cn/products/logstash)。
16-
17-
# 目录
13+
## 目录
1814
1. [Introduction](docs/introduction.md)
1915
2. [Installation](docs/installation.md)
2016
3. [Tutorial](docs/tutorial.md)
@@ -23,3 +19,12 @@ Tauris在设计思想和配置方式方面借鉴了[logstash](https://www.elasti
2319
6. [Plugin References](docs/plugins/index.md)
2420
7. [Use Cases](docs/usecases.md)
2521

22+
23+
24+
## License
25+
26+
[Licensed under the Apache License, Version 2.0](LICENSE).
27+
28+
## 特别说明
29+
30+
Tauris在设计思想和配置方式方面借鉴了[logstash](https://www.elastic.co/cn/products/logstash)。

‎config/tauris.log4j.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
33
<!--
4-
Author: chuanshi.zl@alibaba-inc.com
4+
Author: rockis@gmail.com
55
-->
66
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
77

@@ -61,4 +61,4 @@
6161
<appender-ref ref="default-appender"/>
6262
</root>
6363

64-
</log4j:configuration>
64+
</log4j:configuration>

‎pom.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.aliyun.tauris</groupId>
77
<artifactId>tauris-parent</artifactId>
8-
<version>1.4.10-SNAPSHOT</version>
8+
<version>1.4.11-SNAPSHOT</version>
99
<packaging>pom</packaging>
1010
<name>Tauris</name>
1111

@@ -31,6 +31,7 @@
3131
<module>tauris-plugins-filter</module>
3232
<module>tauris-plugins-bundle</module>
3333
<module>tauris-plugins-resource</module>
34+
<module>tauris-example</module>
3435
</modules>
3536
</profile>
3637

@@ -309,9 +310,9 @@
309310
</dependency>
310311

311312
<dependency>
312-
<groupId>net.sf.opencsv</groupId>
313+
<groupId>com.opencsv</groupId>
313314
<artifactId>opencsv</artifactId>
314-
<version>2.3</version>
315+
<version>4.5</version>
315316
</dependency>
316317

317318
<dependency>

‎tauris-boot/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>tauris-parent</artifactId>
88
<groupId>com.aliyun.tauris</groupId>
9-
<version>1.4.10-SNAPSHOT</version>
9+
<version>1.4.11-SNAPSHOT</version>
1010
</parent>
1111
<packaging>jar</packaging>
1212
<artifactId>tauris-boot</artifactId>

‎tauris-codecs/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>tauris-parent</artifactId>
88
<groupId>com.aliyun.tauris</groupId>
9-
<version>1.4.10-SNAPSHOT</version>
9+
<version>1.4.11-SNAPSHOT</version>
1010
</parent>
1111
<packaging>jar</packaging>
1212
<artifactId>tauris-codecs</artifactId>
@@ -30,7 +30,7 @@
3030
</dependency>
3131

3232
<dependency>
33-
<groupId>net.sf.opencsv</groupId>
33+
<groupId>com.opencsv</groupId>
3434
<artifactId>opencsv</artifactId>
3535
</dependency>
3636

‎tauris-codecs/src/main/java/com/aliyun/tauris/plugins/codec/CSVDecoder.java

+13-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package com.aliyun.tauris.plugins.codec;
22

3-
import au.com.bytecode.opencsv.CSVParser;
43
import com.aliyun.tauris.DecodeException;
54
import com.aliyun.tauris.TEvent;
65
import com.aliyun.tauris.annotations.Name;
76
import com.aliyun.tauris.annotations.Required;
7+
import com.opencsv.CSVParser;
8+
import com.opencsv.CSVParserBuilder;
89

910
import javax.annotation.Nullable;
1011
import java.io.IOException;
@@ -30,10 +31,9 @@ public class CSVDecoder extends AbstractDecoder {
3031

3132
boolean strict = false;
3233

33-
private CSVParser parser;
34+
private ThreadLocal<CSVParser> threadLocal = new ThreadLocal<>();
3435

3536
public void init() {
36-
parser = new CSVParser(separator, quotechar, escape);
3737
}
3838

3939
@Override
@@ -58,9 +58,18 @@ public TEvent decode(String source) throws DecodeException {
5858
return event;
5959
}
6060

61+
private CSVParser getParser() {
62+
CSVParser parser = threadLocal.get();
63+
if (parser == null) {
64+
parser = new CSVParserBuilder().withSeparator(separator).withQuoteChar(quotechar).withEscapeChar(escape).build();
65+
threadLocal.set(parser);
66+
}
67+
return parser;
68+
}
69+
6170
private void decode(String source, BiConsumer<String, String> put) throws DecodeException {
6271
try {
63-
String[] cols = parser.parseLine(source);
72+
String[] cols = getParser().parseLine(source);
6473
if (strict && cols.length != fields.length) {
6574
throw new DecodeException("column's length not match");
6675
}

‎tauris-codecs/src/main/java/com/aliyun/tauris/plugins/codec/CSVPrinter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.aliyun.tauris.plugins.codec;
22

3-
import au.com.bytecode.opencsv.CSVWriter;
43
import com.aliyun.tauris.EncodeException;
54
import com.aliyun.tauris.TEncoder;
65
import com.aliyun.tauris.TEvent;
76
import com.aliyun.tauris.TPrinter;
87
import com.aliyun.tauris.annotations.Name;
98
import com.aliyun.tauris.annotations.Required;
9+
import com.opencsv.CSVWriter;
1010

1111
import javax.annotation.concurrent.NotThreadSafe;
1212
import java.io.*;
@@ -51,7 +51,7 @@ public CSVPrinter(String[] fields, char separator, char quotechar, char escape,
5151
@Override
5252
public TPrinter wrap(OutputStream out) {
5353
CSVPrinter printer = new CSVPrinter(fields, separator, quotechar, escape, delimiter);
54-
printer.writer = new CSVWriter(new OutputStreamWriter(out), separator, quotechar, escape);
54+
printer.writer = new CSVWriter(new OutputStreamWriter(out), separator, quotechar, escape, delimiter);
5555
printer.buffer = new String[fields.length];
5656
return printer;
5757
}

‎tauris-codecs/src/test/java/com/aliyun/tauris/plugins/codec/CSVCodecTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/**
1010
* Class KVCodecTest
1111
*
12-
* @author chuanshi.zl<chuanshi.zl@alibaba-inc.com>
12+
* @author zhanglei
1313
* @date 2018-09-05
1414
*/
1515
public class CSVCodecTest {

‎tauris-codecs/src/test/java/com/aliyun/tauris/plugins/codec/KLVCodecTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/**
1111
* Class KVCodecTest
1212
*
13-
* @author chuanshi.zl<chuanshi.zl@alibaba-inc.com>
13+
* @author zhanglei
1414
* @date 2018-09-05
1515
*/
1616
public class KLVCodecTest {

‎tauris-codecs/src/test/java/com/aliyun/tauris/plugins/codec/KVSCodecTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/**
1010
* Class KVCodecTest
1111
*
12-
* @author chuanshi.zl<chuanshi.zl@alibaba-inc.com>
12+
* @author zhanglei
1313
* @date 2018-09-05
1414
*/
1515
public class KVSCodecTest {

‎tauris-codecs/src/test/java/com/aliyun/tauris/plugins/codec/MsgPackCodecTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/**
1313
* Class KVCodecTest
1414
*
15-
* @author chuanshi.zl<chuanshi.zl@alibaba-inc.com>
15+
* @author zhanglei
1616
* @date 2018-09-05
1717
*/
1818
public class MsgPackCodecTest {

‎tauris-config/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>tauris-parent</artifactId>
88
<groupId>com.aliyun.tauris</groupId>
9-
<version>1.4.10-SNAPSHOT</version>
9+
<version>1.4.11-SNAPSHOT</version>
1010
</parent>
1111
<packaging>jar</packaging>
1212
<artifactId>tauris-config</artifactId>

‎tauris-core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>tauris-parent</artifactId>
88
<groupId>com.aliyun.tauris</groupId>
9-
<version>1.4.10-SNAPSHOT</version>
9+
<version>1.4.11-SNAPSHOT</version>
1010
</parent>
1111
<packaging>jar</packaging>
1212
<artifactId>tauris-core</artifactId>

‎tauris-core/src/main/java/com/aliyun/tauris/TFilterGroup.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public TEvent filter(TEvent event) {
7979
}
8080
return event;
8181
} catch (Exception e) {
82-
logger.ERROR("filter %s raise an uncatched exception", e, lastFilter.id());
82+
logger.EXCEPTION(String.format("filter %s raise an uncatched exception", lastFilter.id()), e);
8383
return null;
8484
}
8585
}

‎tauris-core/src/main/java/com/aliyun/tauris/TPluginGroup.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* Class TPluginGroup
55
*
6-
* @author chuanshi.zl<chuanshi.zl@alibaba-inc.com>
6+
* @author Zhangei
77
* @date 2018-09-25
88
*/
99
public class TPluginGroup implements TPlugin {

‎tauris-core/src/main/java/com/aliyun/tauris/utils/TLogger.java

+7
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,13 @@ public void EXCEPTION(Throwable e) {
8080
this.error(msg, e);
8181
}
8282

83+
public void EXCEPTION(String msg, Throwable e) {
84+
if (this.pluginId != null) {
85+
this.error("[" + pluginId + "]" + msg);
86+
}
87+
this.error(msg, e);
88+
}
89+
8390
public void WARN2(String message, String detail) {
8491
if (verbose && detail != null) {
8592
message = message + ", verbose: '" + detail + "'";

‎tauris-plugins-base/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>tauris-parent</artifactId>
88
<groupId>com.aliyun.tauris</groupId>
9-
<version>1.4.10-SNAPSHOT</version>
9+
<version>1.4.11-SNAPSHOT</version>
1010
</parent>
1111
<packaging>jar</packaging>
1212
<artifactId>tauris-plugins-base</artifactId>

‎tauris-plugins-bundle/http/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>tauris-plugins-bundle</artifactId>
88
<groupId>com.aliyun.tauris</groupId>
9-
<version>1.4.10-SNAPSHOT</version>
9+
<version>1.4.11-SNAPSHOT</version>
1010
</parent>
1111
<packaging>jar</packaging>
1212
<artifactId>tauris-plugins-bundle-http</artifactId>

‎tauris-plugins-bundle/influxdb/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>tauris-plugins-bundle</artifactId>
88
<groupId>com.aliyun.tauris</groupId>
9-
<version>1.4.10-SNAPSHOT</version>
9+
<version>1.4.11-SNAPSHOT</version>
1010
</parent>
1111
<packaging>jar</packaging>
1212
<artifactId>tauris-plugins-bundle-influxdb</artifactId>

‎tauris-plugins-bundle/influxdb/src/test/java/com/aliyun/tauris/plugins/codec/InfluxdbDecoderTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/**
1010
* Class InfluxdbDecoderTest
1111
*
12-
* @author chuanshi.zl<chuanshi.zl@alibaba-inc.com>
12+
* @author zhanglei
1313
* @date 2018-09-04
1414
*/
1515
public class InfluxdbDecoderTest {

‎tauris-plugins-bundle/mns/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>tauris-plugins-bundle</artifactId>
88
<groupId>com.aliyun.tauris</groupId>
9-
<version>1.4.10-SNAPSHOT</version>
9+
<version>1.4.11-SNAPSHOT</version>
1010
</parent>
1111
<packaging>jar</packaging>
1212
<artifactId>tauris-plugins-bundle-mns</artifactId>

‎tauris-plugins-bundle/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>tauris-parent</artifactId>
88
<groupId>com.aliyun.tauris</groupId>
9-
<version>1.4.10-SNAPSHOT</version>
9+
<version>1.4.11-SNAPSHOT</version>
1010
</parent>
1111
<artifactId>tauris-plugins-bundle</artifactId>
1212
<packaging>pom</packaging>

‎tauris-plugins-bundle/scroll/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>tauris-plugins-bundle</artifactId>
88
<groupId>com.aliyun.tauris</groupId>
9-
<version>1.4.10-SNAPSHOT</version>
9+
<version>1.4.11-SNAPSHOT</version>
1010
</parent>
1111
<packaging>jar</packaging>
1212
<artifactId>tauris-plugins-bundle-scroll</artifactId>

‎tauris-plugins-bundle/sls/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>tauris-plugins-bundle</artifactId>
88
<groupId>com.aliyun.tauris</groupId>
9-
<version>1.4.10-SNAPSHOT</version>
9+
<version>1.4.11-SNAPSHOT</version>
1010
</parent>
1111
<packaging>jar</packaging>
1212
<artifactId>tauris-plugins-bundle-sls</artifactId>

‎tauris-plugins-bundle/syslog/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>tauris-plugins-bundle</artifactId>
88
<groupId>com.aliyun.tauris</groupId>
9-
<version>1.4.10-SNAPSHOT</version>
9+
<version>1.4.11-SNAPSHOT</version>
1010
</parent>
1111
<packaging>jar</packaging>
1212
<artifactId>tauris-plugins-bundle-syslog</artifactId>

‎tauris-plugins-bundle/tcp/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>tauris-plugins-bundle</artifactId>
88
<groupId>com.aliyun.tauris</groupId>
9-
<version>1.4.10-SNAPSHOT</version>
9+
<version>1.4.11-SNAPSHOT</version>
1010
</parent>
1111
<packaging>jar</packaging>
1212
<artifactId>tauris-plugins-bundle-tcp</artifactId>

‎tauris-plugins-bundle/udp/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>tauris-plugins-bundle</artifactId>
88
<groupId>com.aliyun.tauris</groupId>
9-
<version>1.4.10-SNAPSHOT</version>
9+
<version>1.4.11-SNAPSHOT</version>
1010
</parent>
1111
<packaging>jar</packaging>
1212
<artifactId>tauris-plugins-bundle-udp</artifactId>

‎tauris-plugins-filter/codec/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>tauris-plugins-filter</artifactId>
88
<groupId>com.aliyun.tauris</groupId>
9-
<version>1.4.10-SNAPSHOT</version>
9+
<version>1.4.11-SNAPSHOT</version>
1010
</parent>
1111
<packaging>jar</packaging>
1212
<artifactId>tauris-plugins-filter-codec</artifactId>

‎tauris-plugins-filter/iploc/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>tauris-plugins-filter</artifactId>
88
<groupId>com.aliyun.tauris</groupId>
9-
<version>1.4.10-SNAPSHOT</version>
9+
<version>1.4.11-SNAPSHOT</version>
1010
</parent>
1111
<packaging>jar</packaging>
1212
<artifactId>tauris-plugins-filter-iploc</artifactId>

0 commit comments

Comments
 (0)