Sync gradle-plugins version with main project #4248

trask · 2021-09-29T23:13:26Z

I think releasing these simultaneously is important for the next release, since we are doing composite build + dependency substitution now, it seems like without this it would be easy for the substituted local dependency to drift from the published version that extension authors use(?)

btw, I tried but failed to get nebula working in gradle-plugins because it's not in the git root, and git.root can't be relative, and what I really want is to set it in the gradle file so that you don't have to always specify it on the command line, but I couldn't figure out how to do that...

anuraaga · 2021-09-30T02:47:04Z

For the plugins, since they aren't published on the main build and the automatic tag based versioning isn't needed there, does it make sense to just read the system property we set directly?

trask · 2021-10-05T22:34:40Z

For the plugins, since they aren't published on the main build and the automatic tag based versioning isn't needed there, does it make sense to just read the system property we set directly?

@anuraaga here's an attempt at this: 222935a, the examples projects still require some hard-coding or coordination (composite? 😬)

anuraaga · 2021-10-08T03:31:35Z

.github/workflows/ci.yml

        # javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
        run: ./gradlew publishToMavenLocal -x javadoc

+      - name: Local publish of gradle plugins
+        run: ../gradlew publishToMavenLocal -Pversion=1.7.0-alpha-SNAPSHOT


It looks like the new feature is this publishToMavenLocal, which we don't like due to the version requirement (and not being able to nebula the version).

It may work to do something like this in the examples settings.gradle

if (gradle.startParameters["includeGradlePlubins"]) { includeBuild("../gradle-plugins") { dependencySubstitution { substitute(module("io.opentelemetry.instrumentation.muzzle-generation:io.opentelemetry.instrumentation.muzzle-generation.gradle.plugin")).using(project(":")) substitute(module("io.opentelemetry.instrumentation.muzzle-check:io.opentelemetry.instrumentation.muzzle-check.gradle.plugin")).using(project(":")) } }

a bit similar to https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/conventions/settings.gradle.kts#L1 but allowing examples to still build independently too.

trask · 2021-10-18T00:26:13Z

it seems to be working 🤞🤞

i figure this will break the release build somehow, but we need a release to test it, so may as well be this one 😭🤷‍♂️

trask · 2021-10-18T00:50:35Z

ptal at the changes to the release instructions in case you have idea how to avoid any steps

iNikem · 2021-10-18T07:02:51Z

.github/scripts/local.init.gradle.kts

+  }
+
+  if (this.rootProject.name != "gradle-plugins") {
+    includeBuild("../../gradle-plugins") {


Why do we need to include gradle-plugins to all projects? Plugins are only used from conventions project and they are already included there.

this file is only used when building the examples projects

trask · 2021-10-19T18:48:01Z

Discussed in SIG meeting, using composite build defeats part of the purpose of the examples build which ensures (locally) published artifacts work. So instead, decided to remove nebula and manually increment version since that should resolve, and seems needed for #3516 anyways.

…-version

trask · 2021-10-20T02:27:31Z

This is ready for a fresh look

mateuszrzeszutek · 2021-10-20T07:50:58Z

RELEASING.md

+  * build.gradle.kts
+  * gradle-plugins/build.gradle.kts


Nit: WDYT about keeping the version in some version.properties file that could be reused by all projects involved in the composite build?

…-version

trask · 2021-10-20T20:42:16Z

@anuraaga or @iNikem would be great to get one more review on this, thx

iNikem · 2021-10-21T05:30:26Z

.github/workflows/pr.yml

@@ -253,8 +253,6 @@ jobs:

  examples:
    runs-on: ubuntu-latest
-    # When we make PR against pre-release branch examples may point to yet-unpublished version
-    if: github.base_ref == 'main'


Why is this not needed any more?

I was thinking now that we will remove -SNAPSHOT from artifact version at the same time, the locally published artifacts won't have -SNAPSHOT, and so this will work... I could definitely be wrong...

iNikem · 2021-10-21T05:33:59Z

conventions/build.gradle.kts

@@ -29,8 +29,8 @@ dependencies {
  implementation(gradleApi())
  implementation(localGroovy())

-  implementation("io.opentelemetry.instrumentation.muzzle-generation:io.opentelemetry.instrumentation.muzzle-generation.gradle.plugin:0.8.0")
-  implementation("io.opentelemetry.instrumentation.muzzle-check:io.opentelemetry.instrumentation.muzzle-check.gradle.plugin:0.8.0")
+  implementation("io.opentelemetry.instrumentation.muzzle-generation:io.opentelemetry.instrumentation.muzzle-generation.gradle.plugin:${version}")


conventions always include plugins as composite, probably can skip version altogether.

…-version

trask · 2021-10-28T00:46:14Z

I must have hit close instead of merge by accident 😩

…-version

mateuszrzeszutek · 2021-10-29T16:38:53Z

What's the plan this PR? Is there anything that's blocking it from being merged?

I just tried to update our distro to SNAPSHOT versions and I got the following error when running muzzle codegen:

Caused by: java.lang.AbstractMethodError: Receiver class io.opentelemetry.javaagent.tooling.muzzle.generation.MuzzleCodeGenerator does not define or inherit an implementation of the resolved method 'abstract net.bytebuddy.jar.asm.ClassVisitor wrap(net.bytebuddy.description.type.TypeDescription, net.bytebuddy.jar.asm.ClassVisitor, net.bytebuddy.implementation.Implementation$Context, net.bytebuddy.pool.TypePool, net.bytebuddy.description.field.FieldList, net.bytebuddy.description.method.MethodList, int, int)' of interface net.bytebuddy.asm.AsmVisitorWrapper.

We need to either merge this PR or bump the muzzle plugins' version to 0.9.0-SNAPSHOT to fix that.

trask · 2021-10-29T17:35:38Z

What's the plan this PR? Is there anything that's blocking it from being merged?

sorry, I thought I had merged it a while ago 😭

* Sync gradle-plugins version with main project * More fixes * Can rely on examples build against all branches now? * Use common version.gradle.kts * Update doc * Simplify

anuraaga reviewed Oct 8, 2021

View reviewed changes

trask force-pushed the sync-gradle-plugins-version branch from 222935a to 6401984 Compare October 17, 2021 23:58

trask marked this pull request as ready for review October 18, 2021 00:21

trask requested review from iNikem, jkwatson, laurit, mateuszrzeszutek, pavolloffay and tylerbenson as code owners October 18, 2021 00:21

trask mentioned this pull request Oct 18, 2021

Use byte-buddy-dep instead of byte-buddy #4400

Merged

iNikem reviewed Oct 18, 2021

View reviewed changes

mateuszrzeszutek mentioned this pull request Oct 18, 2021

Prepare gradle-plugins for 0.8.0 release #4184

Closed

trask marked this pull request as draft October 19, 2021 20:58

trask force-pushed the sync-gradle-plugins-version branch 2 times, most recently from d5335e8 to 6a2f68b Compare October 19, 2021 21:28

Sync gradle-plugins version with main project

5c53d70

trask force-pushed the sync-gradle-plugins-version branch from 6a2f68b to 5c53d70 Compare October 19, 2021 22:20

trask mentioned this pull request Oct 19, 2021

Fix examples build #4431

Merged

trask added 3 commits October 19, 2021 16:53

Merge remote-tracking branch 'upstream/main' into sync-gradle-plugins…

c248d2a

…-version

More fixes

7db76b4

Can rely on examples build against all branches now?

5f2d443

trask marked this pull request as ready for review October 20, 2021 02:27

mateuszrzeszutek approved these changes Oct 20, 2021

View reviewed changes

Merge remote-tracking branch 'upstream/main' into sync-gradle-plugins…

43646e1

…-version

trask added 2 commits October 20, 2021 12:55

Use common version.gradle.kts

c968484

Update doc

06c81a5

iNikem approved these changes Oct 21, 2021

View reviewed changes

trask added 2 commits October 21, 2021 11:04

Merge remote-tracking branch 'upstream/main' into sync-gradle-plugins…

1926301

…-version

Simplify

acb827a

trask closed this Oct 24, 2021

trask deleted the sync-gradle-plugins-version branch October 24, 2021 20:37

trask restored the sync-gradle-plugins-version branch October 28, 2021 00:46

trask reopened this Oct 28, 2021

Merge remote-tracking branch 'upstream/main' into sync-gradle-plugins…

7709189

…-version

trask merged commit 37e24ec into open-telemetry:main Oct 29, 2021

trask deleted the sync-gradle-plugins-version branch October 29, 2021 17:34

mateuszrzeszutek mentioned this pull request Nov 4, 2021

Failure to publish plugins on patch release #4585

Closed

This was referenced Nov 19, 2021

Fix memory leak when using ktor-client-java #4637

Merged

Inconsistencies with version tags #3516

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync gradle-plugins version with main project #4248

Sync gradle-plugins version with main project #4248

trask commented Sep 29, 2021 •

edited

Loading

anuraaga commented Sep 30, 2021

trask commented Oct 5, 2021

anuraaga Oct 8, 2021

trask commented Oct 18, 2021

trask commented Oct 18, 2021

iNikem Oct 18, 2021

trask Oct 18, 2021

trask commented Oct 19, 2021

trask commented Oct 20, 2021

mateuszrzeszutek Oct 20, 2021

trask commented Oct 20, 2021

iNikem Oct 21, 2021

trask Oct 21, 2021

iNikem Oct 21, 2021

trask Oct 21, 2021

trask commented Oct 28, 2021

mateuszrzeszutek commented Oct 29, 2021

trask commented Oct 29, 2021

Sync gradle-plugins version with main project #4248

Sync gradle-plugins version with main project #4248

Conversation

trask commented Sep 29, 2021 • edited Loading

anuraaga commented Sep 30, 2021

trask commented Oct 5, 2021

Choose a reason for hiding this comment

trask commented Oct 18, 2021

trask commented Oct 18, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

trask commented Oct 19, 2021

trask commented Oct 20, 2021

Choose a reason for hiding this comment

trask commented Oct 20, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

trask commented Oct 28, 2021

mateuszrzeszutek commented Oct 29, 2021

trask commented Oct 29, 2021

trask commented Sep 29, 2021 •

edited

Loading