Skip to content

Commit

Permalink
Merge pull request #17 from aws/2.4.0-beta.1
Browse files Browse the repository at this point in the history
Release for v2.4.0-beta.1
  • Loading branch information
chanchiem authored Dec 2, 2019
2 parents c7ca7ef + c36ecd6 commit 623f5f9
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ The Java Agent is implemented using the new [DiSCo library](https://github.com/a
## Versioning
Each version of the agent corresponds to the supported version of the SDK in order to ensure version compatibility between the SDK dependency brought in by the agent consumers and the version of the agent itself. This agent is released under beta as there are a few known issues that are being ironed out. You may track these issues through the issues tab of this repository.

The agent provides auto instrumentation support for customers using version **2.4.0** of the [X-Ray SDK](https://github.com/aws/aws-xray-sdk-java/), with an artifact version number of **2.4.0-beta**.
The agent provides auto instrumentation support for customers using version **2.4.0** of the [X-Ray SDK](https://github.com/aws/aws-xray-sdk-java/), with an artifact version number of **2.4.0-beta.1**.

## Compatibility Chart

Expand Down Expand Up @@ -40,13 +40,13 @@ The first step is to bring in the agent JAR files into your environment. Insert
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-xray-auto-instrumentation-agent-bootstrap</artifactId>
<version>2.4.0-beta</version>
<version>2.4.0-beta.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-xray-auto-instrumentation-agent-runtime</artifactId>
<version>2.4.0-beta</version>
<version>2.4.0-beta.1</version>
</dependency>
</dependencies>
```
Expand Down Expand Up @@ -90,9 +90,9 @@ The agent will be built in your project’s target/xray-agent folder. There will

Prior to running your application, add the following Java arguments, making sure to modify the service name with your service’s name:
```
-javaagent:/path-to-project/target/xray-agent/aws-xray-auto-instrumentation-agent-bootstrap-2.4.0-beta.jar=servicename=TheServiceName
-javaagent:/path-to-project/target/xray-agent/aws-xray-auto-instrumentation-agent-bootstrap-2.4.0-beta.1.jar=servicename=TheServiceName
-cp:/path-to-project/target/xray-agent/aws-xray-auto-instrumentation-agent-runtime-2.4.0-beta.jar
-cp:/path-to-project/target/xray-agent/aws-xray-auto-instrumentation-agent-runtime-2.4.0-beta.1.jar
```
Please make sure to have the following dependencies in your target application before adding the Agent into your environment.
```
Expand Down Expand Up @@ -124,7 +124,7 @@ Build the agent as you would in the *Installing* section but add an additional a
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-xray-auto-instrumentation-agent-installer</artifactId>
<version>2.4.0-beta</version>
<version>2.4.0-beta.1</version>
</dependency>
```
Add the following artifact item into the unpack-xray-agent execution id of the maven-dependency-plugin:
Expand Down
2 changes: 1 addition & 1 deletion aws-xray-auto-instrumentation-agent-bootstrap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-xray-auto-instrumentation-agent-pom</artifactId>
<version>2.4.0-beta</version>
<version>2.4.0-beta.1</version>
</parent>
<artifactId>aws-xray-auto-instrumentation-agent-bootstrap</artifactId>
<name>AWS X-Ray Auto Instrumentation Agent for Java - Bootstrap</name>
Expand Down
2 changes: 1 addition & 1 deletion aws-xray-auto-instrumentation-agent-installer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-xray-auto-instrumentation-agent-pom</artifactId>
<version>2.4.0-beta</version>
<version>2.4.0-beta.1</version>
</parent>
<artifactId>aws-xray-auto-instrumentation-agent-installer</artifactId>
<name>AWS X-Ray Auto Instrumentation Agent for Java - Installer</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ public static void installInLambda(String agentArgs) {
// TODO Dynamic Versioning based on maven properties.
// Should we parse agentArgs directly or assume it's the service name or config?
System.setProperty("software.amazon.disco.agent.jar.bytebuddy.agent.toolsjar", "/opt/java/lib/tools.jar");
final String bootstrapJarPath = "/opt/java/lib/aws-xray-auto-instrumentation-agent-bootstrap-2.4.0.jar";
final String runtimeJarPath = "/opt/java/lib/aws-xray-auto-instrumentation-agent-runtime-2.4.0.jar";
final String bootstrapJarPath = "/opt/java/lib/aws-xray-auto-instrumentation-agent-bootstrap-2.4.0-beta.1.jar";
final String runtimeJarPath = "/opt/java/lib/aws-xray-auto-instrumentation-agent-runtime-2.4.0-beta.1.jar";

install(bootstrapJarPath, runtimeJarPath, agentArgs);
}
Expand Down
2 changes: 1 addition & 1 deletion aws-xray-auto-instrumentation-agent-runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-xray-auto-instrumentation-agent-pom</artifactId>
<version>2.4.0-beta</version>
<version>2.4.0-beta.1</version>
</parent>
<artifactId>aws-xray-auto-instrumentation-agent-runtime</artifactId>
<name>AWS X-Ray Auto Instrumentation Agent for Java - Runtime</name>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</parent>
<artifactId>aws-xray-auto-instrumentation-agent-pom</artifactId>
<name>AWS X-Ray Auto Instrumentation Agent for Java</name>
<version>2.4.0-beta</version>
<version>2.4.0-beta.1</version>
<modules>
<module>aws-xray-auto-instrumentation-agent-bootstrap</module>
<module>aws-xray-auto-instrumentation-agent-runtime</module>
Expand Down

0 comments on commit 623f5f9

Please sign in to comment.