diff --git a/api/all/docs/api_diff_1.1.0_vs_1.0.0.txt b/api/all/docs/api_diff_1.1.0_vs_1.0.0.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/api/all/docs/api_diff_1.1.0_vs_1.0.0.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/api/all/docs/api_diff_current_vs_latest.txt b/api/all/docs/api_diff_current_vs_latest.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/api/all/docs/api_diff_current_vs_latest.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index f7d6d7f0c4f..561b04f2028 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,6 +3,7 @@ import com.google.protobuf.gradle.* import de.marcphilipp.gradle.nexus.NexusPublishExtension import io.morethan.jmhreport.gradle.JmhReportExtension import me.champeau.gradle.JMHPluginExtension +import me.champeau.gradle.japicmp.JapicmpTask import nebula.plugin.release.git.opinion.Strategies import net.ltgt.gradle.errorprone.ErrorProneOptions import net.ltgt.gradle.errorprone.ErrorPronePlugin @@ -24,6 +25,7 @@ plugins { id("me.champeau.gradle.jmh") apply false id("net.ltgt.errorprone") apply false id("ru.vyarus.animalsniffer") apply false + id("me.champeau.gradle.japicmp") apply false } if (!JavaVersion.current().isJava11Compatible()) { @@ -422,9 +424,83 @@ subprojects { } } + plugins.withId("me.champeau.gradle.japicmp") { + afterEvaluate { + val temp: Configuration = project.configurations.create("tempConfig") + project.dependencies.add("tempConfig", "io.opentelemetry:opentelemetry-bom:latest.release") + val moduleVersion = project.configurations["tempConfig"].resolvedConfiguration.firstLevelModuleDependencies.elementAt(0).moduleVersion + project.configurations.remove(temp) + + val userRequestedBase = project.properties["apiBaseVersion"] + val baselineVersion = userRequestedBase ?: moduleVersion + val newVersion : String? = project.properties["apiNewVersion"] as String? + val baselineArtifact: File? + var newArtifact: File? = null + val oldGroup = project.group + try { + //this dance is needed due to gradle not allowing more than one version of a dependency. + project.group = "virtual_baseline_for_japicmp" + val depModule = "io.opentelemetry:${base.archivesBaseName}:$baselineVersion@jar" + val depJar = "${base.archivesBaseName}-${baselineVersion}.jar" + val configuration: Configuration = configurations.detachedConfiguration( + dependencies.create(depModule) + ) + baselineArtifact = files(configuration.files).filter { + it.name.equals(depJar) + }.singleFile + } finally { + project.group = oldGroup + } + if (newVersion != null) { + try { + project.group = "virtual_new_for_japicmp" + val depModule = "io.opentelemetry:${base.archivesBaseName}:$newVersion@jar" + val depJar = "${base.archivesBaseName}-${newVersion}.jar" + val configuration: Configuration = configurations.detachedConfiguration( + dependencies.create(depModule) + ) + newArtifact = files(configuration.files).filter { + it.name.equals(depJar) + }.singleFile + } finally { + project.group = oldGroup + } + } + + tasks { + val jar = getByName("jar") as Jar + if (newArtifact == null) { + newArtifact = file(jar.archiveFile) + } + create("japicmp") { + oldClasspath = files(baselineArtifact) + newClasspath = files(newArtifact) + htmlOutputFile = file("$buildDir/reports/japi.html") + //only output changes, not everything + isOnlyModified = true + //this is needed so that we only consider the current artifact, and not dependencies + isIgnoreMissingClasses = true + // double wildcards don't seem to work here (*.internal.*) + packageExcludes = listOf("*.internal", "io.opentelemetry.internal.shaded.jctools.*") + if (newVersion == null) { + val baseVersionString = if (userRequestedBase == null) "latest" else baselineVersion + txtOutputFile = file("$projectDir/docs/api_diff_current_vs_${baseVersionString}.txt") + } else { + txtOutputFile = file("$projectDir/docs/api_diff_${newVersion}_vs_${baselineVersion}.txt") + } + + } + } + } + } + plugins.withId("maven-publish") { + //generate the api diff report for any module that is stable and publishes a jar. + if (!project.hasProperty("otel.release") + && project.tasks.map { it.name }.contains("jar")) { + plugins.apply("me.champeau.gradle.japicmp") + } plugins.apply("signing") - plugins.apply("de.marcphilipp.nexus-publish") configure { diff --git a/context/docs/api_diff_1.1.0_vs_1.0.0.txt b/context/docs/api_diff_1.1.0_vs_1.0.0.txt new file mode 100644 index 00000000000..9ddf5535a03 --- /dev/null +++ b/context/docs/api_diff_1.1.0_vs_1.0.0.txt @@ -0,0 +1,5 @@ +Comparing source compatibility of against +***! MODIFIED INTERFACE: PUBLIC ABSTRACT io.opentelemetry.context.Context (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + +++! NEW METHOD: PUBLIC(+) STATIC(+) java.util.concurrent.Executor taskWrapping(java.util.concurrent.Executor) + +++! NEW METHOD: PUBLIC(+) STATIC(+) java.util.concurrent.ExecutorService taskWrapping(java.util.concurrent.ExecutorService) diff --git a/context/docs/api_diff_current_vs_latest.txt b/context/docs/api_diff_current_vs_latest.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/context/docs/api_diff_current_vs_latest.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/context/src/main/java/io/opentelemetry/context/Context.java b/context/src/main/java/io/opentelemetry/context/Context.java index 6f3d9a82e57..ffbd52cdfe2 100644 --- a/context/src/main/java/io/opentelemetry/context/Context.java +++ b/context/src/main/java/io/opentelemetry/context/Context.java @@ -108,6 +108,8 @@ static Context root() { * during an invocation to another thread. For example, you may use something like {@code Executor * dbExecutor = Context.wrapTasks(threadPool)} to ensure calls like {@code dbExecutor.execute(() * -> database.query())} have {@link Context} available on the thread executing database queries. + * + * @since 1.1.0 */ static Executor taskWrapping(Executor executor) { return command -> executor.execute(Context.current().wrap(command)); @@ -124,6 +126,8 @@ static Executor taskWrapping(Executor executor) { * ExecutorService dbExecutor = Context.wrapTasks(threadPool)} to ensure calls like {@code * dbExecutor.execute(() -> database.query())} have {@link Context} available on the thread * executing database queries. + * + * @since 1.1.0 */ static ExecutorService taskWrapping(ExecutorService executorService) { return new CurrentContextExecutorService(executorService); diff --git a/exporters/jaeger-thrift/docs/api_diff_1.1.0_vs_1.0.0.txt b/exporters/jaeger-thrift/docs/api_diff_1.1.0_vs_1.0.0.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/exporters/jaeger-thrift/docs/api_diff_1.1.0_vs_1.0.0.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/exporters/jaeger-thrift/docs/api_diff_current_vs_latest.txt b/exporters/jaeger-thrift/docs/api_diff_current_vs_latest.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/exporters/jaeger-thrift/docs/api_diff_current_vs_latest.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/exporters/jaeger/docs/api_diff_1.1.0_vs_1.0.0.txt b/exporters/jaeger/docs/api_diff_1.1.0_vs_1.0.0.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/exporters/jaeger/docs/api_diff_1.1.0_vs_1.0.0.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/exporters/jaeger/docs/api_diff_current_vs_latest.txt b/exporters/jaeger/docs/api_diff_current_vs_latest.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/exporters/jaeger/docs/api_diff_current_vs_latest.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/exporters/logging-otlp/docs/api_diff_1.1.0_vs_1.0.0.txt b/exporters/logging-otlp/docs/api_diff_1.1.0_vs_1.0.0.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/exporters/logging-otlp/docs/api_diff_1.1.0_vs_1.0.0.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/exporters/logging-otlp/docs/api_diff_current_vs_latest.txt b/exporters/logging-otlp/docs/api_diff_current_vs_latest.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/exporters/logging-otlp/docs/api_diff_current_vs_latest.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/exporters/logging/docs/api_diff_1.1.0_vs_1.0.0.txt b/exporters/logging/docs/api_diff_1.1.0_vs_1.0.0.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/exporters/logging/docs/api_diff_1.1.0_vs_1.0.0.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/exporters/logging/docs/api_diff_current_vs_latest.txt b/exporters/logging/docs/api_diff_current_vs_latest.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/exporters/logging/docs/api_diff_current_vs_latest.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/exporters/otlp/all/docs/api_diff_1.1.0_vs_1.0.0.txt b/exporters/otlp/all/docs/api_diff_1.1.0_vs_1.0.0.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/exporters/otlp/all/docs/api_diff_1.1.0_vs_1.0.0.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/exporters/otlp/all/docs/api_diff_current_vs_latest.txt b/exporters/otlp/all/docs/api_diff_current_vs_latest.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/exporters/otlp/all/docs/api_diff_current_vs_latest.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/exporters/otlp/common/docs/api_diff_1.1.0_vs_1.0.0.txt b/exporters/otlp/common/docs/api_diff_1.1.0_vs_1.0.0.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/exporters/otlp/common/docs/api_diff_1.1.0_vs_1.0.0.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/exporters/otlp/common/docs/api_diff_current_vs_latest.txt b/exporters/otlp/common/docs/api_diff_current_vs_latest.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/exporters/otlp/common/docs/api_diff_current_vs_latest.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/exporters/otlp/trace/docs/api_diff_1.1.0_vs_1.0.0.txt b/exporters/otlp/trace/docs/api_diff_1.1.0_vs_1.0.0.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/exporters/otlp/trace/docs/api_diff_1.1.0_vs_1.0.0.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/exporters/otlp/trace/docs/api_diff_current_vs_latest.txt b/exporters/otlp/trace/docs/api_diff_current_vs_latest.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/exporters/otlp/trace/docs/api_diff_current_vs_latest.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/exporters/zipkin/docs/api_diff_1.1.0_vs_1.0.0.txt b/exporters/zipkin/docs/api_diff_1.1.0_vs_1.0.0.txt new file mode 100644 index 00000000000..95fffe4a6a2 --- /dev/null +++ b/exporters/zipkin/docs/api_diff_1.1.0_vs_1.0.0.txt @@ -0,0 +1,4 @@ +Comparing source compatibility of against +*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.exporter.zipkin.ZipkinSpanExporter (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.util.logging.Logger baseLogger diff --git a/exporters/zipkin/docs/api_diff_current_vs_latest.txt b/exporters/zipkin/docs/api_diff_current_vs_latest.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/exporters/zipkin/docs/api_diff_current_vs_latest.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/extensions/annotations/docs/api_diff_1.1.0_vs_1.0.0.txt b/extensions/annotations/docs/api_diff_1.1.0_vs_1.0.0.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/extensions/annotations/docs/api_diff_1.1.0_vs_1.0.0.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/extensions/annotations/docs/api_diff_current_vs_latest.txt b/extensions/annotations/docs/api_diff_current_vs_latest.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/extensions/annotations/docs/api_diff_current_vs_latest.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/extensions/aws/docs/api_diff_1.1.0_vs_1.0.0.txt b/extensions/aws/docs/api_diff_1.1.0_vs_1.0.0.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/extensions/aws/docs/api_diff_1.1.0_vs_1.0.0.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/extensions/aws/docs/api_diff_current_vs_latest.txt b/extensions/aws/docs/api_diff_current_vs_latest.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/extensions/aws/docs/api_diff_current_vs_latest.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/extensions/kotlin/docs/api_diff_1.1.0_vs_1.0.0.txt b/extensions/kotlin/docs/api_diff_1.1.0_vs_1.0.0.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/extensions/kotlin/docs/api_diff_1.1.0_vs_1.0.0.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/extensions/kotlin/docs/api_diff_current_vs_latest.txt b/extensions/kotlin/docs/api_diff_current_vs_latest.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/extensions/kotlin/docs/api_diff_current_vs_latest.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/extensions/trace-propagators/docs/api_diff_1.1.0_vs_1.0.0.txt b/extensions/trace-propagators/docs/api_diff_1.1.0_vs_1.0.0.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/extensions/trace-propagators/docs/api_diff_1.1.0_vs_1.0.0.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/extensions/trace-propagators/docs/api_diff_current_vs_latest.txt b/extensions/trace-propagators/docs/api_diff_current_vs_latest.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/extensions/trace-propagators/docs/api_diff_current_vs_latest.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/sdk-extensions/aws/docs/api_diff_1.1.0_vs_1.0.0.txt b/sdk-extensions/aws/docs/api_diff_1.1.0_vs_1.0.0.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/sdk-extensions/aws/docs/api_diff_1.1.0_vs_1.0.0.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/sdk-extensions/aws/docs/api_diff_current_vs_latest.txt b/sdk-extensions/aws/docs/api_diff_current_vs_latest.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/sdk-extensions/aws/docs/api_diff_current_vs_latest.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/sdk-extensions/jaeger-remote-sampler/docs/api_diff_1.1.0_vs_1.0.0.txt b/sdk-extensions/jaeger-remote-sampler/docs/api_diff_1.1.0_vs_1.0.0.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/sdk-extensions/jaeger-remote-sampler/docs/api_diff_1.1.0_vs_1.0.0.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/sdk-extensions/jaeger-remote-sampler/docs/api_diff_current_vs_latest.txt b/sdk-extensions/jaeger-remote-sampler/docs/api_diff_current_vs_latest.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/sdk-extensions/jaeger-remote-sampler/docs/api_diff_current_vs_latest.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/sdk-extensions/resources/docs/api_diff_1.1.0_vs_1.0.0.txt b/sdk-extensions/resources/docs/api_diff_1.1.0_vs_1.0.0.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/sdk-extensions/resources/docs/api_diff_1.1.0_vs_1.0.0.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/sdk-extensions/resources/docs/api_diff_current_vs_latest.txt b/sdk-extensions/resources/docs/api_diff_current_vs_latest.txt new file mode 100644 index 00000000000..411b6633b10 --- /dev/null +++ b/sdk-extensions/resources/docs/api_diff_current_vs_latest.txt @@ -0,0 +1,10 @@ +Comparing source compatibility of against ++++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.sdk.extension.resources.HostResource (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.resources.Resource get() ++++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.sdk.extension.resources.HostResourceProvider (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW CONSTRUCTOR: PUBLIC(+) HostResourceProvider() + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.resources.Resource createResource(io.opentelemetry.sdk.autoconfigure.ConfigProperties) diff --git a/sdk/all/docs/api_diff_1.1.0_vs_1.0.0.txt b/sdk/all/docs/api_diff_1.1.0_vs_1.0.0.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/sdk/all/docs/api_diff_1.1.0_vs_1.0.0.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/sdk/all/docs/api_diff_current_vs_latest.txt b/sdk/all/docs/api_diff_current_vs_latest.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/sdk/all/docs/api_diff_current_vs_latest.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/sdk/common/docs/api_diff_1.1.0_vs_1.0.0.txt b/sdk/common/docs/api_diff_1.1.0_vs_1.0.0.txt new file mode 100644 index 00000000000..8f9ecdb7bc1 --- /dev/null +++ b/sdk/common/docs/api_diff_1.1.0_vs_1.0.0.txt @@ -0,0 +1,22 @@ +Comparing source compatibility of against +*** MODIFIED CLASS: PUBLIC ABSTRACT io.opentelemetry.sdk.resources.Resource (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.resources.ResourceBuilder builder() + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.resources.ResourceBuilder toBuilder() ++++ NEW CLASS: PUBLIC(+) io.opentelemetry.sdk.resources.ResourceBuilder (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW CONSTRUCTOR: PUBLIC(+) ResourceBuilder() + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.resources.Resource build() + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.resources.ResourceBuilder put(java.lang.String, java.lang.String) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.resources.ResourceBuilder put(java.lang.String, long) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.resources.ResourceBuilder put(java.lang.String, double) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.resources.ResourceBuilder put(java.lang.String, boolean) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.resources.ResourceBuilder put(java.lang.String, java.lang.String[]) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.resources.ResourceBuilder put(java.lang.String, long[]) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.resources.ResourceBuilder put(java.lang.String, double[]) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.resources.ResourceBuilder put(java.lang.String, boolean[]) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.resources.ResourceBuilder put(io.opentelemetry.api.common.AttributeKey, java.lang.Object) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.resources.ResourceBuilder put(io.opentelemetry.api.common.AttributeKey, int) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.resources.ResourceBuilder putAll(io.opentelemetry.api.common.Attributes) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.resources.ResourceBuilder putAll(io.opentelemetry.sdk.resources.Resource) diff --git a/sdk/common/docs/api_diff_current_vs_latest.txt b/sdk/common/docs/api_diff_current_vs_latest.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/sdk/common/docs/api_diff_current_vs_latest.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/sdk/testing/docs/api_diff_1.1.0_vs_1.0.0.txt b/sdk/testing/docs/api_diff_1.1.0_vs_1.0.0.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/sdk/testing/docs/api_diff_1.1.0_vs_1.0.0.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/sdk/testing/docs/api_diff_current_vs_latest.txt b/sdk/testing/docs/api_diff_current_vs_latest.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/sdk/testing/docs/api_diff_current_vs_latest.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/sdk/trace/docs/api_diff_1.1.0_vs_1.0.0.txt b/sdk/trace/docs/api_diff_1.1.0_vs_1.0.0.txt new file mode 100644 index 00000000000..1f2056fe1ed --- /dev/null +++ b/sdk/trace/docs/api_diff_1.1.0_vs_1.0.0.txt @@ -0,0 +1,4 @@ +Comparing source compatibility of against +*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.trace.export.SimpleSpanProcessor (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.common.CompletableResultCode forceFlush() diff --git a/sdk/trace/docs/api_diff_current_vs_latest.txt b/sdk/trace/docs/api_diff_current_vs_latest.txt new file mode 100644 index 00000000000..df26146497b --- /dev/null +++ b/sdk/trace/docs/api_diff_current_vs_latest.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index f8ea0ceeca2..114d0711e7c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,6 +15,7 @@ pluginManagement { id("org.jetbrains.kotlin.jvm") version "1.4.21" id("org.unbroken-dome.test-sets") version "3.0.1" id("ru.vyarus.animalsniffer") version "1.5.3" + id("me.champeau.gradle.japicmp") version "0.2.9" } }