Skip to content
Closed
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
version: 2
jobs:
build:
working_directory: ~/dd-trace-java
docker:
- image: circleci/openjdk:8-jdk

steps:
- checkout

- restore_cache:
key: dd-trace-java-{{ checksum "build.gradle" }}-{{ checksum "dd-java-agent/build.gradle" }}-{{ checksum "dd-trace/build.gradle" }}

- run:
name: Run Tests
command: ./gradlew clean shadowJar check

- save_cache:
paths:
- ~/.gradle
key: dd-trace-java-{{ checksum "build.gradle" }}-{{ checksum "dd-java-agent/build.gradle" }}-{{ checksum "dd-trace/build.gradle" }}

- store_test_results:
path: dd-java-agent/build/test-results
- store_test_results:
path: dd-java-agent-ittests/build/test-results
- store_test_results:
path: dd-trace/build/test-results

- store_artifacts:
path: dd-java-agent/build/reports
- store_artifacts:
path: dd-java-agent-ittests/build/reports
- store_artifacts:
path: dd-trace/build/reports

- store_artifacts:
path: dd-java-agent/build/libs
- store_artifacts:
path: dd-trace/build/libs
34 changes: 0 additions & 34 deletions .cirleci/config.yml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ target

# Gradle #
#########
!/gradle/wrapper/*
/.gradle
*/build/
dd-trace-examples/**/build/
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ subprojects {

task packageSources(type: Jar) {
classifier = 'sources'
from sourceSets.main.allSource\
from sourceSets.main.allSource
}
artifacts.archives packageSources
repositories {
Expand Down
19 changes: 0 additions & 19 deletions circle.yml

This file was deleted.

3 changes: 2 additions & 1 deletion dd-java-agent-ittests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ dependencies {
}

test {
jvmArgs "-Ddd.trace.configurationFile=${project.buildDir}/resources/test/dd-trace.yaml"
jvmArgs "-javaagent:${project(':dd-java-agent').buildDir}/libs/dd-java-agent-${project.version}-shadow.jar"
jvmArgs "-Dorg.jboss.byteman.verbose=true"
}

test.dependsOn project(':dd-java-agent').shadowJar
test.dependsOn project(':dd-java-agent').shadowJar
248 changes: 0 additions & 248 deletions dd-java-agent-ittests/pom.xml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.datadoghq.trace.agent.integration;

import java.lang.reflect.Field;
import org.junit.Before;

import com.datadoghq.trace.DDTracer;
Expand All @@ -14,10 +15,14 @@ public class AAgentIntegration {

@Before
public void beforeTest() throws Exception {

try{
GlobalTracer.register(tracer);
}catch(Exception e){
//DO NOTHING IF ALREADY REGISTERED
// Force it using reflexion, I'm proud of this solution
final Field field = GlobalTracer.class.getDeclaredField("tracer");
field.setAccessible(true);
field.set(null, tracer);
}
writer.start();
}
Expand Down
Loading