Merge branch 'main' into inferred-spans-upstream

Author: JonasKunz

.github/dependabot.yml

@@ -15,18 +15,3 @@ updates:
       github-actions:
         patterns:
           - "*"
-
-  # Gradle
-  - package-ecosystem: "gradle"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 10
-    ignore:
-      # upstream dependencies that need to be updated in sync and with manual control
-      - dependency-name: "io.opentelemetry.javaagent:*"
-      - dependency-name: "io.opentelemetry.instrumentation:*"
-      - dependency-name: "io.opentelemetry.contrib:*"
-      - dependency-name: "io.opentelemetry:*"
-      # Newer Mockito versions don't support java 8 anymore
-      - dependency-name: "org.mockito:mockito-core"

.github/workflows/labeler.yml

@@ -30,7 +30,7 @@ jobs:
         username: ${{ github.actor }}
         token: ${{ secrets.APM_TECH_USER_TOKEN }}
     - name: Add community and triage lables
-      if: contains(steps.is_elastic_member.outputs.result, 'false') && github.actor != 'dependabot[bot]'
+      if: contains(steps.is_elastic_member.outputs.result, 'false') && github.actor != 'dependabot[bot]' && github.actor != 'elastic-renovate-prod[bot]'
       uses: actions/github-script@v7
       with:
         script: |
@@ -41,7 +41,7 @@ jobs:
             labels: ["community", "triage"]
           })
     - name: Add comment for community PR
-      if: contains(steps.is_elastic_member.outputs.result, 'false') && github.actor != 'dependabot[bot]'
+      if: contains(steps.is_elastic_member.outputs.result, 'false') && github.actor != 'dependabot[bot]' && github.actor != 'elastic-renovate-prod[bot]'
       uses: wow-actions/auto-comment@v1
       with:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

agent/entrypoint/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-  id("java")
+  id("elastic-otel.java-conventions")
 }
 
 dependencies {

agentextension/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-  id("java")
+  id("elastic-otel.java-conventions")
   id("elastic-otel.sign-and-publish-conventions")
   id("com.github.johnrengelman.shadow")
 }

bootstrap/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-  java
+  id("elastic-otel.java-conventions")
 }
 
 dependencies {

build.gradle

@@ -0,0 +1,54 @@
+import java.io.FileInputStream
+import java.nio.file.Paths
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
+
+plugins {
+  alias(catalog.plugins.nexusPublish)
+}
+
+val versionProperties = java.util.Properties()
+versionProperties.load(FileInputStream(file("version.properties")))
+
+group = "co.elastic.otel"
+version = versionProperties.get("version").toString()
+description = "Elastic Distribution for OpenTelemetry Java"
+
+defaultTasks("agent:assemble")
+
+subprojects {
+  group = rootProject.group
+  version = rootProject.version
+}
+
+nexusPublishing {
+  repositories {
+    sonatype()
+  }
+}
+
+tasks {
+
+  register("currentVersion") {
+    doLast {
+      println(project.version)
+    }
+  }
+
+  register("setVersion") {
+    doLast {
+      val versionFile = file("version.properties")
+      versionFile.writeText("version=${project.property("newVersion")}\n")
+    }
+  }
+
+  register("setNextVersion") {
+    doLast {
+      val semVer = "\\d+\\.\\d+\\.\\d+".toRegex().find(version.toString())!!.value;
+      val nums = semVer.split('.');
+
+      val versionFile = file("version.properties")
+      versionFile.writeText("version=${nums[0]}.${nums[1]}.${nums[2].toInt() + 1}-SNAPSHOT\n")
+    }
+  }
+}

build.gradle.kts

@@ -7,7 +7,7 @@ import org.objectweb.asm.ClassWriter
 import org.objectweb.asm.Opcodes
 
 plugins {
-  id("java")
+  id("elastic-otel.java-conventions")
   id("com.github.johnrengelman.shadow")
 }
 

buildSrc/src/main/kotlin/elastic-otel.agent-packaging-conventions.gradle.kts

@@ -1,12 +1,59 @@
 plugins {
-  id("java")
+  java
+  id("elastic-otel.spotless-conventions")
 }
 
+java {
+  withJavadocJar()
+  withSourcesJar()
+}
+
+repositories {
+  mavenLocal()
+  mavenCentral()
+  maven {
+    name = "mavenCentralSnapshots"
+    url = uri("https://oss.sonatype.org/content/repositories/snapshots")
+  }
+}
+
+//https://github.com/gradle/gradle/issues/15383
+val catalog = extensions.getByType<VersionCatalogsExtension>().named("catalog")
+dependencies {
+
+  implementation(platform(catalog.findLibrary("opentelemetryInstrumentationAlphaBom").get()))
+
+  annotationProcessor(catalog.findLibrary("autoservice.processor").get())
+  compileOnly(catalog.findLibrary("autoservice.annotations").get())
+  compileOnly(catalog.findLibrary("findbugs.jsr305").get())
+
+  testAnnotationProcessor(catalog.findLibrary("autoservice.processor").get())
+  testCompileOnly(catalog.findLibrary("autoservice.annotations").get())
+  testCompileOnly(catalog.findLibrary("findbugs.jsr305").get())
+  testImplementation(catalog.findLibrary("assertj.core").get())
+  testImplementation(catalog.findLibrary("awaitility").get())
+  testImplementation(catalog.findLibrary("mockito").get())
+  testImplementation(enforcedPlatform(catalog.findLibrary("junitBom").get()))
+  testImplementation("org.junit.jupiter:junit-jupiter")
+}
+
+tasks {
+  test {
+    useJUnitPlatform()
+  }
+
+  compileJava {
+    options.release.set(8)
+  }
+  compileTestJava {
+    options.release.set(8)
+  }
+}
+
+
 interface JavaVersionTestingExtension {
   /**
-   * By default the convention will publish the artifacts and pom as libraries.
-   * To override the behaviour provide the tasks producing the artifacts as this property.
-   * This should only be required when publishing fat-jars with custom packaging.
+   * This option can be set to false to disable testing with openj9 on this project
    */
   val enableTestsOnOpenJ9: Property<Boolean>
 }

buildSrc/src/main/kotlin/elastic-otel.java-conventions.gradle.kts

@@ -0,0 +1,18 @@
+plugins {
+  id("com.diffplug.spotless")
+}
+
+spotless {
+  java {
+    target("src/**/*.java")
+    googleJavaFormat()
+
+    licenseHeaderFile(rootProject.file("buildscripts/spotless.license.java"), "(package|import|public)")
+      .named("default")
+
+    licenseHeaderFile(rootProject.file("buildscripts/spotless.reallogic.license.java"), "(package|import|public)")
+      .named("reallogic")
+      .onlyIfContentMatches("package co.elastic.otel.profiler.collections;")
+
+  }
+}

buildSrc/src/main/kotlin/elastic-otel.spotless-conventions.gradle.kts

@@ -7,26 +7,19 @@ plugins {
 description = "Elastic common utilities for OpenTelemetry Java"
 
 dependencies {
-    annotationProcessor(libs.autoservice.processor)
     api("com.blogspot.mydailyjava:weak-lock-free:0.18")
-    compileOnly(libs.autoservice.annotations)
     compileOnly("io.opentelemetry:opentelemetry-sdk")
-    compileOnly(libs.findbugs.jsr305)
     compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
     implementation(libs.bundles.semconv)
 
     compileOnly(libs.contribSpanStacktrace)
     testImplementation(libs.contribSpanStacktrace)
 
-    testAnnotationProcessor(libs.autoservice.processor)
-    testCompileOnly(libs.autoservice.annotations)
-    testCompileOnly(libs.findbugs.jsr305)
     testImplementation("io.opentelemetry:opentelemetry-sdk")
     testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
     testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
     testImplementation(project(":testing-common"))
     testImplementation("io.opentelemetry:opentelemetry-exporter-otlp")
     testImplementation("io.opentelemetry:opentelemetry-exporter-logging")
     testImplementation("io.opentelemetry:opentelemetry-api-incubator")
-    testImplementation(libs.assertj.core)
 }

common/build.gradle.kts

@@ -19,9 +19,6 @@ dependencies {
   }
   testImplementation(libs.contribSpanStacktrace)
 
-  annotationProcessor(libs.autoservice.processor)
-  compileOnly(libs.autoservice.annotations)
-
   // needs to be added in order to allow access to AgentListener interface
   // this is currently required because autoconfigure is currently not exposed to the extension API.
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
@@ -36,12 +33,8 @@ dependencies {
   }
   testImplementation(libs.bundles.semconv)
 
-  testAnnotationProcessor(libs.autoservice.processor)
-  testCompileOnly(libs.autoservice.annotations)
-
   testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
-  testImplementation(libs.assertj.core)
   testImplementation(libs.freemarker)
 }
 tasks.withType<Test> {