Skip to content

Commit 555949f

Browse files
ambudambud
authored
Merge pull request #34 from zzhhhzz/merge-rc6
Rebased logging-audit branch on top of master branch and bump up version 0.8.0
2 parents efae532 + cc59e4f commit 555949f

File tree

49 files changed

+3442
-148
lines changed

Some content is hidden

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

49 files changed

+3442
-148
lines changed

‎pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>com.pinterest.singer</groupId>
88
<artifactId>singer-package</artifactId>
9-
<version>0.7.3.32</version>
9+
<version>0.8.0</version>
1010
<packaging>pom</packaging>
1111
<description>Singer Logging Agent modules</description>
1212
<inceptionYear>2013</inceptionYear>
@@ -37,6 +37,10 @@
3737
<id>ambud</id>
3838
<name>Ambud Sharma</name>
3939
</developer>
40+
<developer>
41+
<id>zzhhhzz</id>
42+
<name>Heng Zhang</name>
43+
</developer>
4044
</developers>
4145
<scm>
4246
<connection>https://github.com/pinterest/singer.git</connection>
@@ -47,6 +51,7 @@
4751
<modules>
4852
<module>singer</module>
4953
<module>thrift-logger</module>
54+
<module>singer-commons</module>
5055
</modules>
5156

5257
<repositories>

‎singer-commons/example/loggingaudit_client_config_thriftlogger_example.properties‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
###############################################################################
2+
#
3+
# config for loggingaudit client
4+
#
5+
###############################################################################
6+
7+
8+
stage=thriftlogger
9+
enableAuditForAllTopicsByDefault=false
10+
queueSize=100000
11+
enqueueWaitInMilliseconds=0
12+
13+
sender.type=kafka
14+
sender.kafka.topic=logging_audit
15+
sender.kafka.stopGracePeriodInSeconds=100
16+
sender.kafka.producerConfig.bootstrap.servers=testkafka-001:9092,testkafka-002:9092,testkafka-003:9092
17+
sender.kafka.producerConfig.acks=-1
18+
sender.kafka.producerConfig.retries=5
19+
sender.kafka.producerConfig.producer.type=async
20+
sender.kafka.producerConfig.compression.type=gzip
21+
sender.kafka.producerConfig.max.request.size=2097152
22+
sender.kafka.producerConfig.ssl.enabled=true
23+
sender.kafka.producerConfig.ssl.client.auth=required
24+
sender.kafka.producerConfig.ssl.enabled.protocols=TLSv1.2,TLSv1.1,TLSv1
25+
sender.kafka.producerConfig.ssl.endpoint.identification.algorithm=HTTPS
26+
sender.kafka.producerConfig.ssl.key.password=your_password
27+
sender.kafka.producerConfig.ssl.keystore.location=/path/to/keystore/location
28+
sender.kafka.producerConfig.ssl.keystore.password=your_password
29+
sender.kafka.producerConfig.ssl.keystore.type=JKS
30+
sender.kafka.producerConfig.ssl.secure.random.implementation=SHA1PRNG
31+
sender.kafka.producerConfig.ssl.truststore.location=/path/to/truststore/location
32+
sender.kafka.producerConfig.ssl.truststore.password=your_password
33+
sender.kafka.producerConfig.ssl.truststore.type=JKS
34+
35+
auditedTopics.names=test1,test2,test3
36+
auditedTopics.test1.samplingRate=0.01
37+
auditedTopics.test1.startAtCurrentStage=true
38+
auditedTopics.test1.stopAtCurrentStage=true
39+
auditedTopics.test2.startAtCurrentStage=false
40+
auditedTopics.test2.stopAtCurrentStage=true
41+
auditedTopics.test3.samplingRate=0.0001
42+
auditedTopics.test3.startAtCurrentStage=false
43+
auditedTopics.test3.stopAtCurrentStage=true

‎singer-commons/pom.xml‎

Lines changed: 223 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,223 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<artifactId>singer-commons</artifactId>
6+
<packaging>jar</packaging>
7+
<description>Singer configuration and audit client library </description>
8+
<properties>
9+
<java.version>1.8</java.version>
10+
<junit.version>4.12</junit.version>
11+
<maven.compiler.source>${java.version}</maven.compiler.source>
12+
<maven.compiler.target>${java.version}</maven.compiler.target>
13+
<maven.version>3.3.9</maven.version>
14+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
16+
<slf4j.version>1.7.16</slf4j.version>
17+
<kafka.client.version>2.1.0</kafka.client.version>
18+
</properties>
19+
20+
<parent>
21+
<groupId>com.pinterest.singer</groupId>
22+
<artifactId>singer-package</artifactId>
23+
<version>0.8.0</version>
24+
<relativePath>../pom.xml</relativePath>
25+
</parent>
26+
<developers>
27+
<developer>
28+
<id>yuyang08</id>
29+
<name>Yu Yang</name>
30+
</developer>
31+
<developer>
32+
<id>ambud</id>
33+
<name>Ambud Sharma</name>
34+
</developer>
35+
<developer>
36+
<id>zzhhhzz</id>
37+
<name>Heng Zhang</name>
38+
</developer>
39+
</developers>
40+
41+
<scm>
42+
<connection>https://github.com/pinterest/singer.git</connection>
43+
<developerConnection>https://github.com/pinterest/singer.git</developerConnection>
44+
<url>https://github.com/pinterest/singer</url>
45+
</scm>
46+
47+
<dependencies>
48+
<dependency>
49+
<groupId>com.twitter</groupId>
50+
<artifactId>ostrich_2.11</artifactId>
51+
<version>9.27.0</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>commons-configuration</groupId>
55+
<artifactId>commons-configuration</artifactId>
56+
<version>1.9</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>org.apache.kafka</groupId>
60+
<artifactId>kafka_2.11</artifactId>
61+
<version>${kafka.client.version}</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>org.apache.kafka</groupId>
65+
<artifactId>kafka-clients</artifactId>
66+
<version>${kafka.client.version}</version>
67+
<exclusions>
68+
<exclusion>
69+
<groupId>org.slf4j</groupId>
70+
<artifactId>slf4j-simple</artifactId>
71+
</exclusion>
72+
<exclusion>
73+
<groupId>org.slf4j</groupId>
74+
<artifactId>slf4j-jdk14</artifactId>
75+
</exclusion>
76+
</exclusions>
77+
</dependency>
78+
<dependency>
79+
<groupId>org.junit.jupiter</groupId>
80+
<artifactId>junit-jupiter-api</artifactId>
81+
<version>5.3.1</version>
82+
<scope>test</scope>
83+
</dependency>
84+
<dependency>
85+
<groupId>org.junit.jupiter</groupId>
86+
<artifactId>junit-jupiter-engine</artifactId>
87+
<version>5.3.1</version>
88+
<scope>test</scope>
89+
</dependency>
90+
<dependency>
91+
<groupId>org.apache.thrift</groupId>
92+
<artifactId>libthrift</artifactId>
93+
<version>0.12.0</version>
94+
</dependency>
95+
<dependency>
96+
<groupId>org.slf4j</groupId>
97+
<artifactId>slf4j-api</artifactId>
98+
<version>1.7.2</version>
99+
</dependency>
100+
<dependency>
101+
<groupId>commons-lang</groupId>
102+
<artifactId>commons-lang</artifactId>
103+
<version>2.6</version>
104+
</dependency>
105+
</dependencies>
106+
<build>
107+
<plugins>
108+
<!-- Thrift source generate plugin. -->
109+
<plugin>
110+
<groupId>com.twitter</groupId>
111+
<artifactId>scrooge-maven-plugin</artifactId>
112+
<!-- this version must match the version from scrooge-gen.ivy.xml -->
113+
<!-- scrooge has a bug where it ignores defaults when compiling bool, hence upgraded the version -->
114+
<version>4.18.0</version>
115+
<configuration>
116+
<language>java</language>
117+
<!-- default is scala, can also be java -->
118+
<thriftOpts>
119+
<!-- add other Scrooge command line options using thriftOpts -->
120+
<thriftOpt>--finagle</thriftOpt>
121+
</thriftOpts>
122+
</configuration>
123+
<dependencies>
124+
<dependency>
125+
<groupId>org.slf4j</groupId>
126+
<artifactId>slf4j-jdk14</artifactId>
127+
<version>1.7.25</version>
128+
</dependency>
129+
<dependency>
130+
<groupId>org.slf4j</groupId>
131+
<artifactId>slf4j-simple</artifactId>
132+
<version>1.7.25</version>
133+
</dependency>
134+
</dependencies>
135+
<executions>
136+
<execution>
137+
<id>thrift-sources</id>
138+
<goals>
139+
<goal>compile</goal>
140+
</goals>
141+
<phase>generate-sources</phase>
142+
</execution>
143+
<execution>
144+
<id>thrift-test-sources</id>
145+
<goals>
146+
<goal>testCompile</goal>
147+
</goals>
148+
<phase>generate-test-sources</phase>
149+
</execution>
150+
</executions>
151+
</plugin>
152+
<!-- This forces the dependencies to be copied to target/lib -->
153+
<plugin>
154+
<artifactId>maven-dependency-plugin</artifactId>
155+
<executions>
156+
<execution>
157+
<goals>
158+
<goal>copy-dependencies</goal>
159+
</goals>
160+
<phase>package</phase>
161+
<configuration>
162+
<outputDirectory>${project.build.directory}/lib</outputDirectory>
163+
</configuration>
164+
</execution>
165+
</executions>
166+
</plugin>
167+
<plugin>
168+
<groupId>org.codehaus.mojo</groupId>
169+
<artifactId>build-helper-maven-plugin</artifactId>
170+
<executions>
171+
<execution>
172+
<id>add-source</id>
173+
<goals>
174+
<goal>add-source</goal>
175+
</goals>
176+
<phase>generate-sources</phase>
177+
<configuration>
178+
<sources>
179+
<source>${project.build.directory}/generated-sources/thrift/scrooge/</source>
180+
</sources>
181+
</configuration>
182+
</execution>
183+
</executions>
184+
</plugin>
185+
<plugin>
186+
<groupId>org.apache.maven.plugins</groupId>
187+
<artifactId>maven-javadoc-plugin</artifactId>
188+
<version>2.9.1</version>
189+
<configuration>
190+
<additionalparam>-Xdoclint:none</additionalparam>
191+
</configuration>
192+
<executions>
193+
<execution>
194+
<id>attach-javadocs</id>
195+
<goals>
196+
<goal>jar</goal>
197+
</goals>
198+
</execution>
199+
</executions>
200+
</plugin>
201+
<plugin>
202+
<groupId>org.apache.maven.plugins</groupId>
203+
<artifactId>maven-source-plugin</artifactId>
204+
<executions>
205+
<execution>
206+
<id>attach-sources</id>
207+
<goals>
208+
<goal>jar</goal>
209+
</goals>
210+
</execution>
211+
</executions>
212+
</plugin>
213+
<plugin>
214+
<groupId>org.apache.maven.plugins</groupId>
215+
<artifactId>maven-surefire-plugin</artifactId>
216+
<configuration>
217+
<argLine>-Xmx4096m -XX:MaxPermSize=256m</argLine>
218+
</configuration>
219+
</plugin>
220+
</plugins>
221+
</build>
222+
<inceptionYear>2013</inceptionYear>
223+
</project>

0 commit comments

Comments
 (0)