diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle index e0f3964902..c13b056133 100644 --- a/examples/distro/build.gradle +++ b/examples/distro/build.gradle @@ -8,12 +8,13 @@ subprojects { ext { versions = [ - opentelemetry : "0.14.1", - opentelemetryJavaagent : "0.15.0-SNAPSHOT", - bytebuddy : "1.10.10", + opentelemetry : "0.16.0", + opentelemetryJavaagent : "0.16.0-SNAPSHOT", + bytebuddy : "1.10.18", guava : "30.1-jre" ] + versions.opentelemetryAlpha = "${versions.opentelemetry}-alpha" deps = [ 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), diff --git a/examples/distro/custom/build.gradle b/examples/distro/custom/build.gradle index 4fdeed7318..e0c97c77d3 100644 --- a/examples/distro/custom/build.gradle +++ b/examples/distro/custom/build.gradle @@ -5,7 +5,7 @@ plugins { dependencies { compileOnly("io.opentelemetry:opentelemetry-sdk:${versions.opentelemetry}") - compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:${versions.opentelemetry}") + compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:${versions.opentelemetryAlpha}") compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-spi:${versions.opentelemetryJavaagent}") } diff --git a/examples/distro/custom/src/main/java/com/example/javaagent/DemoPropertySource.java b/examples/distro/custom/src/main/java/com/example/javaagent/DemoPropertySource.java index 8124a83416..3bbe53e0c3 100644 --- a/examples/distro/custom/src/main/java/com/example/javaagent/DemoPropertySource.java +++ b/examples/distro/custom/src/main/java/com/example/javaagent/DemoPropertySource.java @@ -14,7 +14,7 @@ public class DemoPropertySource implements PropertySource { @Override public Map getProperties() { return Map.of( - "otel.exporter.otlp.endpoint", "collector:55680", + "otel.exporter.otlp.endpoint", "http://collector:55680", "otel.exporter.otlp.insecure", "true", "otel.config.max.attrs", "16" ); diff --git a/examples/distro/custom/src/main/java/com/example/javaagent/DemoSampler.java b/examples/distro/custom/src/main/java/com/example/javaagent/DemoSampler.java index 4b1694836a..67bcade15e 100644 --- a/examples/distro/custom/src/main/java/com/example/javaagent/DemoSampler.java +++ b/examples/distro/custom/src/main/java/com/example/javaagent/DemoSampler.java @@ -1,10 +1,11 @@ package com.example.javaagent; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.trace.Span; +import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.context.Context; import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.samplers.Sampler; +import io.opentelemetry.sdk.trace.samplers.SamplingDecision; import io.opentelemetry.sdk.trace.samplers.SamplingResult; import java.util.List; @@ -21,9 +22,9 @@ public class DemoSampler implements Sampler { public SamplingResult shouldSample(Context parentContext, String traceId, String name, SpanKind spanKind, Attributes attributes, List parentLinks) { if (spanKind == SpanKind.INTERNAL && name.contains("greeting")) { - return SamplingResult.create(SamplingResult.Decision.DROP); + return SamplingResult.create(SamplingDecision.DROP); } else { - return SamplingResult.create(SamplingResult.Decision.RECORD_AND_SAMPLE); + return SamplingResult.create(SamplingDecision.RECORD_AND_SAMPLE); } } diff --git a/examples/distro/custom/src/main/java/com/example/javaagent/DemoSdkTracerProviderConfigurer.java b/examples/distro/custom/src/main/java/com/example/javaagent/DemoSdkTracerProviderConfigurer.java index 4b9bec4001..210984adab 100644 --- a/examples/distro/custom/src/main/java/com/example/javaagent/DemoSdkTracerProviderConfigurer.java +++ b/examples/distro/custom/src/main/java/com/example/javaagent/DemoSdkTracerProviderConfigurer.java @@ -2,7 +2,7 @@ package com.example.javaagent; import io.opentelemetry.sdk.autoconfigure.spi.SdkTracerProviderConfigurer; import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder; -import io.opentelemetry.sdk.trace.config.TraceConfig; +import io.opentelemetry.sdk.trace.SpanLimits; import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor; /** @@ -20,10 +20,8 @@ public class DemoSdkTracerProviderConfigurer implements SdkTracerProviderConfigu public void configure(SdkTracerProviderBuilder tracerProvider) { tracerProvider .setIdGenerator(new DemoIdGenerator()) - .setTraceConfig(TraceConfig.builder() - .setSampler(new DemoSampler()) - .setMaxLengthOfAttributeValues(128) - .build()) + .setSpanLimits(SpanLimits.builder().setMaxLengthOfAttributeValues(128).build()) + .setSampler(new DemoSampler()) .addSpanProcessor(new DemoSpanProcessor()) .addSpanProcessor(SimpleSpanProcessor.create(new DemoSpanExporter())); } diff --git a/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java b/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java index 190288b0bb..f0005a86f5 100644 --- a/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java +++ b/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java @@ -15,7 +15,7 @@ class SpringBootSmokeTest extends SmokeTest { protected String getTargetImage(int jdk) { return "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk" + jdk - + "-20201204.400701583"; + + "-20210209.550405798"; } @Test @@ -43,9 +43,9 @@ class SpringBootSmokeTest extends SmokeTest { Assertions.assertEquals(0, countSpansByName(traces, "WebController.greeting")); Assertions.assertEquals(1, countSpansByName(traces, "WebController.withSpan")); Assertions.assertEquals(2, countSpansByAttributeValue(traces, "custom", "demo")); - Assertions.assertEquals(1, + Assertions.assertNotEquals(0, countResourcesByValue(traces, "telemetry.auto.version", currentAgentVersion)); - Assertions.assertEquals(1, countResourcesByValue(traces, "custom.resource", "demo")); + Assertions.assertNotEquals(0, countResourcesByValue(traces, "custom.resource", "demo")); stopTarget(); }