Skip to content

adding in support for protobuf transport (+4 squashed commits) #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 11, 2019
Merged

adding in support for protobuf transport (+4 squashed commits) #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
670fe47
adding in support for protobuf transport (+4 squashed commits)
darinhoward Aug 21, 2019
c5dc3ff
cleaning up readme.
darinhoward Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 18 additions & 48 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,14 @@
# stackify-api-java

[![Maven Central](https://img.shields.io/maven-central/v/com.stackify/stackify-api-java.svg)](http://mvnrepository.com/artifact/com.stackify/stackify-api-java)
[![Build Status](https://travis-ci.org/stackify/stackify-api-java.png)](https://travis-ci.org/stackify/stackify-api-java)
[![Coverage Status](https://coveralls.io/repos/stackify/stackify-api-java/badge.png?branch=master)](https://coveralls.io/r/stackify/stackify-api-java?branch=master)

Stackify API for Java

Errors and Logs Overview:

http://support.stackify.com/errors-and-logs-overview/

Sign Up for a Trial:

http://www.stackify.com/sign-up/
## Stackify API for Java

Log4j 1.2 Appender:

https://github.com/stackify/stackify-log-log4j12

Logback Appender:

https://github.com/stackify/stackify-log-logback
* **Errors and Logs Overview:** http://support.stackify.com/errors-and-logs-overview/
* **Sign Up for a Trial:** http://www.stackify.com/sign-up/
* **Appenders**
* **Log4j 1.2:** https://github.com/stackify/stackify-log-log4j12
* **Log4j 2.x:** https://github.com/stackify/stackify-log-log4j2
* **Logback:** https://github.com/stackify/stackify-log-logback

## Installation

Expand All @@ -29,7 +17,7 @@ Add it as a maven dependency:
<dependency>
<groupId>com.stackify</groupId>
<artifactId>stackify-api-java</artifactId>
<version>INSERT_LATEST_MAVEN_CENTRAL_VERSION</version>
<version>4.0.0</version>
</dependency>
```

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

### RUM Manual Instrumentation

Real User Monitoring (RUM) manual instrumentation allows you to specify where the RUM JavaScript block is injected.

It is recommended you provide a `stackify-api.properties` file in your application classpath with the following content:

````
stackify.application=My Application Name
stackify.environment=My Environment Name
````

Your application code will need to call out to the Stackify `com.stackify.apm.Stackify.getRUMJavaScriptBlock()` method in the `<head>` section as detailed below:

**JSP Example**

````
<html>
<head>
<%= com.stackify.apm.Stackify.getRUMJavaScriptBlock() %>
<script and link tags>
</head>
<body>
...
</body>
</html>
````

## Legacy Support

For legacy support of **Java 1.6 and 1.7** use the following maven dependency:
```
<dependency>
<groupId>com.stackify</groupId>
<artifactId>stackify-api-java</artifactId>
<version>3.1.2</version>
</dependency>
```

## License

Copyright 2013 Stackify, LLC.
Copyright 2019 Stackify, LLC.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
162 changes: 83 additions & 79 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
<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">
<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">
<modelVersion>4.0.0</modelVersion>

<groupId>com.stackify</groupId>
<artifactId>stackify-api-java</artifactId>
<version>3.1.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>

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

<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>9</version>
</parent>

<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
Expand Down Expand Up @@ -45,7 +40,18 @@
</developers>

<properties>
<java.version>1.6</java.version>
<java.version>1.8</java.version>
<slf4j-api.version>1.7.28</slf4j-api.version>
<jackson.version>2.7.9</jackson.version>
<jackson-databind.version>2.7.9.6</jackson-databind.version>
<httpclient.version>4.5.9</httpclient.version>
<junixsocket.version>2.2.0</junixsocket.version>
<failsafe.version>2.3.0</failsafe.version>
<protobuf.version>3.9.1</protobuf.version>
<lombok.version>1.18.8</lombok.version>
<junit.version>4.11</junit.version>
<mockito.version>1.9.5</mockito.version>
<powermock.version>1.5.6</powermock.version>
</properties>

<dependencies>
Expand All @@ -55,33 +61,63 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<version>${slf4j-api.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.8.11</version>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.8.11</version>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.8.11.3</version>
<version>${jackson-databind.version}</version>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
</dependency>

<dependency>
<groupId>com.kohlschutter.junixsocket</groupId>
<artifactId>junixsocket-common</artifactId>
<version>${junixsocket.version}</version>
</dependency>

<dependency>
<groupId>com.kohlschutter.junixsocket</groupId>
<artifactId>junixsocket-native-common</artifactId>
<version>${junixsocket.version}</version>
</dependency>

<dependency>
<groupId>net.jodah</groupId>
<artifactId>failsafe</artifactId>
<version>${failsafe.version}</version>
</dependency>

<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>

<!-- Provided dependencies -->

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.10</version>
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -92,42 +128,42 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.5</version>
<version>${slf4j-api.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.9.5</version>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-core</artifactId>
<version>1.5.6</version>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>1.5.6</version>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>1.5.6</version>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>

Expand All @@ -142,14 +178,6 @@
</resource>
</resources>

<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
<version>2.2</version>
</extension>
</extensions>

<plugins>

<plugin>
Expand All @@ -173,24 +201,6 @@
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<failOnError>false</failOnError>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand All @@ -207,7 +217,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.7</version>
<version>4.2.0</version>
<executions>
<execution>
<id>bundle-manifest</id>
Expand All @@ -219,44 +229,38 @@
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.6</version>
<configuration>
<formats>
<format>xml</format>
</formats>
</configuration>
</plugin>

<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>2.2.0</version>
</plugin>

</plugins>

</build>

<reporting>

<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<failOnError>false</failOnError>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.0</version>
<executions>
<execution>
<id>enforce-bytecode-version</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<enforceBytecodeVersion>
<maxJdkVersion>${java.version}</maxJdkVersion>
</enforceBytecodeVersion>
</rules>
<fail>true</fail>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.2</version>
</dependency>
</dependencies>
</plugin>

</plugins>

</reporting>
</build>

<profiles>
<profile>
Expand Down
Loading