Merge pull request #355 from DataDog/tyler/upgrades

Upgrade some versions.
This commit is contained in:
Tyler Benson 2018-06-14 20:48:53 +10:00 committed by GitHub
commit dd24412fa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 34 additions and 11 deletions

View File

@ -32,7 +32,7 @@ def includeShadowJar(subproject, jarname) {
mergeServiceFiles() mergeServiceFiles()
dependencies { dependencies {
exclude(dependency('org.projectlombok:lombok:1.16.20')) exclude(dependency("org.projectlombok:lombok:$versions.lombok"))
} }
// Prevents conflict with other SLF4J instances. Important for premain. // Prevents conflict with other SLF4J instances. Important for premain.
@ -87,7 +87,7 @@ shadowJar {
mergeServiceFiles() mergeServiceFiles()
dependencies { dependencies {
exclude(dependency('org.projectlombok:lombok:1.16.20')) exclude(dependency("org.projectlombok:lombok:$versions.lombok"))
} }
} }

View File

@ -4,15 +4,15 @@ buildscript {
} }
dependencies { dependencies {
classpath "io.franzbecker:gradle-lombok:1.13" classpath "io.franzbecker:gradle-lombok:1.13"
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.2" classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.3"
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0" classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1"
classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.0.13" classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.0.14"
classpath 'org.unbroken-dome.gradle-plugins:gradle-testsets-plugin:1.4.5' classpath 'org.unbroken-dome.gradle-plugins:gradle-testsets-plugin:1.5.0'
} }
} }
plugins { plugins {
id 'com.gradle.build-scan' version '1.13' id 'com.gradle.build-scan' version '1.14'
id 'com.github.sherter.google-java-format' version '0.6' id 'com.github.sherter.google-java-format' version '0.6'
} }
@ -53,7 +53,7 @@ buildScan {
} }
} }
ext.gradleWrapperVersion = '4.6' ext.gradleWrapperVersion = '4.7'
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = gradleWrapperVersion gradleVersion = gradleWrapperVersion
} }

View File

@ -10,6 +10,8 @@ import io.opentracing.tag.StringTag
import io.opentracing.tag.Tags import io.opentracing.tag.Tags
import spock.lang.Specification import spock.lang.Specification
import static datadog.opentracing.DDTracer.UNASSIGNED_DEFAULT_SERVICE_NAME
class SpanDecoratorTest extends Specification { class SpanDecoratorTest extends Specification {
def tracer = new DDTracer(new LoggingWriter()) def tracer = new DDTracer(new LoggingWriter())
def span = SpanFactory.newSpanOf(tracer) def span = SpanFactory.newSpanOf(tracer)
@ -52,6 +54,26 @@ class SpanDecoratorTest extends Specification {
"other-service" | "other-service" | ["some-service": "new-service"] "other-service" | "other-service" | ["some-service": "new-service"]
} }
def "set service name from servlet.context with context '#context'"() {
when:
span.setTag(DDTags.SERVICE_NAME, serviceName)
span.setTag("servlet.context", context)
then:
span.getServiceName() == expected
where:
context | serviceName | expected
"/" | UNASSIGNED_DEFAULT_SERVICE_NAME | UNASSIGNED_DEFAULT_SERVICE_NAME
"" | UNASSIGNED_DEFAULT_SERVICE_NAME | UNASSIGNED_DEFAULT_SERVICE_NAME
"/some-context" | UNASSIGNED_DEFAULT_SERVICE_NAME | "some-context"
"other-context" | UNASSIGNED_DEFAULT_SERVICE_NAME | "other-context"
"/" | "my-service" | "my-service"
"" | "my-service" | "my-service"
"/some-context" | "my-service" | "my-service"
"other-context" | "my-service" | "my-service"
}
def "set operation name"() { def "set operation name"() {
when: when:
Tags.COMPONENT.set(span, component) Tags.COMPONENT.set(span, component)

View File

@ -14,7 +14,8 @@ ext {
groovy : groovyVer, groovy : groovyVer,
junit : "4.12", junit : "4.12",
logback : "1.2.3", logback : "1.2.3",
bytebuddy : "1.8.8", lombok : "1.18.0",
bytebuddy : "1.8.12",
] ]
deps = [ deps = [

View File

@ -7,8 +7,8 @@ targetCompatibility = 1.7
apply plugin: "io.franzbecker.gradle-lombok" apply plugin: "io.franzbecker.gradle-lombok"
lombok { // optional: values below are the defaults lombok { // optional: values below are the defaults
version = "1.16.20" version = versions.lombok
sha256 = "c5178b18caaa1a15e17b99ba5e4023d2de2ebc18b58cde0f5a04ca4b31c10e6d" sha256 = ""
} }
apply plugin: "net.ltgt.errorprone" apply plugin: "net.ltgt.errorprone"

Binary file not shown.