Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
30 changes: 15 additions & 15 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
version: 2

defaults: &defaults
working_directory: ~/dd-trace-java
working_directory: ~/sts-trace-java
resource_class: large
docker:
- image: circleci/openjdk:8

cache_keys: &cache_keys
# Reset the cache approx every release
keys:
- dd-trace-java-{{ checksum "dd-trace-java.gradle" }}-{{ .Branch }}-{{ .Revision }}
- dd-trace-java-{{ checksum "dd-trace-java.gradle" }}-{{ .Branch }}
- dd-trace-java-{{ checksum "dd-trace-java.gradle" }}
- dd-trace-java
- sts-trace-java-{{ checksum "sts-trace-java.gradle" }}-{{ .Branch }}-{{ .Revision }}
- sts-trace-java-{{ checksum "sts-trace-java.gradle" }}-{{ .Branch }}
- sts-trace-java-{{ checksum "sts-trace-java.gradle" }}
- sts-trace-java

test_job: &test_job
steps:
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx2G -Xms512M" ./gradlew clean check -x test --parallel --stacktrace --no-daemon --max-workers=6

- save_cache:
key: dd-trace-java-{{ checksum "dd-trace-java.gradle" }}-{{ .Branch }}-{{ .Revision }}
key: sts-trace-java-{{ checksum "sts-trace-java.gradle" }}-{{ .Branch }}-{{ .Revision }}
paths: ~/.gradle
background: true

Expand Down Expand Up @@ -99,10 +99,10 @@ jobs:
- restore_cache:
# Reset the cache approx every release
keys:
- dd-trace-java-{{ checksum "dd-trace-java.gradle" }}-{{ .Branch }}-{{ .Revision }}
- dd-trace-java-{{ checksum "dd-trace-java.gradle" }}-{{ .Branch }}
- dd-trace-java-{{ checksum "dd-trace-java.gradle" }}
- dd-trace-java
- sts-trace-java-{{ checksum "sts-trace-java.gradle" }}-{{ .Branch }}-{{ .Revision }}
- sts-trace-java-{{ checksum "sts-trace-java.gradle" }}-{{ .Branch }}
- sts-trace-java-{{ checksum "sts-trace-java.gradle" }}
- sts-trace-java

- run:
name: Run Trace Agent Tests
Expand All @@ -124,8 +124,8 @@ jobs:
- restore_cache:
# Reset the cache approx every release
keys:
- dd-trace-java-version-scan-{{ checksum "dd-trace-java.gradle" }}
- dd-trace-java-version-scan
- sts-trace-java-version-scan-{{ checksum "sts-trace-java.gradle" }}
- sts-trace-java-version-scan

- run:
name: Verify Version Scan
Expand All @@ -143,7 +143,7 @@ jobs:
path: build

- save_cache:
key: dd-trace-java-version-scan-{{ checksum "dd-trace-java.gradle" }}
key: sts-trace-java-version-scan-{{ checksum "sts-trace-java.gradle" }}
paths: ~/.gradle

publish: &publish
Expand All @@ -156,14 +156,14 @@ jobs:

- run:
name: Decode Signing Key
command: echo $PGP_KEY_FILE | base64 --decode > /home/circleci/dd-trace-java/.circleci/secring.gpg
command: echo $PGP_KEY_FILE | base64 --decode > /home/circleci/sts-trace-java/.circleci/secring.gpg

- deploy:
name: Publish master to Artifactory
command: |
./gradlew -Psigning.keyId=${PGP_KEY_ID} \
-Psigning.password=${PGP_KEY_PASS} \
-Psigning.secretKeyRingFile=/home/circleci/dd-trace-java/.circleci/secring.gpg \
-Psigning.secretKeyRingFile=/home/circleci/sts-trace-java/.circleci/secring.gpg \
-PbintrayUser=${BINTRAY_USER} \
-PbintrayApiKey=${BINTRAY_API_KEY} \
-PbuildInfo.build.number=${CIRCLE_BUILD_NUM} \
Expand Down
20 changes: 10 additions & 10 deletions .circleci/save_artifacts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ function save_libs () {
fi
}

save_reports dd-java-agent
save_reports dd-java-agent/tooling
save_reports dd-java-agent/testing
save_reports sts-java-agent
save_reports sts-java-agent/tooling
save_reports sts-java-agent/testing
# Save reports for all instrumentation projects
for integration_path in dd-java-agent/instrumentation/*; do
for integration_path in sts-java-agent/instrumentation/*; do
save_reports $integration_path
done
save_reports dd-java-agent-ittests
save_reports dd-trace-api
save_reports dd-trace-ot
save_reports sts-java-agent-ittests
save_reports sts-trace-api
save_reports sts-trace-ot

save_libs dd-java-agent
save_libs dd-trace-api
save_libs dd-trace-ot
save_libs sts-java-agent
save_libs sts-trace-api
save_libs sts-trace-ot
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ out/
/bin
/out
*/out
dd-java-agent/instrumentation/*/out
dd-java-agent/benchmark-integration/perf-test-settings.rc
sts-java-agent/instrumentation/*/out
sts-java-agent/benchmark-integration/perf-test-settings.rc
examples/*/out
derby.log

!dd-java-agent/benchmark/releases/*.jar
!sts-java-agent/benchmark/releases/*.jar
1 change: 1 addition & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2018 StackState
Copyright 2017 Datadog, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
5 changes: 3 additions & 2 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Datadog dd-trace-java
StackState sts-trace-java
Copyright 2018 StackState
Copyright 2017 Datadog, Inc.

This product includes software developed at Datadog (https://www.datadoghq.com/).
This product includes software developed at StackState (https://www.stackstate.com/).
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
# StackState Java APM

To use and configure StackState Java APM, see [https://docs.stackstate.com/tracing/languages/java](https://docs.stackstate.com/tracing/languages/java)

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion dd-java-agent/README.md

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion dd-trace-ot/README.md

This file was deleted.

15 changes: 0 additions & 15 deletions dd-trace-ot/src/jmh/reports/2017-07-18.using-array-copy.txt

This file was deleted.

15 changes: 0 additions & 15 deletions dd-trace-ot/src/jmh/reports/2017-07-18.using-linked-queue.txt

This file was deleted.

10 changes: 5 additions & 5 deletions examples/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Datadog Java Tracer examples
## StackState Java Tracer examples

The goal of this repository is to offer you some examples about how to instrument your code
using the OpenTracing API and the DD Tracer.
using the OpenTracing API and the STS Tracer.

![](https://datadog-live.imgix.net/img/datadog_logo_share_tt.png)

Expand All @@ -15,7 +15,7 @@ Here are the examples

In order to run the demos, you have to do something before:

* Get the latest lib of the DD-Tracer and push it to the lib directory
* Make sure you have a running Datadog Agent on the local port 8126 (default one)
* In the Datadog agent configuration, set APM to true (and restart it)
* Get the latest lib of the STS-Tracer and push it to the lib directory
* Make sure you have a running StackState Agent on the local port 8126 (default one)
* In the StackState agent configuration, set APM to true (and restart it)
* Maven
16 changes: 8 additions & 8 deletions examples/dropwizard-mongo-client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,30 @@ auto-instrumentation for all endpoints. Manual instrumentation has been added as

#### Prerequisites

Be sure to build the project so that the latest version of ``dd-trace-java`` components are used. You can build
all libraries and examples launching from the ``dd-trace-java`` root folder:
Be sure to build the project so that the latest version of ``sts-trace-java`` components are used. You can build
all libraries and examples launching from the ``sts-trace-java`` root folder:
```bash
./gradlew clean shadowJar installDist
```

Then you can start all services via Docker:
```bash
cd examples/dropwizard-mongo-client
DD_API_KEY=<your_datadog_api_key> docker-compose up -d
STS_API_KEY=<your_stackstate_api_key> docker-compose up -d
```

A valid ``DD_API_KEY`` is required to post collected traces to the Datadog backend.
A valid ``STS_API_KEY`` is required to post collected traces to the StackState backend.

#### Run the application

Launch the application using the run wrapper you've built during the ``installDist`` step:
```bash
JAVA_OPTS="-javaagent:../../dd-java-agent/build/libs/dd-java-agent-{version}.jar -Ddd.service.name=dropwizard-example" build/install/dropwizard-mongo-client/bin/dropwizard-mongo-client server
JAVA_OPTS="-javaagent:../../sts-java-agent/build/libs/sts-java-agent-{version}.jar -Dsts.service.name=dropwizard-example" build/install/dropwizard-mongo-client/bin/dropwizard-mongo-client server
```

Or as an executable jar:
```bash
java -javaagent:../../dd-java-agent/build/libs/dd-java-agent-{version}.jar -Ddd.service.name=dropwizard-example -jar build/libs/dropwizard-mongo-client-demo-all.jar server
java -javaagent:../../sts-java-agent/build/libs/sts-java-agent-{version}.jar -Dsts.service.name=dropwizard-example -jar build/libs/dropwizard-mongo-client-demo-all.jar server
```

``0.2.0-SNAPSHOT`` is an example of what ``{version}`` looks like.
Expand All @@ -49,7 +49,7 @@ Once the application runs. Go to the following url:
[1]: http://localhost:8080/demo/add?title=some-book-title&isbn=1234&page=42
[2]: http://localhost:8080/demo/

Then get back to Datadog and wait a bit to see a trace coming.
Then get back to StackState and wait a bit to see a trace coming.

#### Cross process tracing: with the provided `TracedClient` class

Expand All @@ -59,7 +59,7 @@ the tracing cross process.

To run the distributed example, first start the dropwizard app, the mongo db and finally run the `main` from `com.example.helloworld.client.TracedClient`

#### Auto-instrumentation with the `dd-trace-agent`
#### Auto-instrumentation with the `sts-trace-agent`

The instrumentation is entirely done by the Java Agent which embed a set of rules that automatically recognizes &
instruments:
Expand Down
4 changes: 2 additions & 2 deletions examples/dropwizard-mongo-client/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ mongo:
ddagent:
image: datadog/docker-dd-agent
environment:
- DD_BIND_HOST=0.0.0.0
- DD_API_KEY
- STS_BIND_HOST=0.0.0.0
- STS_API_KEY
ports:
- "127.0.0.1:8126:8126"
10 changes: 5 additions & 5 deletions examples/dropwizard-mongo-client/dropwizard-mongo-client.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ apply from: "${rootDir}/gradle/jacoco.gradle"

version = 'demo'
description = 'dropwizard-mongo-client'
mainClassName = 'datadog.example.dropwizard.BookApplication'
applicationDefaultJvmArgs = ["-Ddd.service.name=dropwizard-example"]
mainClassName = 'stackstate.example.dropwizard.BookApplication'
applicationDefaultJvmArgs = ["-Dsts.service.name=dropwizard-example"]


sourceCompatibility = 1.8
targetCompatibility = 1.8

dependencies {
compile project(':dd-trace-ot')
compile project(':dd-trace-api')
compile project(':sts-trace-ot')
compile project(':sts-trace-api')

compile deps.opentracing

Expand All @@ -28,7 +28,7 @@ dependencies {

jar {
manifest {
attributes 'Main-Class': 'datadog.example.dropwizard.BookApplication'
attributes 'Main-Class': 'stackstate.example.dropwizard.BookApplication'
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package datadog.example.dropwizard;
package stackstate.example.dropwizard;

import datadog.example.dropwizard.resources.SimpleCrudResource;
import io.dropwizard.Application;
import io.dropwizard.Configuration;
import io.dropwizard.setup.Bootstrap;
import io.dropwizard.setup.Environment;
import stackstate.example.dropwizard.resources.SimpleCrudResource;

public class BookApplication extends Application<Configuration> {
public static void main(final String[] args) throws Exception {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package datadog.example.dropwizard.api;
package stackstate.example.dropwizard.api;

import com.fasterxml.jackson.annotation.JsonProperty;
import org.bson.Document;
Expand Down
Loading