From 39786e4171536c86bc23eef24dd6093e4ba790d6 Mon Sep 17 00:00:00 2001 From: Nikita Salnikov-Tarnovski Date: Mon, 4 Oct 2021 17:32:12 +0300 Subject: [PATCH 1/4] Add functionality to generate API changes --- conventions/build.gradle.kts | 1 + .../otel.japicmp-conventions.gradle.kts | 87 ++++++ ...instrumentation-api-annotation-support.txt | 2 + .../opentelemetry-instrumentation-api.txt | 75 +++++ .../opentelemetry-javaagent-extension-api.txt | 30 ++ ...elemetry-javaagent-instrumentation-api.txt | 39 +++ .../opentelemetry-muzzle.txt | 256 ++++++++++++++++++ .../build.gradle.kts | 1 + instrumentation-api/build.gradle.kts | 1 + javaagent-extension-api/build.gradle.kts | 1 + .../build.gradle.kts | 1 + muzzle/build.gradle.kts | 1 + 12 files changed, 495 insertions(+) create mode 100644 conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts create mode 100644 docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api-annotation-support.txt create mode 100644 docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt create mode 100644 docs/apidiffs/current_vs_latest/opentelemetry-javaagent-extension-api.txt create mode 100644 docs/apidiffs/current_vs_latest/opentelemetry-javaagent-instrumentation-api.txt create mode 100644 docs/apidiffs/current_vs_latest/opentelemetry-muzzle.txt diff --git a/conventions/build.gradle.kts b/conventions/build.gradle.kts index a53dae6c762a..6f55e8a10cee 100644 --- a/conventions/build.gradle.kts +++ b/conventions/build.gradle.kts @@ -50,6 +50,7 @@ dependencies { implementation("me.champeau.jmh:jmh-gradle-plugin:0.6.5") implementation("net.ltgt.gradle:gradle-errorprone-plugin:2.0.1") implementation("net.ltgt.gradle:gradle-nullaway-plugin:1.1.0") + implementation("me.champeau.gradle:japicmp-gradle-plugin:0.3.0") testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.2") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.2") diff --git a/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts b/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts new file mode 100644 index 000000000000..6deb6992c30e --- /dev/null +++ b/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts @@ -0,0 +1,87 @@ +import me.champeau.gradle.japicmp.JapicmpTask + +plugins { + base + + id("me.champeau.gradle.japicmp") +} + +/** + * The latest *released* version of the project. Evaluated lazily so the work is only done if necessary. + */ +val latestReleasedVersion: String by lazy { + // hack to find the current released version of the project + val temp: Configuration = configurations.create("tempConfig") + // pick the api, since it's always there. + dependencies.add(temp.name,"io.opentelemetry.javaagent:opentelemetry-javaagent:latest.release") + var moduleVersion = configurations["tempConfig"].resolvedConfiguration.firstLevelModuleDependencies.elementAt(0).moduleVersion + + if(findProperty("otel.stable") != "true"){ + moduleVersion = moduleVersion + "-alpha" + } + + configurations.remove(temp) + logger.info("Discovered latest release version: " + moduleVersion) + moduleVersion +} + +/** + * Locate the project's artifact of a particular version. + */ +fun findArtifact(version: String): File { + val existingGroup = group + try { + val depModule = "${project.group}:${base.archivesName.get()}:$version@jar" + // Temporarily change the group name because we want to fetch an artifact with the same + // Maven coordinates as the project, which Gradle would not allow otherwise. + group = "virtual_group" + val depJar = "${base.archivesName.get()}-${version}.jar" + val configuration: Configuration = configurations.detachedConfiguration( + dependencies.create(depModule) + ) + return files(configuration.files).filter { + it.name.equals(depJar) + }.singleFile + } finally { + group = existingGroup + } +} + +tasks { + val jApiCmp by registering(JapicmpTask::class) { + dependsOn("jar") + + // the japicmp "new" version is either the user-specified one, or the locally built jar. + val apiNewVersion: String? by project + val newArtifact = apiNewVersion?.let { findArtifact(it) } + ?: file(getByName("jar").archiveFile) + newClasspath = files(newArtifact) + + //only output changes, not everything + isOnlyModified = true + + // the japicmp "old" version is either the user-specified one, or the latest release. + val apiBaseVersion: String? by project + val baselineVersion = apiBaseVersion ?: latestReleasedVersion + oldClasspath = try { + files(findArtifact(baselineVersion)) + } catch (e: Exception) { + //if we can't find the baseline artifact, this is probably one that's never been published before, + //so publish the whole API. We do that by flipping this flag, and comparing the current against nothing. + isOnlyModified = false + files() + } + + //this is needed so that we only consider the current artifact, and not dependencies + isIgnoreMissingClasses = true + packageExcludes = listOf("*.internal", "*.internal.*") + val baseVersionString = if (apiBaseVersion == null) "latest" else baselineVersion + val newVersionString = if (apiNewVersion == null) "current" else apiNewVersion + txtOutputFile = file("$rootDir/docs/apidiffs/${newVersionString}_vs_${baseVersionString}/${base.archivesName.get()}.txt") + } + // have the check task depend on the api comparison task, to make it more likely it will get used. + named("check") { + dependsOn(jApiCmp) + } +} + diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api-annotation-support.txt b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api-annotation-support.txt new file mode 100644 index 000000000000..df26146497bf --- /dev/null +++ b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api-annotation-support.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of against +No changes. \ No newline at end of file diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt new file mode 100644 index 000000000000..54523dd3ae99 --- /dev/null +++ b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt @@ -0,0 +1,75 @@ +Comparing source compatibility of against ++++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) STATIC(+) io.opentelemetry.instrumentation.api.caching.CaffeineCache$Builder (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.instrumentation.api.caching.Cache build() + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void executor(java.util.concurrent.Executor) + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void maximumSize(long) + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void weakKeys() + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void weakValues() +*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.config.ExperimentalConfig (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + +++ NEW METHOD: PUBLIC(+) boolean suppressMessagingReceiveSpans() ++++ NEW CLASS: PUBLIC(+) ABSTRACT(+) io.opentelemetry.instrumentation.api.field.VirtualField (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW CONSTRUCTOR: PUBLIC(+) VirtualField() + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.Object computeIfNull(java.lang.Object, java.util.function.Supplier) + +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.instrumentation.api.field.VirtualField find(java.lang.Class, java.lang.Class) + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.Object get(java.lang.Object) + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void set(java.lang.Object, java.lang.Object) + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void setIfNull(java.lang.Object, java.lang.Object) ++++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.instrumentation.api.instrumenter.ContextCustomizer (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.context.Context start(io.opentelemetry.context.Context, java.lang.Object, io.opentelemetry.api.common.Attributes) +---! REMOVED CLASS: PUBLIC(-) ABSTRACT(-) io.opentelemetry.instrumentation.api.instrumenter.http.HttpAttributesExtractor (not serializable) + --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 + ---! REMOVED SUPERCLASS: io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor + ---! REMOVED CONSTRUCTOR: PUBLIC(-) HttpAttributesExtractor() ++++ NEW CLASS: PUBLIC(+) ABSTRACT(+) io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesExtractor (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: io.opentelemetry.instrumentation.api.instrumenter.http.HttpCommonAttributesExtractor + +++ NEW CONSTRUCTOR: PUBLIC(+) HttpClientAttributesExtractor() +*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientMetrics (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + ===! UNCHANGED INTERFACE: io.opentelemetry.instrumentation.api.instrumenter.RequestListener + --- REMOVED METHOD: PUBLIC(-) void end(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes) + +++ NEW METHOD: PUBLIC(+) void end(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes, long) + --- REMOVED METHOD: PUBLIC(-) io.opentelemetry.context.Context start(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.context.Context start(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes, long) ++++ NEW CLASS: PUBLIC(+) ABSTRACT(+) io.opentelemetry.instrumentation.api.instrumenter.http.HttpCommonAttributesExtractor (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor ++++ NEW CLASS: PUBLIC(+) ABSTRACT(+) io.opentelemetry.instrumentation.api.instrumenter.http.HttpServerAttributesExtractor (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: io.opentelemetry.instrumentation.api.instrumenter.http.HttpCommonAttributesExtractor + +++ NEW CONSTRUCTOR: PUBLIC(+) HttpServerAttributesExtractor() +*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.instrumenter.http.HttpServerMetrics (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + ===! UNCHANGED INTERFACE: io.opentelemetry.instrumentation.api.instrumenter.RequestListener + --- REMOVED METHOD: PUBLIC(-) void end(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes) + +++ NEW METHOD: PUBLIC(+) void end(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes, long) + --- REMOVED METHOD: PUBLIC(-) io.opentelemetry.context.Context start(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.context.Context start(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes, long) +***! MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanNameExtractor (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor create(io.opentelemetry.instrumentation.api.instrumenter.http.HttpAttributesExtractor) + +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor create(io.opentelemetry.instrumentation.api.instrumenter.http.HttpCommonAttributesExtractor) +***! MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanStatusExtractor (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor create(io.opentelemetry.instrumentation.api.instrumenter.http.HttpAttributesExtractor) + +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor create(io.opentelemetry.instrumentation.api.instrumenter.http.HttpCommonAttributesExtractor) +*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder addContextCustomizer(io.opentelemetry.instrumentation.api.instrumenter.ContextCustomizer) +***! MODIFIED INTERFACE: PUBLIC ABSTRACT io.opentelemetry.instrumentation.api.instrumenter.RequestListener (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) void end(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes) + +++* NEW METHOD: PUBLIC(+) ABSTRACT(+) void end(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes, long) + ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) io.opentelemetry.context.Context start(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes) + +++* NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.context.Context start(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes, long) ++++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) STATIC(+) io.opentelemetry.instrumentation.api.servlet.MappingResolver$Factory (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.instrumentation.api.servlet.MappingResolver get() diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-javaagent-extension-api.txt b/docs/apidiffs/current_vs_latest/opentelemetry-javaagent-extension-api.txt new file mode 100644 index 000000000000..0d63d4aa42af --- /dev/null +++ b/docs/apidiffs/current_vs_latest/opentelemetry-javaagent-extension-api.txt @@ -0,0 +1,30 @@ +Comparing source compatibility of against +---! REMOVED INTERFACE: PUBLIC(-) ABSTRACT(-) io.opentelemetry.javaagent.extension.AgentExtension (not serializable) + --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 + ---! REMOVED INTERFACE: io.opentelemetry.javaagent.extension.Ordered + ---! REMOVED SUPERCLASS: java.lang.Object + ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) net.bytebuddy.agent.builder.AgentBuilder extend(net.bytebuddy.agent.builder.AgentBuilder) + ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) java.lang.String extensionName() +---! REMOVED INTERFACE: PUBLIC(-) ABSTRACT(-) io.opentelemetry.javaagent.extension.instrumentation.InstrumentationContextBuilder (not serializable) + --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 + ---! REMOVED SUPERCLASS: java.lang.Object + ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) io.opentelemetry.javaagent.extension.instrumentation.InstrumentationContextBuilder register(java.lang.String, java.lang.String) +***! MODIFIED CLASS: PUBLIC ABSTRACT io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + ---! REMOVED METHOD: PUBLIC(-) java.util.Map getMuzzleContextStoreClasses() + --- REMOVED ANNOTATION: java.lang.Deprecated + ---! REMOVED METHOD: PUBLIC(-) java.util.List helperResourceNames() + --- REMOVED ANNOTATION: java.lang.Deprecated + ---! REMOVED METHOD: PUBLIC(-) void registerMuzzleContextStoreClasses(io.opentelemetry.javaagent.extension.instrumentation.InstrumentationContextBuilder) +---! REMOVED INTERFACE: PUBLIC(-) ABSTRACT(-) io.opentelemetry.javaagent.spi.exporter.MetricExporterFactory (not serializable) + --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 + ---! REMOVED SUPERCLASS: java.lang.Object + ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) io.opentelemetry.sdk.metrics.export.MetricExporter fromConfig(java.util.Properties) + ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) java.util.Set getNames() + --- REMOVED ANNOTATION: java.lang.Deprecated +---! REMOVED INTERFACE: PUBLIC(-) ABSTRACT(-) io.opentelemetry.javaagent.spi.exporter.SpanExporterFactory (not serializable) + --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 + ---! REMOVED SUPERCLASS: java.lang.Object + ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) io.opentelemetry.sdk.trace.export.SpanExporter fromConfig(java.util.Properties) + ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) java.util.Set getNames() + --- REMOVED ANNOTATION: java.lang.Deprecated diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-javaagent-instrumentation-api.txt b/docs/apidiffs/current_vs_latest/opentelemetry-javaagent-instrumentation-api.txt new file mode 100644 index 000000000000..a121bf366037 --- /dev/null +++ b/docs/apidiffs/current_vs_latest/opentelemetry-javaagent-instrumentation-api.txt @@ -0,0 +1,39 @@ +Comparing source compatibility of against +---! REMOVED CLASS: PUBLIC(-) FINAL(-) io.opentelemetry.javaagent.instrumentation.api.concurrent.CallableWrapper (not serializable) + --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 + ---! REMOVED INTERFACE: java.util.concurrent.Callable + ---! REMOVED SUPERCLASS: java.lang.Object + ---! REMOVED METHOD: PUBLIC(-) java.lang.Object call() + --- REMOVED EXCEPTION: java.lang.Exception + ---! REMOVED METHOD: PUBLIC(-) STATIC(-) java.util.concurrent.Callable wrapIfNeeded(java.util.concurrent.Callable) +***! MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.javaagent.instrumentation.api.concurrent.ExecutorAdviceHelper (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.instrumentation.api.concurrent.PropagatedContext attachContextToTask(io.opentelemetry.context.Context, io.opentelemetry.javaagent.instrumentation.api.ContextStore, java.lang.Object) + +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.javaagent.instrumentation.api.concurrent.PropagatedContext attachContextToTask(io.opentelemetry.context.Context, io.opentelemetry.instrumentation.api.field.VirtualField, java.lang.Object) +---! REMOVED CLASS: PUBLIC(-) FINAL(-) io.opentelemetry.javaagent.instrumentation.api.concurrent.RunnableWrapper (not serializable) + --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 + ---! REMOVED INTERFACE: java.lang.Runnable + ---! REMOVED SUPERCLASS: java.lang.Object + ---! REMOVED METHOD: PUBLIC(-) void run() + ---! REMOVED METHOD: PUBLIC(-) STATIC(-) java.lang.Runnable wrapIfNeeded(java.lang.Runnable) +***! MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.javaagent.instrumentation.api.concurrent.TaskAdviceHelper (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.context.Scope makePropagatedContextCurrent(io.opentelemetry.javaagent.instrumentation.api.ContextStore, java.lang.Object) + +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.context.Scope makePropagatedContextCurrent(io.opentelemetry.instrumentation.api.field.VirtualField, java.lang.Object) +---! REMOVED INTERFACE: PUBLIC(-) ABSTRACT(-) io.opentelemetry.javaagent.instrumentation.api.ContextStore (not serializable) + --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 + ---! REMOVED SUPERCLASS: java.lang.Object + ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.instrumentation.api.caching.Cache asCache() + ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) java.lang.Object get(java.lang.Object) + ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) void put(java.lang.Object, java.lang.Object) + ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) java.lang.Object putIfAbsent(java.lang.Object, java.lang.Object) + ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) java.lang.Object putIfAbsent(java.lang.Object, java.util.function.Supplier) +---! REMOVED CLASS: PUBLIC(-) io.opentelemetry.javaagent.instrumentation.api.InstrumentationContext (not serializable) + --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 + ---! REMOVED SUPERCLASS: java.lang.Object + ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.instrumentation.api.ContextStore get(java.lang.Class, java.lang.Class) + ---! REMOVED METHOD: PUBLIC(-) STATIC(-) void internalSetContextStoreSupplier(io.opentelemetry.javaagent.instrumentation.api.InstrumentationContext$ContextStoreSupplier) +---! REMOVED INTERFACE: PUBLIC(-) ABSTRACT(-) STATIC(-) io.opentelemetry.javaagent.instrumentation.api.InstrumentationContext$ContextStoreSupplier (not serializable) + --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 + ---! REMOVED SUPERCLASS: java.lang.Object + ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) io.opentelemetry.javaagent.instrumentation.api.ContextStore get(java.lang.Class, java.lang.Class) diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-muzzle.txt b/docs/apidiffs/current_vs_latest/opentelemetry-muzzle.txt new file mode 100644 index 000000000000..38a5484a3f6b --- /dev/null +++ b/docs/apidiffs/current_vs_latest/opentelemetry-muzzle.txt @@ -0,0 +1,256 @@ +Comparing source compatibility of against +---! REMOVED CLASS: PUBLIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.ClassRef (not serializable) + --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 + ---! REMOVED SUPERCLASS: java.lang.Object + ---! REMOVED METHOD: PUBLIC(-) java.lang.String getClassName() + ---! REMOVED METHOD: PUBLIC(-) java.util.Set getFields() + ---! REMOVED METHOD: PUBLIC(-) java.util.Set getFlags() + ---! REMOVED METHOD: PUBLIC(-) java.util.Set getInterfaceNames() + ---! REMOVED METHOD: PUBLIC(-) java.util.Set getMethods() + ---! REMOVED METHOD: PUBLIC(-) java.util.Set getSources() + ---! REMOVED METHOD: PUBLIC(-) java.lang.String getSuperClassName() + ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRef merge(io.opentelemetry.javaagent.extension.muzzle.ClassRef) + ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRefBuilder newBuilder(java.lang.String) + ---! REMOVED METHOD: PUBLIC(-) java.lang.String toString() +---! REMOVED CLASS: PUBLIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.ClassRefBuilder (not serializable) + --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 + ---! REMOVED SUPERCLASS: java.lang.Object + ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRefBuilder addField(io.opentelemetry.javaagent.extension.muzzle.Source[], io.opentelemetry.javaagent.extension.muzzle.Flag[], java.lang.String, net.bytebuddy.jar.asm.Type, boolean) + ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRefBuilder addFlag(io.opentelemetry.javaagent.extension.muzzle.Flag) + ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRefBuilder addInterfaceName(java.lang.String) + ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRefBuilder addInterfaceNames(java.util.Collection) + ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRefBuilder addMethod(io.opentelemetry.javaagent.extension.muzzle.Source[], io.opentelemetry.javaagent.extension.muzzle.Flag[], java.lang.String, net.bytebuddy.jar.asm.Type, net.bytebuddy.jar.asm.Type[]) + ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRefBuilder addSource(java.lang.String) + ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRefBuilder addSource(java.lang.String, int) + ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRef build() + ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRefBuilder setSuperClassName(java.lang.String) +---! REMOVED CLASS: PUBLIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.FieldRef (not serializable) + --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 + ---! REMOVED SUPERCLASS: java.lang.Object + ---! REMOVED METHOD: PUBLIC(-) boolean equals(java.lang.Object) + ---! REMOVED METHOD: PUBLIC(-) java.lang.String getDescriptor() + ---! REMOVED METHOD: PUBLIC(-) java.util.Set getFlags() + ---! REMOVED METHOD: PUBLIC(-) java.lang.String getName() + ---! REMOVED METHOD: PUBLIC(-) java.util.Set getSources() + ---! REMOVED METHOD: PUBLIC(-) int hashCode() + ---! REMOVED METHOD: PUBLIC(-) boolean isDeclared() + ---! REMOVED METHOD: PUBLIC(-) java.lang.String toString() +---! REMOVED INTERFACE: PUBLIC(-) ABSTRACT(-) io.opentelemetry.javaagent.extension.muzzle.Flag (not serializable) + --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 + ---! REMOVED SUPERCLASS: java.lang.Object + ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) boolean matches(int) + ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) java.lang.String name() +---! REMOVED ENUM: PUBLIC(-) ABSTRACT(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$ManifestationFlag (class removed) + --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 + ---! REMOVED INTERFACE: io.opentelemetry.javaagent.extension.muzzle.Flag + ---! REMOVED INTERFACE: java.lang.Comparable + ---! REMOVED INTERFACE: java.io.Serializable + ---! REMOVED SUPERCLASS: java.lang.Enum + ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$ManifestationFlag NON_FINAL + ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$ManifestationFlag INTERFACE + ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$ManifestationFlag FINAL + ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$ManifestationFlag ABSTRACT + ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$ManifestationFlag NON_INTERFACE + ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$ManifestationFlag valueOf(java.lang.String) + ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$ManifestationFlag[] values() +---! REMOVED ENUM: PUBLIC(-) ABSTRACT(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$MinimumVisibilityFlag (class removed) + --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 + ---! REMOVED INTERFACE: io.opentelemetry.javaagent.extension.muzzle.Flag + ---! REMOVED INTERFACE: java.lang.Comparable + ---! REMOVED INTERFACE: java.io.Serializable + ---! REMOVED SUPERCLASS: java.lang.Enum + ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$MinimumVisibilityFlag PACKAGE_OR_HIGHER + ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$MinimumVisibilityFlag PROTECTED_OR_HIGHER + ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$MinimumVisibilityFlag PRIVATE_OR_HIGHER + ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$MinimumVisibilityFlag PUBLIC + ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$MinimumVisibilityFlag valueOf(java.lang.String) + ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$MinimumVisibilityFlag[] values() +---! REMOVED ENUM: PUBLIC(-) ABSTRACT(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$OwnershipFlag (class removed) + --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 + ---! REMOVED INTERFACE: io.opentelemetry.javaagent.extension.muzzle.Flag + ---! REMOVED INTERFACE: java.lang.Comparable + ---! REMOVED INTERFACE: java.io.Serializable + ---! REMOVED SUPERCLASS: java.lang.Enum + ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$OwnershipFlag NON_STATIC + ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$OwnershipFlag STATIC + ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$OwnershipFlag valueOf(java.lang.String) + ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$OwnershipFlag[] values() +---! REMOVED ENUM: PUBLIC(-) ABSTRACT(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$VisibilityFlag (class removed) + --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 + ---! REMOVED INTERFACE: io.opentelemetry.javaagent.extension.muzzle.Flag + ---! REMOVED INTERFACE: java.lang.Comparable + ---! REMOVED INTERFACE: java.io.Serializable + ---! REMOVED SUPERCLASS: java.lang.Enum + ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$VisibilityFlag PACKAGE + ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$VisibilityFlag PUBLIC + ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$VisibilityFlag PROTECTED + ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$VisibilityFlag PRIVATE + ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$VisibilityFlag valueOf(java.lang.String) + ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$VisibilityFlag[] values() +---! REMOVED CLASS: PUBLIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.MethodRef (not serializable) + --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 + ---! REMOVED SUPERCLASS: java.lang.Object + ---! REMOVED METHOD: PUBLIC(-) boolean equals(java.lang.Object) + ---! REMOVED METHOD: PUBLIC(-) java.lang.String getDescriptor() + ---! REMOVED METHOD: PUBLIC(-) java.util.Set getFlags() + ---! REMOVED METHOD: PUBLIC(-) java.lang.String getName() + ---! REMOVED METHOD: PUBLIC(-) java.util.Set getSources() + ---! REMOVED METHOD: PUBLIC(-) int hashCode() + ---! REMOVED METHOD: PUBLIC(-) java.lang.String toString() +---! REMOVED CLASS: PUBLIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Source (not serializable) + --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 + ---! REMOVED SUPERCLASS: java.lang.Object + ---! REMOVED CONSTRUCTOR: PUBLIC(-) Source(java.lang.String, int) + ---! REMOVED METHOD: PUBLIC(-) boolean equals(java.lang.Object) + ---! REMOVED METHOD: PUBLIC(-) int getLine() + ---! REMOVED METHOD: PUBLIC(-) java.lang.String getName() + ---! REMOVED METHOD: PUBLIC(-) int hashCode() + ---! REMOVED METHOD: PUBLIC(-) java.lang.String toString() +***! MODIFIED CLASS: PUBLIC STATIC io.opentelemetry.javaagent.tooling.muzzle.HelperReferenceWrapper$Factory (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.tooling.muzzle.HelperReferenceWrapper create(io.opentelemetry.javaagent.extension.muzzle.ClassRef) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.HelperReferenceWrapper create(io.opentelemetry.javaagent.tooling.muzzle.references.ClassRef) ++++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.javaagent.tooling.muzzle.InstrumentationContextBuilder (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.javaagent.tooling.muzzle.InstrumentationContextBuilder register(java.lang.String, java.lang.String) +***! MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.javaagent.tooling.muzzle.InstrumentationContextBuilderImpl (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + +++ NEW INTERFACE: io.opentelemetry.javaagent.tooling.muzzle.InstrumentationContextBuilder + ***! MODIFIED METHOD: PUBLIC io.opentelemetry.javaagent.tooling.muzzle.InstrumentationContextBuilder (<-io.opentelemetry.javaagent.extension.instrumentation.InstrumentationContextBuilder) register(java.lang.String, java.lang.String) ++++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.javaagent.tooling.muzzle.InstrumentationModuleMuzzle (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.util.Map getMuzzleReferences() + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void registerMuzzleContextStoreClasses(io.opentelemetry.javaagent.tooling.muzzle.InstrumentationContextBuilder) +***! MODIFIED CLASS: PUBLIC STATIC io.opentelemetry.javaagent.tooling.muzzle.Mismatch$MissingClass (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + ---! REMOVED CONSTRUCTOR: PUBLIC(-) Mismatch$MissingClass(io.opentelemetry.javaagent.extension.muzzle.ClassRef) + ---! REMOVED CONSTRUCTOR: PUBLIC(-) Mismatch$MissingClass(io.opentelemetry.javaagent.extension.muzzle.ClassRef, java.lang.String) + +++ NEW CONSTRUCTOR: PUBLIC(+) Mismatch$MissingClass(io.opentelemetry.javaagent.tooling.muzzle.references.ClassRef, java.lang.String) + +++ NEW CONSTRUCTOR: PUBLIC(+) Mismatch$MissingClass(io.opentelemetry.javaagent.tooling.muzzle.references.ClassRef) +***! MODIFIED CLASS: PUBLIC STATIC io.opentelemetry.javaagent.tooling.muzzle.Mismatch$MissingFlag (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + ---! REMOVED CONSTRUCTOR: PUBLIC(-) Mismatch$MissingFlag(java.util.Collection, java.lang.String, io.opentelemetry.javaagent.extension.muzzle.Flag, int) + +++ NEW CONSTRUCTOR: PUBLIC(+) Mismatch$MissingFlag(java.util.Collection, java.lang.String, io.opentelemetry.javaagent.tooling.muzzle.references.Flag, int) +***! MODIFIED CLASS: PUBLIC STATIC io.opentelemetry.javaagent.tooling.muzzle.Mismatch$MissingMethod (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + ---! REMOVED CONSTRUCTOR: PUBLIC(-) Mismatch$MissingMethod(io.opentelemetry.javaagent.extension.muzzle.ClassRef, io.opentelemetry.javaagent.extension.muzzle.MethodRef) + ---! REMOVED CONSTRUCTOR: PUBLIC(-) Mismatch$MissingMethod(io.opentelemetry.javaagent.extension.muzzle.ClassRef, io.opentelemetry.javaagent.tooling.muzzle.HelperReferenceWrapper$Method) + +++ NEW CONSTRUCTOR: PUBLIC(+) Mismatch$MissingMethod(io.opentelemetry.javaagent.tooling.muzzle.references.ClassRef, io.opentelemetry.javaagent.tooling.muzzle.HelperReferenceWrapper$Method) + +++ NEW CONSTRUCTOR: PUBLIC(+) Mismatch$MissingMethod(io.opentelemetry.javaagent.tooling.muzzle.references.ClassRef, io.opentelemetry.javaagent.tooling.muzzle.references.MethodRef) +***! MODIFIED CLASS: PUBLIC STATIC io.opentelemetry.javaagent.tooling.muzzle.Mismatch$ReferenceCheckError (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + ---! REMOVED CONSTRUCTOR: PUBLIC(-) Mismatch$ReferenceCheckError(java.lang.Exception, io.opentelemetry.javaagent.extension.muzzle.ClassRef, java.lang.ClassLoader) + +++ NEW CONSTRUCTOR: PUBLIC(+) Mismatch$ReferenceCheckError(java.lang.Exception, io.opentelemetry.javaagent.tooling.muzzle.references.ClassRef, java.lang.ClassLoader) +***! MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.javaagent.tooling.muzzle.ReferenceCollector (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + ---! REMOVED METHOD: PUBLIC(-) void collectReferencesFromResource(java.lang.String) + --- REMOVED ANNOTATION: java.lang.Deprecated ++++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRef (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW METHOD: PUBLIC(+) java.lang.String getClassName() + +++ NEW METHOD: PUBLIC(+) java.util.Set getFields() + +++ NEW METHOD: PUBLIC(+) java.util.Set getFlags() + +++ NEW METHOD: PUBLIC(+) java.util.Set getInterfaceNames() + +++ NEW METHOD: PUBLIC(+) java.util.Set getMethods() + +++ NEW METHOD: PUBLIC(+) java.util.Set getSources() + +++ NEW METHOD: PUBLIC(+) java.lang.String getSuperClassName() + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRef merge(io.opentelemetry.javaagent.tooling.muzzle.references.ClassRef) + +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRefBuilder newBuilder(java.lang.String) + +++ NEW METHOD: PUBLIC(+) java.lang.String toString() ++++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRefBuilder (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRefBuilder addField(io.opentelemetry.javaagent.tooling.muzzle.references.Source[], io.opentelemetry.javaagent.tooling.muzzle.references.Flag[], java.lang.String, net.bytebuddy.jar.asm.Type, boolean) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRefBuilder addFlag(io.opentelemetry.javaagent.tooling.muzzle.references.Flag) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRefBuilder addInterfaceName(java.lang.String) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRefBuilder addInterfaceNames(java.util.Collection) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRefBuilder addMethod(io.opentelemetry.javaagent.tooling.muzzle.references.Source[], io.opentelemetry.javaagent.tooling.muzzle.references.Flag[], java.lang.String, net.bytebuddy.jar.asm.Type, net.bytebuddy.jar.asm.Type[]) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRefBuilder addSource(java.lang.String) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRefBuilder addSource(java.lang.String, int) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRef build() + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRefBuilder setSuperClassName(java.lang.String) ++++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.FieldRef (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW METHOD: PUBLIC(+) boolean equals(java.lang.Object) + +++ NEW METHOD: PUBLIC(+) java.lang.String getDescriptor() + +++ NEW METHOD: PUBLIC(+) java.util.Set getFlags() + +++ NEW METHOD: PUBLIC(+) java.lang.String getName() + +++ NEW METHOD: PUBLIC(+) java.util.Set getSources() + +++ NEW METHOD: PUBLIC(+) int hashCode() + +++ NEW METHOD: PUBLIC(+) boolean isDeclared() + +++ NEW METHOD: PUBLIC(+) java.lang.String toString() ++++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) boolean matches(int) + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String name() ++++ NEW ENUM: PUBLIC(+) ABSTRACT(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$ManifestationFlag (compatible) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW INTERFACE: io.opentelemetry.javaagent.tooling.muzzle.references.Flag + +++ NEW INTERFACE: java.lang.Comparable + +++ NEW INTERFACE: java.io.Serializable + +++ NEW SUPERCLASS: java.lang.Enum + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$ManifestationFlag NON_FINAL + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$ManifestationFlag INTERFACE + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$ManifestationFlag FINAL + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$ManifestationFlag ABSTRACT + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$ManifestationFlag NON_INTERFACE + +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$ManifestationFlag valueOf(java.lang.String) + +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$ManifestationFlag[] values() ++++ NEW ENUM: PUBLIC(+) ABSTRACT(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$MinimumVisibilityFlag (compatible) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW INTERFACE: io.opentelemetry.javaagent.tooling.muzzle.references.Flag + +++ NEW INTERFACE: java.lang.Comparable + +++ NEW INTERFACE: java.io.Serializable + +++ NEW SUPERCLASS: java.lang.Enum + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$MinimumVisibilityFlag PACKAGE_OR_HIGHER + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$MinimumVisibilityFlag PROTECTED_OR_HIGHER + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$MinimumVisibilityFlag PRIVATE_OR_HIGHER + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$MinimumVisibilityFlag PUBLIC + +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$MinimumVisibilityFlag valueOf(java.lang.String) + +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$MinimumVisibilityFlag[] values() ++++ NEW ENUM: PUBLIC(+) ABSTRACT(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$OwnershipFlag (compatible) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW INTERFACE: io.opentelemetry.javaagent.tooling.muzzle.references.Flag + +++ NEW INTERFACE: java.lang.Comparable + +++ NEW INTERFACE: java.io.Serializable + +++ NEW SUPERCLASS: java.lang.Enum + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$OwnershipFlag NON_STATIC + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$OwnershipFlag STATIC + +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$OwnershipFlag valueOf(java.lang.String) + +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$OwnershipFlag[] values() ++++ NEW ENUM: PUBLIC(+) ABSTRACT(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$VisibilityFlag (compatible) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW INTERFACE: io.opentelemetry.javaagent.tooling.muzzle.references.Flag + +++ NEW INTERFACE: java.lang.Comparable + +++ NEW INTERFACE: java.io.Serializable + +++ NEW SUPERCLASS: java.lang.Enum + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$VisibilityFlag PACKAGE + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$VisibilityFlag PUBLIC + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$VisibilityFlag PROTECTED + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$VisibilityFlag PRIVATE + +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$VisibilityFlag valueOf(java.lang.String) + +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$VisibilityFlag[] values() ++++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.MethodRef (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW METHOD: PUBLIC(+) boolean equals(java.lang.Object) + +++ NEW METHOD: PUBLIC(+) java.lang.String getDescriptor() + +++ NEW METHOD: PUBLIC(+) java.util.Set getFlags() + +++ NEW METHOD: PUBLIC(+) java.lang.String getName() + +++ NEW METHOD: PUBLIC(+) java.util.Set getSources() + +++ NEW METHOD: PUBLIC(+) int hashCode() + +++ NEW METHOD: PUBLIC(+) java.lang.String toString() ++++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Source (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW CONSTRUCTOR: PUBLIC(+) Source(java.lang.String, int) + +++ NEW METHOD: PUBLIC(+) boolean equals(java.lang.Object) + +++ NEW METHOD: PUBLIC(+) int getLine() + +++ NEW METHOD: PUBLIC(+) java.lang.String getName() + +++ NEW METHOD: PUBLIC(+) int hashCode() + +++ NEW METHOD: PUBLIC(+) java.lang.String toString() diff --git a/instrumentation-api-annotation-support/build.gradle.kts b/instrumentation-api-annotation-support/build.gradle.kts index 0a4987c86c83..446635d9de33 100644 --- a/instrumentation-api-annotation-support/build.gradle.kts +++ b/instrumentation-api-annotation-support/build.gradle.kts @@ -1,6 +1,7 @@ plugins { id("otel.java-conventions") id("otel.jacoco-conventions") + id("otel.japicmp-conventions") id("otel.publish-conventions") } diff --git a/instrumentation-api/build.gradle.kts b/instrumentation-api/build.gradle.kts index 80cee2683d1e..2966c2d2811f 100644 --- a/instrumentation-api/build.gradle.kts +++ b/instrumentation-api/build.gradle.kts @@ -3,6 +3,7 @@ plugins { id("otel.java-conventions") id("otel.jacoco-conventions") + id("otel.japicmp-conventions") id("otel.publish-conventions") } diff --git a/javaagent-extension-api/build.gradle.kts b/javaagent-extension-api/build.gradle.kts index 43d27dfed910..07b5ed0b38e3 100644 --- a/javaagent-extension-api/build.gradle.kts +++ b/javaagent-extension-api/build.gradle.kts @@ -1,5 +1,6 @@ plugins { id("otel.java-conventions") + id("otel.japicmp-conventions") id("otel.publish-conventions") } diff --git a/javaagent-instrumentation-api/build.gradle.kts b/javaagent-instrumentation-api/build.gradle.kts index 1f3eadb22b10..ca4f0114f13a 100644 --- a/javaagent-instrumentation-api/build.gradle.kts +++ b/javaagent-instrumentation-api/build.gradle.kts @@ -1,6 +1,7 @@ plugins { id("otel.java-conventions") id("otel.jacoco-conventions") + id("otel.japicmp-conventions") id("otel.publish-conventions") } diff --git a/muzzle/build.gradle.kts b/muzzle/build.gradle.kts index 3314d11c2cf7..80f221b17434 100644 --- a/muzzle/build.gradle.kts +++ b/muzzle/build.gradle.kts @@ -1,5 +1,6 @@ plugins { id("otel.java-conventions") + id("otel.japicmp-conventions") id("otel.publish-conventions") } From 3a77c8b3a258b41931a08a81af04846c4a009809 Mon Sep 17 00:00:00 2001 From: Nikita Salnikov-Tarnovski Date: Tue, 5 Oct 2021 13:09:48 +0300 Subject: [PATCH 2/4] Update conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts Co-authored-by: John Watson --- conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts b/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts index 6deb6992c30e..cdb78d3e7a5a 100644 --- a/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts +++ b/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts @@ -12,7 +12,7 @@ plugins { val latestReleasedVersion: String by lazy { // hack to find the current released version of the project val temp: Configuration = configurations.create("tempConfig") - // pick the api, since it's always there. + // pick the agent, since it's always there. dependencies.add(temp.name,"io.opentelemetry.javaagent:opentelemetry-javaagent:latest.release") var moduleVersion = configurations["tempConfig"].resolvedConfiguration.firstLevelModuleDependencies.elementAt(0).moduleVersion From 16e9f2a97d9de09d56b3482a1b208b625e570cf8 Mon Sep 17 00:00:00 2001 From: Nikita Salnikov-Tarnovski Date: Tue, 5 Oct 2021 13:12:47 +0300 Subject: [PATCH 3/4] Do not commit any API changes until we have stable release --- .../otel.japicmp-conventions.gradle.kts | 4 - ...instrumentation-api-annotation-support.txt | 2 - .../opentelemetry-instrumentation-api.txt | 75 ----- .../opentelemetry-javaagent-extension-api.txt | 30 -- ...elemetry-javaagent-instrumentation-api.txt | 39 --- .../opentelemetry-muzzle.txt | 256 ------------------ 6 files changed, 406 deletions(-) delete mode 100644 docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api-annotation-support.txt delete mode 100644 docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt delete mode 100644 docs/apidiffs/current_vs_latest/opentelemetry-javaagent-extension-api.txt delete mode 100644 docs/apidiffs/current_vs_latest/opentelemetry-javaagent-instrumentation-api.txt delete mode 100644 docs/apidiffs/current_vs_latest/opentelemetry-muzzle.txt diff --git a/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts b/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts index cdb78d3e7a5a..3afc0ef75c16 100644 --- a/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts +++ b/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts @@ -16,10 +16,6 @@ val latestReleasedVersion: String by lazy { dependencies.add(temp.name,"io.opentelemetry.javaagent:opentelemetry-javaagent:latest.release") var moduleVersion = configurations["tempConfig"].resolvedConfiguration.firstLevelModuleDependencies.elementAt(0).moduleVersion - if(findProperty("otel.stable") != "true"){ - moduleVersion = moduleVersion + "-alpha" - } - configurations.remove(temp) logger.info("Discovered latest release version: " + moduleVersion) moduleVersion diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api-annotation-support.txt b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api-annotation-support.txt deleted file mode 100644 index df26146497bf..000000000000 --- a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api-annotation-support.txt +++ /dev/null @@ -1,2 +0,0 @@ -Comparing source compatibility of against -No changes. \ No newline at end of file diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt deleted file mode 100644 index 54523dd3ae99..000000000000 --- a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt +++ /dev/null @@ -1,75 +0,0 @@ -Comparing source compatibility of against -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) STATIC(+) io.opentelemetry.instrumentation.api.caching.CaffeineCache$Builder (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.instrumentation.api.caching.Cache build() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void executor(java.util.concurrent.Executor) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void maximumSize(long) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void weakKeys() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void weakValues() -*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.config.ExperimentalConfig (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - +++ NEW METHOD: PUBLIC(+) boolean suppressMessagingReceiveSpans() -+++ NEW CLASS: PUBLIC(+) ABSTRACT(+) io.opentelemetry.instrumentation.api.field.VirtualField (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW CONSTRUCTOR: PUBLIC(+) VirtualField() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.Object computeIfNull(java.lang.Object, java.util.function.Supplier) - +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.instrumentation.api.field.VirtualField find(java.lang.Class, java.lang.Class) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.Object get(java.lang.Object) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void set(java.lang.Object, java.lang.Object) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void setIfNull(java.lang.Object, java.lang.Object) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.instrumentation.api.instrumenter.ContextCustomizer (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.context.Context start(io.opentelemetry.context.Context, java.lang.Object, io.opentelemetry.api.common.Attributes) ----! REMOVED CLASS: PUBLIC(-) ABSTRACT(-) io.opentelemetry.instrumentation.api.instrumenter.http.HttpAttributesExtractor (not serializable) - --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 - ---! REMOVED SUPERCLASS: io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor - ---! REMOVED CONSTRUCTOR: PUBLIC(-) HttpAttributesExtractor() -+++ NEW CLASS: PUBLIC(+) ABSTRACT(+) io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesExtractor (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: io.opentelemetry.instrumentation.api.instrumenter.http.HttpCommonAttributesExtractor - +++ NEW CONSTRUCTOR: PUBLIC(+) HttpClientAttributesExtractor() -*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientMetrics (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - ===! UNCHANGED INTERFACE: io.opentelemetry.instrumentation.api.instrumenter.RequestListener - --- REMOVED METHOD: PUBLIC(-) void end(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes) - +++ NEW METHOD: PUBLIC(+) void end(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes, long) - --- REMOVED METHOD: PUBLIC(-) io.opentelemetry.context.Context start(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes) - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.context.Context start(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes, long) -+++ NEW CLASS: PUBLIC(+) ABSTRACT(+) io.opentelemetry.instrumentation.api.instrumenter.http.HttpCommonAttributesExtractor (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor -+++ NEW CLASS: PUBLIC(+) ABSTRACT(+) io.opentelemetry.instrumentation.api.instrumenter.http.HttpServerAttributesExtractor (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: io.opentelemetry.instrumentation.api.instrumenter.http.HttpCommonAttributesExtractor - +++ NEW CONSTRUCTOR: PUBLIC(+) HttpServerAttributesExtractor() -*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.instrumenter.http.HttpServerMetrics (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - ===! UNCHANGED INTERFACE: io.opentelemetry.instrumentation.api.instrumenter.RequestListener - --- REMOVED METHOD: PUBLIC(-) void end(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes) - +++ NEW METHOD: PUBLIC(+) void end(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes, long) - --- REMOVED METHOD: PUBLIC(-) io.opentelemetry.context.Context start(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes) - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.context.Context start(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes, long) -***! MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanNameExtractor (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor create(io.opentelemetry.instrumentation.api.instrumenter.http.HttpAttributesExtractor) - +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor create(io.opentelemetry.instrumentation.api.instrumenter.http.HttpCommonAttributesExtractor) -***! MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanStatusExtractor (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor create(io.opentelemetry.instrumentation.api.instrumenter.http.HttpAttributesExtractor) - +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor create(io.opentelemetry.instrumentation.api.instrumenter.http.HttpCommonAttributesExtractor) -*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder addContextCustomizer(io.opentelemetry.instrumentation.api.instrumenter.ContextCustomizer) -***! MODIFIED INTERFACE: PUBLIC ABSTRACT io.opentelemetry.instrumentation.api.instrumenter.RequestListener (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) void end(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes) - +++* NEW METHOD: PUBLIC(+) ABSTRACT(+) void end(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes, long) - ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) io.opentelemetry.context.Context start(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes) - +++* NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.context.Context start(io.opentelemetry.context.Context, io.opentelemetry.api.common.Attributes, long) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) STATIC(+) io.opentelemetry.instrumentation.api.servlet.MappingResolver$Factory (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.instrumentation.api.servlet.MappingResolver get() diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-javaagent-extension-api.txt b/docs/apidiffs/current_vs_latest/opentelemetry-javaagent-extension-api.txt deleted file mode 100644 index 0d63d4aa42af..000000000000 --- a/docs/apidiffs/current_vs_latest/opentelemetry-javaagent-extension-api.txt +++ /dev/null @@ -1,30 +0,0 @@ -Comparing source compatibility of against ----! REMOVED INTERFACE: PUBLIC(-) ABSTRACT(-) io.opentelemetry.javaagent.extension.AgentExtension (not serializable) - --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 - ---! REMOVED INTERFACE: io.opentelemetry.javaagent.extension.Ordered - ---! REMOVED SUPERCLASS: java.lang.Object - ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) net.bytebuddy.agent.builder.AgentBuilder extend(net.bytebuddy.agent.builder.AgentBuilder) - ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) java.lang.String extensionName() ----! REMOVED INTERFACE: PUBLIC(-) ABSTRACT(-) io.opentelemetry.javaagent.extension.instrumentation.InstrumentationContextBuilder (not serializable) - --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 - ---! REMOVED SUPERCLASS: java.lang.Object - ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) io.opentelemetry.javaagent.extension.instrumentation.InstrumentationContextBuilder register(java.lang.String, java.lang.String) -***! MODIFIED CLASS: PUBLIC ABSTRACT io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - ---! REMOVED METHOD: PUBLIC(-) java.util.Map getMuzzleContextStoreClasses() - --- REMOVED ANNOTATION: java.lang.Deprecated - ---! REMOVED METHOD: PUBLIC(-) java.util.List helperResourceNames() - --- REMOVED ANNOTATION: java.lang.Deprecated - ---! REMOVED METHOD: PUBLIC(-) void registerMuzzleContextStoreClasses(io.opentelemetry.javaagent.extension.instrumentation.InstrumentationContextBuilder) ----! REMOVED INTERFACE: PUBLIC(-) ABSTRACT(-) io.opentelemetry.javaagent.spi.exporter.MetricExporterFactory (not serializable) - --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 - ---! REMOVED SUPERCLASS: java.lang.Object - ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) io.opentelemetry.sdk.metrics.export.MetricExporter fromConfig(java.util.Properties) - ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) java.util.Set getNames() - --- REMOVED ANNOTATION: java.lang.Deprecated ----! REMOVED INTERFACE: PUBLIC(-) ABSTRACT(-) io.opentelemetry.javaagent.spi.exporter.SpanExporterFactory (not serializable) - --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 - ---! REMOVED SUPERCLASS: java.lang.Object - ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) io.opentelemetry.sdk.trace.export.SpanExporter fromConfig(java.util.Properties) - ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) java.util.Set getNames() - --- REMOVED ANNOTATION: java.lang.Deprecated diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-javaagent-instrumentation-api.txt b/docs/apidiffs/current_vs_latest/opentelemetry-javaagent-instrumentation-api.txt deleted file mode 100644 index a121bf366037..000000000000 --- a/docs/apidiffs/current_vs_latest/opentelemetry-javaagent-instrumentation-api.txt +++ /dev/null @@ -1,39 +0,0 @@ -Comparing source compatibility of against ----! REMOVED CLASS: PUBLIC(-) FINAL(-) io.opentelemetry.javaagent.instrumentation.api.concurrent.CallableWrapper (not serializable) - --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 - ---! REMOVED INTERFACE: java.util.concurrent.Callable - ---! REMOVED SUPERCLASS: java.lang.Object - ---! REMOVED METHOD: PUBLIC(-) java.lang.Object call() - --- REMOVED EXCEPTION: java.lang.Exception - ---! REMOVED METHOD: PUBLIC(-) STATIC(-) java.util.concurrent.Callable wrapIfNeeded(java.util.concurrent.Callable) -***! MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.javaagent.instrumentation.api.concurrent.ExecutorAdviceHelper (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.instrumentation.api.concurrent.PropagatedContext attachContextToTask(io.opentelemetry.context.Context, io.opentelemetry.javaagent.instrumentation.api.ContextStore, java.lang.Object) - +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.javaagent.instrumentation.api.concurrent.PropagatedContext attachContextToTask(io.opentelemetry.context.Context, io.opentelemetry.instrumentation.api.field.VirtualField, java.lang.Object) ----! REMOVED CLASS: PUBLIC(-) FINAL(-) io.opentelemetry.javaagent.instrumentation.api.concurrent.RunnableWrapper (not serializable) - --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 - ---! REMOVED INTERFACE: java.lang.Runnable - ---! REMOVED SUPERCLASS: java.lang.Object - ---! REMOVED METHOD: PUBLIC(-) void run() - ---! REMOVED METHOD: PUBLIC(-) STATIC(-) java.lang.Runnable wrapIfNeeded(java.lang.Runnable) -***! MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.javaagent.instrumentation.api.concurrent.TaskAdviceHelper (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.context.Scope makePropagatedContextCurrent(io.opentelemetry.javaagent.instrumentation.api.ContextStore, java.lang.Object) - +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.context.Scope makePropagatedContextCurrent(io.opentelemetry.instrumentation.api.field.VirtualField, java.lang.Object) ----! REMOVED INTERFACE: PUBLIC(-) ABSTRACT(-) io.opentelemetry.javaagent.instrumentation.api.ContextStore (not serializable) - --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 - ---! REMOVED SUPERCLASS: java.lang.Object - ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.instrumentation.api.caching.Cache asCache() - ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) java.lang.Object get(java.lang.Object) - ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) void put(java.lang.Object, java.lang.Object) - ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) java.lang.Object putIfAbsent(java.lang.Object, java.lang.Object) - ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) java.lang.Object putIfAbsent(java.lang.Object, java.util.function.Supplier) ----! REMOVED CLASS: PUBLIC(-) io.opentelemetry.javaagent.instrumentation.api.InstrumentationContext (not serializable) - --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 - ---! REMOVED SUPERCLASS: java.lang.Object - ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.instrumentation.api.ContextStore get(java.lang.Class, java.lang.Class) - ---! REMOVED METHOD: PUBLIC(-) STATIC(-) void internalSetContextStoreSupplier(io.opentelemetry.javaagent.instrumentation.api.InstrumentationContext$ContextStoreSupplier) ----! REMOVED INTERFACE: PUBLIC(-) ABSTRACT(-) STATIC(-) io.opentelemetry.javaagent.instrumentation.api.InstrumentationContext$ContextStoreSupplier (not serializable) - --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 - ---! REMOVED SUPERCLASS: java.lang.Object - ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) io.opentelemetry.javaagent.instrumentation.api.ContextStore get(java.lang.Class, java.lang.Class) diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-muzzle.txt b/docs/apidiffs/current_vs_latest/opentelemetry-muzzle.txt deleted file mode 100644 index 38a5484a3f6b..000000000000 --- a/docs/apidiffs/current_vs_latest/opentelemetry-muzzle.txt +++ /dev/null @@ -1,256 +0,0 @@ -Comparing source compatibility of against ----! REMOVED CLASS: PUBLIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.ClassRef (not serializable) - --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 - ---! REMOVED SUPERCLASS: java.lang.Object - ---! REMOVED METHOD: PUBLIC(-) java.lang.String getClassName() - ---! REMOVED METHOD: PUBLIC(-) java.util.Set getFields() - ---! REMOVED METHOD: PUBLIC(-) java.util.Set getFlags() - ---! REMOVED METHOD: PUBLIC(-) java.util.Set getInterfaceNames() - ---! REMOVED METHOD: PUBLIC(-) java.util.Set getMethods() - ---! REMOVED METHOD: PUBLIC(-) java.util.Set getSources() - ---! REMOVED METHOD: PUBLIC(-) java.lang.String getSuperClassName() - ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRef merge(io.opentelemetry.javaagent.extension.muzzle.ClassRef) - ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRefBuilder newBuilder(java.lang.String) - ---! REMOVED METHOD: PUBLIC(-) java.lang.String toString() ----! REMOVED CLASS: PUBLIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.ClassRefBuilder (not serializable) - --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 - ---! REMOVED SUPERCLASS: java.lang.Object - ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRefBuilder addField(io.opentelemetry.javaagent.extension.muzzle.Source[], io.opentelemetry.javaagent.extension.muzzle.Flag[], java.lang.String, net.bytebuddy.jar.asm.Type, boolean) - ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRefBuilder addFlag(io.opentelemetry.javaagent.extension.muzzle.Flag) - ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRefBuilder addInterfaceName(java.lang.String) - ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRefBuilder addInterfaceNames(java.util.Collection) - ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRefBuilder addMethod(io.opentelemetry.javaagent.extension.muzzle.Source[], io.opentelemetry.javaagent.extension.muzzle.Flag[], java.lang.String, net.bytebuddy.jar.asm.Type, net.bytebuddy.jar.asm.Type[]) - ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRefBuilder addSource(java.lang.String) - ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRefBuilder addSource(java.lang.String, int) - ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRef build() - ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.extension.muzzle.ClassRefBuilder setSuperClassName(java.lang.String) ----! REMOVED CLASS: PUBLIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.FieldRef (not serializable) - --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 - ---! REMOVED SUPERCLASS: java.lang.Object - ---! REMOVED METHOD: PUBLIC(-) boolean equals(java.lang.Object) - ---! REMOVED METHOD: PUBLIC(-) java.lang.String getDescriptor() - ---! REMOVED METHOD: PUBLIC(-) java.util.Set getFlags() - ---! REMOVED METHOD: PUBLIC(-) java.lang.String getName() - ---! REMOVED METHOD: PUBLIC(-) java.util.Set getSources() - ---! REMOVED METHOD: PUBLIC(-) int hashCode() - ---! REMOVED METHOD: PUBLIC(-) boolean isDeclared() - ---! REMOVED METHOD: PUBLIC(-) java.lang.String toString() ----! REMOVED INTERFACE: PUBLIC(-) ABSTRACT(-) io.opentelemetry.javaagent.extension.muzzle.Flag (not serializable) - --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 - ---! REMOVED SUPERCLASS: java.lang.Object - ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) boolean matches(int) - ---! REMOVED METHOD: PUBLIC(-) ABSTRACT(-) java.lang.String name() ----! REMOVED ENUM: PUBLIC(-) ABSTRACT(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$ManifestationFlag (class removed) - --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 - ---! REMOVED INTERFACE: io.opentelemetry.javaagent.extension.muzzle.Flag - ---! REMOVED INTERFACE: java.lang.Comparable - ---! REMOVED INTERFACE: java.io.Serializable - ---! REMOVED SUPERCLASS: java.lang.Enum - ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$ManifestationFlag NON_FINAL - ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$ManifestationFlag INTERFACE - ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$ManifestationFlag FINAL - ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$ManifestationFlag ABSTRACT - ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$ManifestationFlag NON_INTERFACE - ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$ManifestationFlag valueOf(java.lang.String) - ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$ManifestationFlag[] values() ----! REMOVED ENUM: PUBLIC(-) ABSTRACT(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$MinimumVisibilityFlag (class removed) - --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 - ---! REMOVED INTERFACE: io.opentelemetry.javaagent.extension.muzzle.Flag - ---! REMOVED INTERFACE: java.lang.Comparable - ---! REMOVED INTERFACE: java.io.Serializable - ---! REMOVED SUPERCLASS: java.lang.Enum - ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$MinimumVisibilityFlag PACKAGE_OR_HIGHER - ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$MinimumVisibilityFlag PROTECTED_OR_HIGHER - ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$MinimumVisibilityFlag PRIVATE_OR_HIGHER - ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$MinimumVisibilityFlag PUBLIC - ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$MinimumVisibilityFlag valueOf(java.lang.String) - ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$MinimumVisibilityFlag[] values() ----! REMOVED ENUM: PUBLIC(-) ABSTRACT(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$OwnershipFlag (class removed) - --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 - ---! REMOVED INTERFACE: io.opentelemetry.javaagent.extension.muzzle.Flag - ---! REMOVED INTERFACE: java.lang.Comparable - ---! REMOVED INTERFACE: java.io.Serializable - ---! REMOVED SUPERCLASS: java.lang.Enum - ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$OwnershipFlag NON_STATIC - ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$OwnershipFlag STATIC - ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$OwnershipFlag valueOf(java.lang.String) - ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$OwnershipFlag[] values() ----! REMOVED ENUM: PUBLIC(-) ABSTRACT(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$VisibilityFlag (class removed) - --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 - ---! REMOVED INTERFACE: io.opentelemetry.javaagent.extension.muzzle.Flag - ---! REMOVED INTERFACE: java.lang.Comparable - ---! REMOVED INTERFACE: java.io.Serializable - ---! REMOVED SUPERCLASS: java.lang.Enum - ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$VisibilityFlag PACKAGE - ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$VisibilityFlag PUBLIC - ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$VisibilityFlag PROTECTED - ---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Flag$VisibilityFlag PRIVATE - ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$VisibilityFlag valueOf(java.lang.String) - ---! REMOVED METHOD: PUBLIC(-) STATIC(-) io.opentelemetry.javaagent.extension.muzzle.Flag$VisibilityFlag[] values() ----! REMOVED CLASS: PUBLIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.MethodRef (not serializable) - --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 - ---! REMOVED SUPERCLASS: java.lang.Object - ---! REMOVED METHOD: PUBLIC(-) boolean equals(java.lang.Object) - ---! REMOVED METHOD: PUBLIC(-) java.lang.String getDescriptor() - ---! REMOVED METHOD: PUBLIC(-) java.util.Set getFlags() - ---! REMOVED METHOD: PUBLIC(-) java.lang.String getName() - ---! REMOVED METHOD: PUBLIC(-) java.util.Set getSources() - ---! REMOVED METHOD: PUBLIC(-) int hashCode() - ---! REMOVED METHOD: PUBLIC(-) java.lang.String toString() ----! REMOVED CLASS: PUBLIC(-) FINAL(-) io.opentelemetry.javaagent.extension.muzzle.Source (not serializable) - --- CLASS FILE FORMAT VERSION: n.a. <- 52.0 - ---! REMOVED SUPERCLASS: java.lang.Object - ---! REMOVED CONSTRUCTOR: PUBLIC(-) Source(java.lang.String, int) - ---! REMOVED METHOD: PUBLIC(-) boolean equals(java.lang.Object) - ---! REMOVED METHOD: PUBLIC(-) int getLine() - ---! REMOVED METHOD: PUBLIC(-) java.lang.String getName() - ---! REMOVED METHOD: PUBLIC(-) int hashCode() - ---! REMOVED METHOD: PUBLIC(-) java.lang.String toString() -***! MODIFIED CLASS: PUBLIC STATIC io.opentelemetry.javaagent.tooling.muzzle.HelperReferenceWrapper$Factory (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - ---! REMOVED METHOD: PUBLIC(-) io.opentelemetry.javaagent.tooling.muzzle.HelperReferenceWrapper create(io.opentelemetry.javaagent.extension.muzzle.ClassRef) - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.HelperReferenceWrapper create(io.opentelemetry.javaagent.tooling.muzzle.references.ClassRef) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.javaagent.tooling.muzzle.InstrumentationContextBuilder (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.javaagent.tooling.muzzle.InstrumentationContextBuilder register(java.lang.String, java.lang.String) -***! MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.javaagent.tooling.muzzle.InstrumentationContextBuilderImpl (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - +++ NEW INTERFACE: io.opentelemetry.javaagent.tooling.muzzle.InstrumentationContextBuilder - ***! MODIFIED METHOD: PUBLIC io.opentelemetry.javaagent.tooling.muzzle.InstrumentationContextBuilder (<-io.opentelemetry.javaagent.extension.instrumentation.InstrumentationContextBuilder) register(java.lang.String, java.lang.String) -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.javaagent.tooling.muzzle.InstrumentationModuleMuzzle (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.util.Map getMuzzleReferences() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void registerMuzzleContextStoreClasses(io.opentelemetry.javaagent.tooling.muzzle.InstrumentationContextBuilder) -***! MODIFIED CLASS: PUBLIC STATIC io.opentelemetry.javaagent.tooling.muzzle.Mismatch$MissingClass (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - ---! REMOVED CONSTRUCTOR: PUBLIC(-) Mismatch$MissingClass(io.opentelemetry.javaagent.extension.muzzle.ClassRef) - ---! REMOVED CONSTRUCTOR: PUBLIC(-) Mismatch$MissingClass(io.opentelemetry.javaagent.extension.muzzle.ClassRef, java.lang.String) - +++ NEW CONSTRUCTOR: PUBLIC(+) Mismatch$MissingClass(io.opentelemetry.javaagent.tooling.muzzle.references.ClassRef, java.lang.String) - +++ NEW CONSTRUCTOR: PUBLIC(+) Mismatch$MissingClass(io.opentelemetry.javaagent.tooling.muzzle.references.ClassRef) -***! MODIFIED CLASS: PUBLIC STATIC io.opentelemetry.javaagent.tooling.muzzle.Mismatch$MissingFlag (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - ---! REMOVED CONSTRUCTOR: PUBLIC(-) Mismatch$MissingFlag(java.util.Collection, java.lang.String, io.opentelemetry.javaagent.extension.muzzle.Flag, int) - +++ NEW CONSTRUCTOR: PUBLIC(+) Mismatch$MissingFlag(java.util.Collection, java.lang.String, io.opentelemetry.javaagent.tooling.muzzle.references.Flag, int) -***! MODIFIED CLASS: PUBLIC STATIC io.opentelemetry.javaagent.tooling.muzzle.Mismatch$MissingMethod (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - ---! REMOVED CONSTRUCTOR: PUBLIC(-) Mismatch$MissingMethod(io.opentelemetry.javaagent.extension.muzzle.ClassRef, io.opentelemetry.javaagent.extension.muzzle.MethodRef) - ---! REMOVED CONSTRUCTOR: PUBLIC(-) Mismatch$MissingMethod(io.opentelemetry.javaagent.extension.muzzle.ClassRef, io.opentelemetry.javaagent.tooling.muzzle.HelperReferenceWrapper$Method) - +++ NEW CONSTRUCTOR: PUBLIC(+) Mismatch$MissingMethod(io.opentelemetry.javaagent.tooling.muzzle.references.ClassRef, io.opentelemetry.javaagent.tooling.muzzle.HelperReferenceWrapper$Method) - +++ NEW CONSTRUCTOR: PUBLIC(+) Mismatch$MissingMethod(io.opentelemetry.javaagent.tooling.muzzle.references.ClassRef, io.opentelemetry.javaagent.tooling.muzzle.references.MethodRef) -***! MODIFIED CLASS: PUBLIC STATIC io.opentelemetry.javaagent.tooling.muzzle.Mismatch$ReferenceCheckError (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - ---! REMOVED CONSTRUCTOR: PUBLIC(-) Mismatch$ReferenceCheckError(java.lang.Exception, io.opentelemetry.javaagent.extension.muzzle.ClassRef, java.lang.ClassLoader) - +++ NEW CONSTRUCTOR: PUBLIC(+) Mismatch$ReferenceCheckError(java.lang.Exception, io.opentelemetry.javaagent.tooling.muzzle.references.ClassRef, java.lang.ClassLoader) -***! MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.javaagent.tooling.muzzle.ReferenceCollector (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - ---! REMOVED METHOD: PUBLIC(-) void collectReferencesFromResource(java.lang.String) - --- REMOVED ANNOTATION: java.lang.Deprecated -+++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRef (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) java.lang.String getClassName() - +++ NEW METHOD: PUBLIC(+) java.util.Set getFields() - +++ NEW METHOD: PUBLIC(+) java.util.Set getFlags() - +++ NEW METHOD: PUBLIC(+) java.util.Set getInterfaceNames() - +++ NEW METHOD: PUBLIC(+) java.util.Set getMethods() - +++ NEW METHOD: PUBLIC(+) java.util.Set getSources() - +++ NEW METHOD: PUBLIC(+) java.lang.String getSuperClassName() - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRef merge(io.opentelemetry.javaagent.tooling.muzzle.references.ClassRef) - +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRefBuilder newBuilder(java.lang.String) - +++ NEW METHOD: PUBLIC(+) java.lang.String toString() -+++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRefBuilder (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRefBuilder addField(io.opentelemetry.javaagent.tooling.muzzle.references.Source[], io.opentelemetry.javaagent.tooling.muzzle.references.Flag[], java.lang.String, net.bytebuddy.jar.asm.Type, boolean) - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRefBuilder addFlag(io.opentelemetry.javaagent.tooling.muzzle.references.Flag) - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRefBuilder addInterfaceName(java.lang.String) - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRefBuilder addInterfaceNames(java.util.Collection) - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRefBuilder addMethod(io.opentelemetry.javaagent.tooling.muzzle.references.Source[], io.opentelemetry.javaagent.tooling.muzzle.references.Flag[], java.lang.String, net.bytebuddy.jar.asm.Type, net.bytebuddy.jar.asm.Type[]) - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRefBuilder addSource(java.lang.String) - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRefBuilder addSource(java.lang.String, int) - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRef build() - +++ NEW METHOD: PUBLIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.ClassRefBuilder setSuperClassName(java.lang.String) -+++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.FieldRef (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) boolean equals(java.lang.Object) - +++ NEW METHOD: PUBLIC(+) java.lang.String getDescriptor() - +++ NEW METHOD: PUBLIC(+) java.util.Set getFlags() - +++ NEW METHOD: PUBLIC(+) java.lang.String getName() - +++ NEW METHOD: PUBLIC(+) java.util.Set getSources() - +++ NEW METHOD: PUBLIC(+) int hashCode() - +++ NEW METHOD: PUBLIC(+) boolean isDeclared() - +++ NEW METHOD: PUBLIC(+) java.lang.String toString() -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) boolean matches(int) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String name() -+++ NEW ENUM: PUBLIC(+) ABSTRACT(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$ManifestationFlag (compatible) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW INTERFACE: io.opentelemetry.javaagent.tooling.muzzle.references.Flag - +++ NEW INTERFACE: java.lang.Comparable - +++ NEW INTERFACE: java.io.Serializable - +++ NEW SUPERCLASS: java.lang.Enum - +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$ManifestationFlag NON_FINAL - +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$ManifestationFlag INTERFACE - +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$ManifestationFlag FINAL - +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$ManifestationFlag ABSTRACT - +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$ManifestationFlag NON_INTERFACE - +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$ManifestationFlag valueOf(java.lang.String) - +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$ManifestationFlag[] values() -+++ NEW ENUM: PUBLIC(+) ABSTRACT(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$MinimumVisibilityFlag (compatible) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW INTERFACE: io.opentelemetry.javaagent.tooling.muzzle.references.Flag - +++ NEW INTERFACE: java.lang.Comparable - +++ NEW INTERFACE: java.io.Serializable - +++ NEW SUPERCLASS: java.lang.Enum - +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$MinimumVisibilityFlag PACKAGE_OR_HIGHER - +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$MinimumVisibilityFlag PROTECTED_OR_HIGHER - +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$MinimumVisibilityFlag PRIVATE_OR_HIGHER - +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$MinimumVisibilityFlag PUBLIC - +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$MinimumVisibilityFlag valueOf(java.lang.String) - +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$MinimumVisibilityFlag[] values() -+++ NEW ENUM: PUBLIC(+) ABSTRACT(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$OwnershipFlag (compatible) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW INTERFACE: io.opentelemetry.javaagent.tooling.muzzle.references.Flag - +++ NEW INTERFACE: java.lang.Comparable - +++ NEW INTERFACE: java.io.Serializable - +++ NEW SUPERCLASS: java.lang.Enum - +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$OwnershipFlag NON_STATIC - +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$OwnershipFlag STATIC - +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$OwnershipFlag valueOf(java.lang.String) - +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$OwnershipFlag[] values() -+++ NEW ENUM: PUBLIC(+) ABSTRACT(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$VisibilityFlag (compatible) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW INTERFACE: io.opentelemetry.javaagent.tooling.muzzle.references.Flag - +++ NEW INTERFACE: java.lang.Comparable - +++ NEW INTERFACE: java.io.Serializable - +++ NEW SUPERCLASS: java.lang.Enum - +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$VisibilityFlag PACKAGE - +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$VisibilityFlag PUBLIC - +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$VisibilityFlag PROTECTED - +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$VisibilityFlag PRIVATE - +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$VisibilityFlag valueOf(java.lang.String) - +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.javaagent.tooling.muzzle.references.Flag$VisibilityFlag[] values() -+++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.MethodRef (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) boolean equals(java.lang.Object) - +++ NEW METHOD: PUBLIC(+) java.lang.String getDescriptor() - +++ NEW METHOD: PUBLIC(+) java.util.Set getFlags() - +++ NEW METHOD: PUBLIC(+) java.lang.String getName() - +++ NEW METHOD: PUBLIC(+) java.util.Set getSources() - +++ NEW METHOD: PUBLIC(+) int hashCode() - +++ NEW METHOD: PUBLIC(+) java.lang.String toString() -+++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.javaagent.tooling.muzzle.references.Source (not serializable) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW CONSTRUCTOR: PUBLIC(+) Source(java.lang.String, int) - +++ NEW METHOD: PUBLIC(+) boolean equals(java.lang.Object) - +++ NEW METHOD: PUBLIC(+) int getLine() - +++ NEW METHOD: PUBLIC(+) java.lang.String getName() - +++ NEW METHOD: PUBLIC(+) int hashCode() - +++ NEW METHOD: PUBLIC(+) java.lang.String toString() From b8f80b29b254309c55895823df1c26366f430a78 Mon Sep 17 00:00:00 2001 From: Nikita Salnikov-Tarnovski Date: Tue, 5 Oct 2021 13:16:08 +0300 Subject: [PATCH 4/4] Polish --- .../src/main/kotlin/otel.japicmp-conventions.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts b/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts index 3afc0ef75c16..4a590d482e7d 100644 --- a/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts +++ b/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts @@ -14,10 +14,10 @@ val latestReleasedVersion: String by lazy { val temp: Configuration = configurations.create("tempConfig") // pick the agent, since it's always there. dependencies.add(temp.name,"io.opentelemetry.javaagent:opentelemetry-javaagent:latest.release") - var moduleVersion = configurations["tempConfig"].resolvedConfiguration.firstLevelModuleDependencies.elementAt(0).moduleVersion + val moduleVersion = configurations["tempConfig"].resolvedConfiguration.firstLevelModuleDependencies.elementAt(0).moduleVersion configurations.remove(temp) - logger.info("Discovered latest release version: " + moduleVersion) + logger.info("Discovered latest release version: $moduleVersion") moduleVersion }