Skip to content

Commit dddf193

Browse files
darinhowarddarinhoward
authored
adding in support for protobuf transport (+4 squashed commits) (#19)
Adding in unix domain socket transport for logs
1 parent d25bd8b commit dddf193

33 files changed

+19432
-3271
lines changed

‎README.md‎

Lines changed: 18 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,14 @@
1-
# stackify-api-java
2-
31
[![Maven Central](https://img.shields.io/maven-central/v/com.stackify/stackify-api-java.svg)](http://mvnrepository.com/artifact/com.stackify/stackify-api-java)
4-
[![Build Status](https://travis-ci.org/stackify/stackify-api-java.png)](https://travis-ci.org/stackify/stackify-api-java)
52
[![Coverage Status](https://coveralls.io/repos/stackify/stackify-api-java/badge.png?branch=master)](https://coveralls.io/r/stackify/stackify-api-java?branch=master)
63

7-
Stackify API for Java
8-
9-
Errors and Logs Overview:
10-
11-
http://support.stackify.com/errors-and-logs-overview/
12-
13-
Sign Up for a Trial:
14-
15-
http://www.stackify.com/sign-up/
4+
## Stackify API for Java
165

17-
Log4j 1.2 Appender:
18-
19-
https://github.com/stackify/stackify-log-log4j12
20-
21-
Logback Appender:
22-
23-
https://github.com/stackify/stackify-log-logback
6+
* **Errors and Logs Overview:** http://support.stackify.com/errors-and-logs-overview/
7+
* **Sign Up for a Trial:** http://www.stackify.com/sign-up/
8+
* **Appenders**
9+
* **Log4j 1.2:** https://github.com/stackify/stackify-log-log4j12
10+
* **Log4j 2.x:** https://github.com/stackify/stackify-log-log4j2
11+
* **Logback:** https://github.com/stackify/stackify-log-logback
2412

2513
## Installation
2614

@@ -29,7 +17,7 @@ Add it as a maven dependency:
2917
<dependency>
3018
<groupId>com.stackify</groupId>
3119
<artifactId>stackify-api-java</artifactId>
32-
<version>INSERT_LATEST_MAVEN_CENTRAL_VERSION</version>
20+
<version>4.0.0</version>
3321
</dependency>
3422
```
3523

@@ -88,38 +76,20 @@ Be sure to shutdown the Direct Logger to flush this appender of any messages and
8876
LogManager.shutdown();
8977
```
9078

91-
### RUM Manual Instrumentation
92-
93-
Real User Monitoring (RUM) manual instrumentation allows you to specify where the RUM JavaScript block is injected.
94-
95-
It is recommended you provide a `stackify-api.properties` file in your application classpath with the following content:
96-
97-
````
98-
stackify.application=My Application Name
99-
stackify.environment=My Environment Name
100-
````
101-
102-
Your application code will need to call out to the Stackify `com.stackify.apm.Stackify.getRUMJavaScriptBlock()` method in the `<head>` section as detailed below:
103-
104-
**JSP Example**
105-
106-
````
107-
<html>
108-
<head>
109-
<%= com.stackify.apm.Stackify.getRUMJavaScriptBlock() %>
110-
<script and link tags>
111-
</head>
112-
<body>
113-
...
114-
</body>
115-
</html>
116-
````
117-
79+
## Legacy Support
11880

81+
For legacy support of **Java 1.6 and 1.7** use the following maven dependency:
82+
```
83+
<dependency>
84+
<groupId>com.stackify</groupId>
85+
<artifactId>stackify-api-java</artifactId>
86+
<version>3.1.2</version>
87+
</dependency>
88+
```
11989

12090
## License
12191

122-
Copyright 2013 Stackify, LLC.
92+
Copyright 2019 Stackify, LLC.
12393

12494
Licensed under the Apache License, Version 2.0 (the "License");
12595
you may not use this file except in compliance with the License.

‎pom.xml‎

Lines changed: 83 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
1-
<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">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23
<modelVersion>4.0.0</modelVersion>
34

45
<groupId>com.stackify</groupId>
56
<artifactId>stackify-api-java</artifactId>
6-
<version>3.1.3-SNAPSHOT</version>
7+
<version>4.0.0-SNAPSHOT</version>
78

89
<name>Stackify API for Java</name>
910
<description>Stackify API for Java</description>
1011
<url>https://github.com/stackify/stackify-api-java</url>
1112

12-
<parent>
13-
<groupId>org.sonatype.oss</groupId>
14-
<artifactId>oss-parent</artifactId>
15-
<version>9</version>
16-
</parent>
17-
1813
<licenses>
1914
<license>
2015
<name>The Apache Software License, Version 2.0</name>
@@ -45,7 +40,18 @@
4540
</developers>
4641

4742
<properties>
48-
<java.version>1.6</java.version>
43+
<java.version>1.8</java.version>
44+
<slf4j-api.version>1.7.28</slf4j-api.version>
45+
<jackson.version>2.7.9</jackson.version>
46+
<jackson-databind.version>2.7.9.6</jackson-databind.version>
47+
<httpclient.version>4.5.9</httpclient.version>
48+
<junixsocket.version>2.2.0</junixsocket.version>
49+
<failsafe.version>2.3.0</failsafe.version>
50+
<protobuf.version>3.9.1</protobuf.version>
51+
<lombok.version>1.18.8</lombok.version>
52+
<junit.version>4.11</junit.version>
53+
<mockito.version>1.9.5</mockito.version>
54+
<powermock.version>1.5.6</powermock.version>
4955
</properties>
5056

5157
<dependencies>
@@ -55,33 +61,63 @@
5561
<dependency>
5662
<groupId>org.slf4j</groupId>
5763
<artifactId>slf4j-api</artifactId>
58-
<version>1.7.5</version>
64+
<version>${slf4j-api.version}</version>
5965
</dependency>
6066

6167
<dependency>
6268
<groupId>com.fasterxml.jackson.core</groupId>
6369
<artifactId>jackson-core</artifactId>
64-
<version>2.8.11</version>
70+
<version>${jackson.version}</version>
6571
</dependency>
6672

6773
<dependency>
6874
<groupId>com.fasterxml.jackson.core</groupId>
6975
<artifactId>jackson-annotations</artifactId>
70-
<version>2.8.11</version>
76+
<version>${jackson.version}</version>
7177
</dependency>
7278

7379
<dependency>
7480
<groupId>com.fasterxml.jackson.core</groupId>
7581
<artifactId>jackson-databind</artifactId>
76-
<version>2.8.11.3</version>
82+
<version>${jackson-databind.version}</version>
83+
</dependency>
84+
85+
<dependency>
86+
<groupId>org.apache.httpcomponents</groupId>
87+
<artifactId>httpclient</artifactId>
88+
<version>${httpclient.version}</version>
89+
</dependency>
90+
91+
<dependency>
92+
<groupId>com.kohlschutter.junixsocket</groupId>
93+
<artifactId>junixsocket-common</artifactId>
94+
<version>${junixsocket.version}</version>
95+
</dependency>
96+
97+
<dependency>
98+
<groupId>com.kohlschutter.junixsocket</groupId>
99+
<artifactId>junixsocket-native-common</artifactId>
100+
<version>${junixsocket.version}</version>
101+
</dependency>
102+
103+
<dependency>
104+
<groupId>net.jodah</groupId>
105+
<artifactId>failsafe</artifactId>
106+
<version>${failsafe.version}</version>
107+
</dependency>
108+
109+
<dependency>
110+
<groupId>com.google.protobuf</groupId>
111+
<artifactId>protobuf-java</artifactId>
112+
<version>${protobuf.version}</version>
77113
</dependency>
78114

79115
<!-- Provided dependencies -->
80116

81117
<dependency>
82118
<groupId>org.projectlombok</groupId>
83119
<artifactId>lombok</artifactId>
84-
<version>1.16.10</version>
120+
<version>${lombok.version}</version>
85121
<scope>provided</scope>
86122
</dependency>
87123

@@ -92,42 +128,42 @@
92128
<dependency>
93129
<groupId>org.slf4j</groupId>
94130
<artifactId>slf4j-log4j12</artifactId>
95-
<version>1.7.5</version>
131+
<version>${slf4j-api.version}</version>
96132
<scope>test</scope>
97133
</dependency>
98134

99135
<dependency>
100136
<groupId>junit</groupId>
101137
<artifactId>junit</artifactId>
102-
<version>4.11</version>
138+
<version>${junit.version}</version>
103139
<scope>test</scope>
104140
</dependency>
105141

106142
<dependency>
107143
<groupId>org.mockito</groupId>
108144
<artifactId>mockito-core</artifactId>
109-
<version>1.9.5</version>
145+
<version>${mockito.version}</version>
110146
<scope>test</scope>
111147
</dependency>
112148

113149
<dependency>
114150
<groupId>org.powermock</groupId>
115151
<artifactId>powermock-core</artifactId>
116-
<version>1.5.6</version>
152+
<version>${powermock.version}</version>
117153
<scope>test</scope>
118154
</dependency>
119155

120156
<dependency>
121157
<groupId>org.powermock</groupId>
122158
<artifactId>powermock-module-junit4</artifactId>
123-
<version>1.5.6</version>
159+
<version>${powermock.version}</version>
124160
<scope>test</scope>
125161
</dependency>
126162

127163
<dependency>
128164
<groupId>org.powermock</groupId>
129165
<artifactId>powermock-api-mockito</artifactId>
130-
<version>1.5.6</version>
166+
<version>${powermock.version}</version>
131167
<scope>test</scope>
132168
</dependency>
133169

@@ -142,14 +178,6 @@
142178
</resource>
143179
</resources>
144180

145-
<extensions>
146-
<extension>
147-
<groupId>org.apache.maven.wagon</groupId>
148-
<artifactId>wagon-webdav-jackrabbit</artifactId>
149-
<version>2.2</version>
150-
</extension>
151-
</extensions>
152-
153181
<plugins>
154182

155183
<plugin>
@@ -173,24 +201,6 @@
173201
</configuration>
174202
</plugin>
175203

176-
<plugin>
177-
<groupId>org.apache.maven.plugins</groupId>
178-
<artifactId>maven-javadoc-plugin</artifactId>
179-
<version>2.9.1</version>
180-
<executions>
181-
<execution>
182-
<id>attach-javadocs</id>
183-
<goals>
184-
<goal>jar</goal>
185-
</goals>
186-
<configuration>
187-
<failOnError>false</failOnError>
188-
<additionalparam>-Xdoclint:none</additionalparam>
189-
</configuration>
190-
</execution>
191-
</executions>
192-
</plugin>
193-
194204
<plugin>
195205
<groupId>org.apache.maven.plugins</groupId>
196206
<artifactId>maven-source-plugin</artifactId>
@@ -207,7 +217,7 @@
207217
<plugin>
208218
<groupId>org.apache.felix</groupId>
209219
<artifactId>maven-bundle-plugin</artifactId>
210-
<version>2.3.7</version>
220+
<version>4.2.0</version>
211221
<executions>
212222
<execution>
213223
<id>bundle-manifest</id>
@@ -219,44 +229,38 @@
219229
</executions>
220230
</plugin>
221231

222-
<plugin>
223-
<groupId>org.codehaus.mojo</groupId>
224-
<artifactId>cobertura-maven-plugin</artifactId>
225-
<version>2.6</version>
226-
<configuration>
227-
<formats>
228-
<format>xml</format>
229-
</formats>
230-
</configuration>
231-
</plugin>
232-
233-
<plugin>
234-
<groupId>org.eluder.coveralls</groupId>
235-
<artifactId>coveralls-maven-plugin</artifactId>
236-
<version>2.2.0</version>
237-
</plugin>
238-
239-
</plugins>
240-
241-
</build>
242-
243-
<reporting>
244-
245-
<plugins>
246-
247232
<plugin>
248233
<groupId>org.apache.maven.plugins</groupId>
249-
<artifactId>maven-javadoc-plugin</artifactId>
250-
<version>2.9.1</version>
251-
<configuration>
252-
<failOnError>false</failOnError>
253-
<additionalparam>-Xdoclint:none</additionalparam>
254-
</configuration>
234+
<artifactId>maven-enforcer-plugin</artifactId>
235+
<version>1.0</version>
236+
<executions>
237+
<execution>
238+
<id>enforce-bytecode-version</id>
239+
<goals>
240+
<goal>enforce</goal>
241+
</goals>
242+
<configuration>
243+
<rules>
244+
<enforceBytecodeVersion>
245+
<maxJdkVersion>${java.version}</maxJdkVersion>
246+
</enforceBytecodeVersion>
247+
</rules>
248+
<fail>true</fail>
249+
</configuration>
250+
</execution>
251+
</executions>
252+
<dependencies>
253+
<dependency>
254+
<groupId>org.codehaus.mojo</groupId>
255+
<artifactId>extra-enforcer-rules</artifactId>
256+
<version>1.2</version>
257+
</dependency>
258+
</dependencies>
255259
</plugin>
256260

257261
</plugins>
258262

259-
</reporting>
263+
</build>
260264

261265
<profiles>
262266
<profile>

0 commit comments

Comments
 (0)