diff --git a/.circleci/config.yml b/.circleci/config.yml index 175b455859..38a1d780d7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -351,3 +351,13 @@ workflows: ignore: /.*/ tags: only: /^v.*/ + nightly_snapshot: + triggers: + - schedule: + cron: "0 0 * * *" + filters: + branches: + only: + - depends-on-otel-java-snapshot + jobs: + - test_8 diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/TracerInstaller.java b/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/TracerInstaller.java index 9e5d19aa16..530770ea1c 100644 --- a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/TracerInstaller.java +++ b/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/TracerInstaller.java @@ -69,7 +69,7 @@ public class TracerInstaller { if (spanExporterFactory != null) { final SpanExporter spanExporter = spanExporterFactory.fromConfig(config); OpenTelemetrySdk.getTracerProvider() - .addSpanProcessor(SimpleSpansProcessor.newBuilder(spanExporter).build()); + .addSpanProcessor(SimpleSpansProcessor.create(spanExporter)); log.info("Installed span exporter: " + spanExporter.getClass().getName()); } else { log.warn("No matching providers in jar " + exporterJar); diff --git a/auto-exporters/logging/src/main/java/io/opentelemetry/auto/exporters/logging/LoggingExporter.java b/auto-exporters/logging/src/main/java/io/opentelemetry/auto/exporters/logging/LoggingExporter.java index 538a47fd12..1d3212df6f 100644 --- a/auto-exporters/logging/src/main/java/io/opentelemetry/auto/exporters/logging/LoggingExporter.java +++ b/auto-exporters/logging/src/main/java/io/opentelemetry/auto/exporters/logging/LoggingExporter.java @@ -57,6 +57,11 @@ public class LoggingExporter implements SpanExporter { return ResultCode.SUCCESS; } + @Override + public ResultCode flush() { + return ResultCode.SUCCESS; + } + @Override public void shutdown() {} } diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 3a1ab9eda5..0a47fa33ce 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -1,9 +1,14 @@ def groovyVer = "2.5.11" def spockGroovyVer = groovyVer.replaceAll(/\.\d+$/, '') +// this is only needed for the working against unreleased otel-java snapshots +configurations.all { + resolutionStrategy.cacheChangingModulesFor 12, 'hours' +} + ext { versions = [ - opentelemetry: '0.3.0', + opentelemetry: '0.4.0', slf4j : "1.7.30", guava : "20.0", // Last version to support Java 7 @@ -21,18 +26,19 @@ ext { deps = [ // OpenTelemetry - opentelemetryApi : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-api', version: versions.opentelemetry), - opentelemetrySdk : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-sdk', version: versions.opentelemetry), - opentelemetrySdkAutoConfig: dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-sdk-contrib-auto-config', version: versions.opentelemetry), - opentelemetryJaeger : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporters-jaeger', version: versions.opentelemetry), - opentelemetryOtlp : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporters-otlp', version: versions.opentelemetry), + opentelemetryApi : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-api', version: versions.opentelemetry), + opentelemetryApiAutoAnnotations: dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-contrib-auto-annotations', version: versions.opentelemetry), + opentelemetrySdk : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-sdk', version: versions.opentelemetry), + opentelemetrySdkAutoConfig : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-sdk-contrib-auto-config', version: versions.opentelemetry), + opentelemetryJaeger : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporters-jaeger', version: versions.opentelemetry), + opentelemetryOtlp : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporters-otlp', version: versions.opentelemetry), // General - slf4j : "org.slf4j:slf4j-api:${versions.slf4j}", - guava : "com.google.guava:guava:$versions.guava", - bytebuddy : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy', version: "${versions.bytebuddy}"), - bytebuddyagent : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy-agent', version: "${versions.bytebuddy}"), - autoservice : [ + slf4j : "org.slf4j:slf4j-api:${versions.slf4j}", + guava : "com.google.guava:guava:$versions.guava", + bytebuddy : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy', version: "${versions.bytebuddy}"), + bytebuddyagent : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy-agent', version: "${versions.bytebuddy}"), + autoservice : [ dependencies.create(group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'), dependencies.create(group: 'com.google.auto', name: 'auto-common', version: '0.8'), // These are the last versions that support guava 20.0. Upgrading has odd interactions with shadow. @@ -41,23 +47,23 @@ ext { // Testing - spock : [ + spock : [ dependencies.create("org.spockframework:spock-core:${versions.spock}", { exclude group: 'org.codehaus.groovy', module: 'groovy-all' }), // Used by Spock for mocking: dependencies.create(group: 'org.objenesis', name: 'objenesis', version: '2.6') // Last version to support Java7 ], - groovy : "org.codehaus.groovy:groovy-all:${versions.groovy}", - testcontainers : "org.testcontainers:testcontainers:1.12.2", - testLogging : [ + groovy : "org.codehaus.groovy:groovy-all:${versions.groovy}", + testcontainers : "org.testcontainers:testcontainers:1.12.2", + testLogging : [ dependencies.create(group: 'ch.qos.logback', name: 'logback-classic', version: versions.logback), dependencies.create(group: 'org.slf4j', name: 'log4j-over-slf4j', version: versions.slf4j), dependencies.create(group: 'org.slf4j', name: 'jcl-over-slf4j', version: versions.slf4j), dependencies.create(group: 'org.slf4j', name: 'jul-to-slf4j', version: versions.slf4j), ], - scala : dependencies.create(group: 'org.scala-lang', name: 'scala-library', version: "${versions.scala}"), - kotlin : dependencies.create(group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: "${versions.kotlin}"), - coroutines : dependencies.create(group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: "${versions.coroutines}"), + scala : dependencies.create(group: 'org.scala-lang', name: 'scala-library', version: "${versions.scala}"), + kotlin : dependencies.create(group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: "${versions.kotlin}"), + coroutines : dependencies.create(group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: "${versions.coroutines}"), ] } diff --git a/gradle/java.gradle b/gradle/java.gradle index b763dcbc5e..a561b8fc79 100644 --- a/gradle/java.gradle +++ b/gradle/java.gradle @@ -128,7 +128,6 @@ tasks.register("packageSources", Jar) { artifacts.archives packageSources repositories { - mavenLocal() jcenter() mavenCentral() maven { @@ -137,6 +136,14 @@ repositories { maven { url "https://repo.typesafe.com/typesafe/releases" } + // this is only needed for the working against unreleased otel-java snapshots + maven { + url "https://oss.jfrog.org/artifactory/oss-snapshot-local" + content { + includeGroup "io.opentelemetry" + } + } + mavenLocal() } dependencies { diff --git a/instrumentation/dropwizard-testing/src/test/groovy/DropwizardTest.groovy b/instrumentation/dropwizard-testing/src/test/groovy/DropwizardTest.groovy index 43dfe73e6a..244a00058c 100644 --- a/instrumentation/dropwizard-testing/src/test/groovy/DropwizardTest.groovy +++ b/instrumentation/dropwizard-testing/src/test/groovy/DropwizardTest.groovy @@ -124,6 +124,8 @@ class DropwizardTest extends HttpServerTest { "$Tags.HTTP_METHOD" method "$Tags.HTTP_STATUS" endpoint.status "span.origin.type" ServletHandler.CachedChain.name + "servlet.context" "" + "servlet.path" "" if (endpoint.errored) { "error.msg" { it == null || it == EXCEPTION.body } "error.type" { it == null || it == Exception.name } diff --git a/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/AbstractInstrumentation.java b/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/AbstractInstrumentation.java index 5cbc1e7f34..37608cf03f 100644 --- a/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/AbstractInstrumentation.java +++ b/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/AbstractInstrumentation.java @@ -30,6 +30,7 @@ public abstract class AbstractInstrumentation extends Instrumenter.Default { return new String[] { packageName + ".context.ContextUtils", packageName + ".context.UnshadedScope", + packageName + ".context.NoopScope", packageName + ".context.propagation.UnshadedContextPropagators", packageName + ".context.propagation.UnshadedHttpTextFormat", packageName + ".context.propagation.UnshadedHttpTextFormat$UnshadedSetter", diff --git a/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/context/ContextUtils.java b/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/context/ContextUtils.java index 794c1c04f0..99342ebc8a 100644 --- a/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/context/ContextUtils.java +++ b/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/context/ContextUtils.java @@ -18,7 +18,6 @@ package io.opentelemetry.auto.instrumentation.opentelemetryapi.context; import io.opentelemetry.auto.bootstrap.ContextStore; import lombok.extern.slf4j.Slf4j; import unshaded.io.grpc.Context; -import unshaded.io.opentelemetry.context.NoopScope; import unshaded.io.opentelemetry.context.Scope; @Slf4j diff --git a/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/context/NoopScope.java b/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/context/NoopScope.java new file mode 100644 index 0000000000..19d5f177af --- /dev/null +++ b/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/context/NoopScope.java @@ -0,0 +1,38 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.opentelemetry.auto.instrumentation.opentelemetryapi.context; + +import unshaded.io.opentelemetry.context.Scope; + +/** A {@link Scope} that does nothing when it is created or closed. */ +public final class NoopScope implements Scope { + /** + * Returns the singleton instance of {@code NoopScope}. + * + * @return the singleton instance of {@code NoopScope}. + * @since 0.1.0 + */ + public static Scope getInstance() { + return INSTANCE; + } + + private static final Scope INSTANCE = new NoopScope(); + + private NoopScope() {} + + @Override + public void close() {} +} diff --git a/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedDoubleCounter.java b/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedDoubleCounter.java index f25f2f647c..c757af8c5a 100644 --- a/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedDoubleCounter.java +++ b/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedDoubleCounter.java @@ -15,7 +15,6 @@ */ package io.opentelemetry.auto.instrumentation.opentelemetryapi.metrics; -import java.util.List; import java.util.Map; import unshaded.io.opentelemetry.metrics.DoubleCounter; @@ -82,12 +81,6 @@ class UnshadedDoubleCounter implements DoubleCounter { return this; } - @Override - public DoubleCounter.Builder setLabelKeys(final List labelKeys) { - shadedBuilder.setLabelKeys(labelKeys); - return this; - } - @Override public DoubleCounter.Builder setConstantLabels(final Map constantLabels) { shadedBuilder.setConstantLabels(constantLabels); diff --git a/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedDoubleMeasure.java b/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedDoubleMeasure.java index c25778e9a6..28cede6721 100644 --- a/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedDoubleMeasure.java +++ b/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedDoubleMeasure.java @@ -15,7 +15,6 @@ */ package io.opentelemetry.auto.instrumentation.opentelemetryapi.metrics; -import java.util.List; import java.util.Map; import unshaded.io.opentelemetry.metrics.DoubleMeasure; @@ -82,12 +81,6 @@ class UnshadedDoubleMeasure implements DoubleMeasure { return this; } - @Override - public DoubleMeasure.Builder setLabelKeys(final List labelKeys) { - shadedBuilder.setLabelKeys(labelKeys); - return this; - } - @Override public DoubleMeasure.Builder setConstantLabels(final Map constantLabels) { shadedBuilder.setConstantLabels(constantLabels); diff --git a/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedDoubleObserver.java b/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedDoubleObserver.java index 18c1718af2..17c4919c60 100644 --- a/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedDoubleObserver.java +++ b/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedDoubleObserver.java @@ -15,7 +15,6 @@ */ package io.opentelemetry.auto.instrumentation.opentelemetryapi.metrics; -import java.util.List; import java.util.Map; import unshaded.io.opentelemetry.metrics.DoubleObserver; @@ -85,12 +84,6 @@ class UnshadedDoubleObserver implements DoubleObserver { return this; } - @Override - public DoubleObserver.Builder setLabelKeys(final List labelKeys) { - shadedBuilder.setLabelKeys(labelKeys); - return this; - } - @Override public DoubleObserver.Builder setConstantLabels(final Map constantLabels) { shadedBuilder.setConstantLabels(constantLabels); diff --git a/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedLongCounter.java b/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedLongCounter.java index c5b3ceba24..9d6819d6e7 100644 --- a/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedLongCounter.java +++ b/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedLongCounter.java @@ -15,7 +15,6 @@ */ package io.opentelemetry.auto.instrumentation.opentelemetryapi.metrics; -import java.util.List; import java.util.Map; import unshaded.io.opentelemetry.metrics.LongCounter; @@ -81,12 +80,6 @@ class UnshadedLongCounter implements LongCounter { return this; } - @Override - public LongCounter.Builder setLabelKeys(final List labelKeys) { - shadedBuilder.setLabelKeys(labelKeys); - return this; - } - @Override public LongCounter.Builder setConstantLabels(final Map constantLabels) { shadedBuilder.setConstantLabels(constantLabels); diff --git a/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedLongMeasure.java b/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedLongMeasure.java index f661343cc1..ea5ccaa5a1 100644 --- a/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedLongMeasure.java +++ b/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedLongMeasure.java @@ -15,7 +15,6 @@ */ package io.opentelemetry.auto.instrumentation.opentelemetryapi.metrics; -import java.util.List; import java.util.Map; import unshaded.io.opentelemetry.metrics.LongMeasure; @@ -81,12 +80,6 @@ class UnshadedLongMeasure implements LongMeasure { return this; } - @Override - public LongMeasure.Builder setLabelKeys(final List labelKeys) { - shadedBuilder.setLabelKeys(labelKeys); - return this; - } - @Override public LongMeasure.Builder setConstantLabels(final Map constantLabels) { shadedBuilder.setConstantLabels(constantLabels); diff --git a/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedLongObserver.java b/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedLongObserver.java index 2153daa71f..2a9f1f2aea 100644 --- a/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedLongObserver.java +++ b/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/metrics/UnshadedLongObserver.java @@ -15,7 +15,6 @@ */ package io.opentelemetry.auto.instrumentation.opentelemetryapi.metrics; -import java.util.List; import java.util.Map; import unshaded.io.opentelemetry.metrics.LongObserver; @@ -84,12 +83,6 @@ class UnshadedLongObserver implements LongObserver { return this; } - @Override - public LongObserver.Builder setLabelKeys(final List labelKeys) { - shadedBuilder.setLabelKeys(labelKeys); - return this; - } - @Override public LongObserver.Builder setConstantLabels(final Map constantLabels) { shadedBuilder.setConstantLabels(constantLabels); diff --git a/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/trace/TracingContextUtils.java b/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/trace/TracingContextUtils.java index 9663abc02c..b0f64788e5 100644 --- a/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/trace/TracingContextUtils.java +++ b/instrumentation/opentelemetry-api-0.3/src/main/java/io/opentelemetry/auto/instrumentation/opentelemetryapi/trace/TracingContextUtils.java @@ -19,10 +19,10 @@ import static io.opentelemetry.auto.instrumentation.opentelemetryapi.trace.Bridg import static io.opentelemetry.auto.instrumentation.opentelemetryapi.trace.Bridging.toUnshaded; import io.opentelemetry.auto.bootstrap.ContextStore; +import io.opentelemetry.auto.instrumentation.opentelemetryapi.context.NoopScope; import io.opentelemetry.auto.instrumentation.opentelemetryapi.context.UnshadedScope; import lombok.extern.slf4j.Slf4j; import unshaded.io.grpc.Context; -import unshaded.io.opentelemetry.context.NoopScope; import unshaded.io.opentelemetry.context.Scope; import unshaded.io.opentelemetry.trace.DefaultSpan; import unshaded.io.opentelemetry.trace.Span; diff --git a/instrumentation/opentelemetry-api-0.3/src/test/groovy/MeterTest.groovy b/instrumentation/opentelemetry-api-0.3/src/test/groovy/MeterTest.groovy index 276b8fa0e0..e7e3d979b4 100644 --- a/instrumentation/opentelemetry-api-0.3/src/test/groovy/MeterTest.groovy +++ b/instrumentation/opentelemetry-api-0.3/src/test/groovy/MeterTest.groovy @@ -38,7 +38,6 @@ class MeterTest extends AgentTestRunner { def instrument = meter."$builderMethod"("test") .setDescription("d") .setUnit("u") - .setLabelKeys(["a", "b"]) // TODO how to validate these? .setConstantLabels(["m": "n", "o": "p"]) .setMonotonic(monotonic) .build() @@ -93,7 +92,6 @@ class MeterTest extends AgentTestRunner { def instrument = meter."$builderMethod"("test") .setDescription("d") .setUnit("u") - .setLabelKeys(["a", "b"]) // TODO what are label keys and how to validate them in metric data? .setConstantLabels(["m": "n", "o": "p"]) .build() if (bind) { @@ -144,7 +142,6 @@ class MeterTest extends AgentTestRunner { def instrument = meter."$builderMethod"("test") .setDescription("d") .setUnit("u") - .setLabelKeys(["a", "b"]) // TODO what are label keys and how to validate them in metric data? .setConstantLabels(["m": "n", "o": "p"]) .setMonotonic(monotonic) .build() @@ -200,13 +197,11 @@ class MeterTest extends AgentTestRunner { def longCounter = meter.longCounterBuilder("test") .setDescription("d") .setUnit("u") - .setLabelKeys(["a", "b"]) // TODO what are label keys and how to validate them in metric data? .setConstantLabels(["m": "n", "o": "p"]) .build() def doubleMeasure = meter.doubleMeasureBuilder("test2") .setDescription("d") .setUnit("u") - .setLabelKeys(["a", "b"]) // TODO what are label keys and how to validate them in metric data? .setConstantLabels(["m": "n", "o": "p"]) .build() diff --git a/instrumentation/spring-webmvc-3.1/src/test/groovy/test/boot/SpringBootBasedTest.groovy b/instrumentation/spring-webmvc-3.1/src/test/groovy/test/boot/SpringBootBasedTest.groovy index 6774ad12e2..389bb58ced 100644 --- a/instrumentation/spring-webmvc-3.1/src/test/groovy/test/boot/SpringBootBasedTest.groovy +++ b/instrumentation/spring-webmvc-3.1/src/test/groovy/test/boot/SpringBootBasedTest.groovy @@ -133,6 +133,7 @@ class SpringBootBasedTest extends HttpServerTest "$Tags.HTTP_STATUS" endpoint.status "span.origin.type" ApplicationFilterChain.name "servlet.path" endpoint.path + "servlet.context" "" if (endpoint.errored) { "error.msg" { it == null || it == EXCEPTION.body } "error.type" { it == null || it == Exception.name } diff --git a/instrumentation/spring-webmvc-3.1/src/test/groovy/test/filter/ServletFilterTest.groovy b/instrumentation/spring-webmvc-3.1/src/test/groovy/test/filter/ServletFilterTest.groovy index 4bb2daad61..2e0c16d13e 100644 --- a/instrumentation/spring-webmvc-3.1/src/test/groovy/test/filter/ServletFilterTest.groovy +++ b/instrumentation/spring-webmvc-3.1/src/test/groovy/test/filter/ServletFilterTest.groovy @@ -127,6 +127,7 @@ class ServletFilterTest extends HttpServerTest { "$Tags.HTTP_STATUS" endpoint.status "span.origin.type" ApplicationFilterChain.name "servlet.path" endpoint.path + "servlet.context" "" if (endpoint.errored) { "error.msg" { it == null || it == EXCEPTION.body } "error.type" { it == null || it == Exception.name }