Update to released SDK 0.13.1
MODIFY
gradle/dependencies.gradle
gradle/dependencies.gradle
@@ -8,13 +8,8 @@ configurations.all {
ext {
versions = [
- // Check https://oss.jfrog.org/libs-snapshot/io/opentelemetry/ for latest snapshot version.
- // Snapshot versions are often split across versions (based on jfrog's whim and relative age of
- // each module), best to keep these separate until GA
- opentelemetry : '0.13.0-20201217.041745-92',
- opentelemetryOther : '0.13.0-20201217.041752-92',
- opentelemetryAnother: '0.13.0-20201217.041750-92',
- opentelemetryContext: '0.13.0-20201217.041747-92',
+ opentelemetry : '0.13.1',
+ opentelemetryAlpha : "0.13.1-alpha",
slf4j : "1.7.30",
guava : "20.0", // Last version to support Java 7
@@ -40,19 +35,20 @@ ext {
deps = [
// OpenTelemetry
opentelemetryApi : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-api', version: versions.opentelemetry),
- opentelemetryExtAnnotations: dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-extension-annotations', version: versions.opentelemetryAnother),
- opentelemetryContext : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-context', version: versions.opentelemetryContext),
- opentelemetryKotlin : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-extension-kotlin', version: '0.13.0-20201217.041750-92'),
- opentelemetryTraceProps : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-extension-trace-propagators', version: '0.13.0-20201217.041751-92'),
- opentelemetrySdk : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-sdk', version: versions.opentelemetryOther),
- opentelemetryJaeger : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-jaeger', version: '0.13.0-20201217.041747-92'),
- opentelemetryJaegerThrift : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-jaeger-thrift', version: '0.13.0-20201217.041748-92'),
- opentelemetryOtlp : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-otlp', version: '0.13.0-20201217.041749-92'),
- opentelemetryZipkin : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-zipkin', version: '0.13.0-20201217.041750-92'),
- opentelemetryPrometheus : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-prometheus', version: '0.13.0-20201217.041749-92'),
- opentelemetryLogging : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-logging', version: '0.13.0-20201217.041748-92'),
- opentelemetryProto : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-proto', version: versions.opentelemetryOther),
- opentelemetryResources : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-sdk-extension-resources', version: '0.13.0-20201217.041755-92'),
+ opentelemetryExtAnnotations: dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-extension-annotations', version: versions.opentelemetry),
+ opentelemetryContext : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-context', version: versions.opentelemetry),
+ opentelemetryKotlin : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-extension-kotlin', version: versions.opentelemetry),
+ opentelemetryTraceProps : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-extension-trace-propagators', version: versions.opentelemetry),
+ opentelemetrySdk : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-sdk', version: versions.opentelemetry),
+ opentelemetryJaeger : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-jaeger', version: versions.opentelemetry),
+ opentelemetryJaegerThrift : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-jaeger-thrift', version: versions.opentelemetry),
+ opentelemetryOtlp : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-otlp', version: versions.opentelemetry),
+ opentelemetryOtlpMetrics : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-otlp-metrics', version: versions.opentelemetryAlpha),
+ opentelemetryZipkin : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-zipkin', version: versions.opentelemetry),
+ opentelemetryPrometheus : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-prometheus', version: versions.opentelemetry),
+ opentelemetryLogging : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-logging', version: versions.opentelemetry),
+ opentelemetryProto : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-proto', version: versions.opentelemetry),
+ opentelemetryResources : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-sdk-extension-resources', version: versions.opentelemetry),
// General
slf4j : "org.slf4j:slf4j-api:${versions.slf4j}",

MODIFY
gradle/java.gradle
gradle/java.gradle
@@ -120,23 +120,6 @@ dependencies {
testImplementation deps.testLogging
testImplementation group: 'info.solidsoft.spock', name: 'spock-global-unroll', version: '0.5.1'
testImplementation group: 'com.github.stefanbirkner', name: 'system-rules', version: '1.19.0'
-
- constraints {
- // need to pin the opentelemetry-sdk transitive dependency versions explicitly, otherwise the
- // latest snapshots are used, because the opentelemetry-sdk snapshot pom references these
- // transitive dependencies using the generic SNAPSHOT instead of a specific snapshot
- implementation group: 'io.opentelemetry', name: 'opentelemetry-api', version: versions.opentelemetry
- implementation group: 'io.opentelemetry', name: 'opentelemetry-api-trace', version: '0.13.0-20201217.041746-88'
- implementation group: 'io.opentelemetry', name: 'opentelemetry-api-metrics', version: '0.13.0-alpha-20201217.041746-1'
- implementation group: 'io.opentelemetry', name: 'opentelemetry-context', version: versions.opentelemetryContext
- implementation group: 'io.opentelemetry', name: 'opentelemetry-proto', version: versions.opentelemetryOther
- implementation group: 'io.opentelemetry', name: 'opentelemetry-sdk', version: versions.opentelemetryOther
- implementation group: 'io.opentelemetry', name: 'opentelemetry-sdk-baggage', version: versions.opentelemetryOther
- implementation group: 'io.opentelemetry', name: 'opentelemetry-sdk-common', version: '0.13.0-20201217.041753-92'
- implementation group: 'io.opentelemetry', name: 'opentelemetry-sdk-extension-otproto', version: '0.13.0-20201217.041755-92'
- implementation group: 'io.opentelemetry', name: 'opentelemetry-sdk-metrics', version: '0.13.0-alpha-20201217.041756-1'
- implementation group: 'io.opentelemetry', name: 'opentelemetry-sdk-trace', version: '0.13.0-20201217.041757-92'
- }
}
jar {

MODIFY
instrumentation/oshi/javaagent/oshi-javaagent.gradle
instrumentation/oshi/javaagent/oshi-javaagent.gradle
@@ -10,7 +10,6 @@ muzzle {
dependencies {
implementation project(':instrumentation:oshi:library')
- implementation group: 'io.opentelemetry', name: 'opentelemetry-sdk-metrics'
library group: 'com.github.oshi', name: 'oshi-core', version: '5.3.1'
}

MODIFY
instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/otlp/OtlpGrpcSpanExporterAutoConfiguration.java
instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/otlp/OtlpGrpcSpanExporterAutoConfiguration.java
package io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp;
import io.grpc.ManagedChannel;
-import io.opentelemetry.exporter.otlp.OtlpGrpcSpanExporter;
+import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter;
import io.opentelemetry.instrumentation.spring.autoconfigure.TracerAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

MODIFY
instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/otlp/OtlpGrpcSpanExporterProperties.java
instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/otlp/OtlpGrpcSpanExporterProperties.java
package io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp;
-import static io.opentelemetry.exporter.otlp.OtlpGrpcSpanExporter.DEFAULT_DEADLINE_MS;
-import static io.opentelemetry.exporter.otlp.OtlpGrpcSpanExporter.DEFAULT_ENDPOINT;
+import static io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter.DEFAULT_DEADLINE_MS;
+import static io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter.DEFAULT_ENDPOINT;
import java.time.Duration;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
- * Configuration for {@link io.opentelemetry.exporter.otlp.OtlpGrpcSpanExporter}.
+ * Configuration for {@link io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter}.
*
* <p>Get Exporter Service Name
*

MODIFY
instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/OtlpGrpcSpanExporterAutoConfigurationTest.java
instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/OtlpGrpcSpanExporterAutoConfigurationTest.java
@@ -7,7 +7,7 @@ package io.opentelemetry.instrumentation.spring.autoconfigure.exporters;
import static org.assertj.core.api.Assertions.assertThat;
-import io.opentelemetry.exporter.otlp.OtlpGrpcSpanExporter;
+import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter;
import io.opentelemetry.instrumentation.spring.autoconfigure.TracerAutoConfiguration;
import io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpGrpcSpanExporterAutoConfiguration;
import io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpGrpcSpanExporterProperties;

MODIFY
javaagent-exporters/otlp/otlp.gradle
javaagent-exporters/otlp/otlp.gradle
@@ -18,6 +18,10 @@ dependencies {
exclude group: 'io.opentelemetry', module: 'opentelemetry-sdk'
exclude group: 'io.opentelemetry', module: 'opentelemetry-api'
}
+ implementation(deps.opentelemetryOtlpMetrics) {
+ exclude group: 'io.opentelemetry', module: 'opentelemetry-sdk'
+ exclude group: 'io.opentelemetry', module: 'opentelemetry-api'
+ }
implementation group: 'io.grpc', name: 'grpc-netty-shaded', version: '1.33.1'
}

MODIFY
javaagent-exporters/otlp/src/main/java/io/opentelemetry/javaagent/exporters/otlp/OtlpMetricExporterFactory.java
javaagent-exporters/otlp/src/main/java/io/opentelemetry/javaagent/exporters/otlp/OtlpMetricExporterFactory.java
package io.opentelemetry.javaagent.exporters.otlp;
import com.google.auto.service.AutoService;
-import io.opentelemetry.exporter.otlp.OtlpGrpcMetricExporter;
+import io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporter;
import io.opentelemetry.javaagent.spi.exporter.MetricExporterFactory;
import io.opentelemetry.sdk.metrics.export.MetricExporter;
import java.util.Arrays;

MODIFY
javaagent-exporters/otlp/src/main/java/io/opentelemetry/javaagent/exporters/otlp/OtlpSpanExporterFactory.java
javaagent-exporters/otlp/src/main/java/io/opentelemetry/javaagent/exporters/otlp/OtlpSpanExporterFactory.java
package io.opentelemetry.javaagent.exporters.otlp;
import com.google.auto.service.AutoService;
-import io.opentelemetry.exporter.otlp.OtlpGrpcSpanExporter;
+import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter;
import io.opentelemetry.javaagent.spi.exporter.SpanExporterFactory;
import io.opentelemetry.sdk.trace.export.SpanExporter;
import java.util.Arrays;

Update to released SDK 0.13.1 (#1936)