Fix instrumentation publications (#926)

* Reorganizing instrumentation subprojects

* Updating README

* Updating instrumentation subproject artifact ids

* Updating instrumentation artifact names without subprojects

* Updating comments

* Updating readmes

* Updating CONTRIBUTING.md

* Updating comments

* Renaming okhttp to okhttp3

Author: LikeTheSalad

CONTRIBUTING.md

@@ -84,4 +84,4 @@ instrumentation/
 ```
 
 You can take a look at how it's done for the OkHttp
-instrumentation [here](./instrumentation/okhttp/okhttp-3.0) for reference.
+instrumentation [here](instrumentation/okhttp3) for reference.

buildSrc/src/main/kotlin/otel.publish-conventions.gradle.kts

@@ -35,7 +35,9 @@ if (android != null) {
 afterEvaluate {
     publishing.publications {
         val maven = create<MavenPublication>("maven") {
-            artifactId = computeArtifactId()
+            val path = project.path
+            artifactId = computeArtifactId(path)
+            groupId = computeGroupId(path)
             if (android != null) {
                 from(components.findByName(androidVariantToRelease))
             } else {
@@ -83,21 +85,38 @@ afterEvaluate {
     }
 }
 
-fun computeArtifactId(): String {
-    val path = project.path
-    if (!path.contains("instrumentation")) {
+fun computeArtifactId(path: String): String {
+    val projectName = project.name
+    if (!path.startsWith(":instrumentation:")) {
         // Return default artifactId for non auto-instrumentation publications.
-        return project.name
+        return projectName
     }
 
-    // Adding library name to its related auto-instrumentation subprojects.
-    // For example, prepending "okhttp-3.0-" to both the "library" and "agent" subprojects inside the "okhttp-3.0" folder.
-    val match = Regex("[^:]+:[^:]+\$").find(path)
-    var artifactId = match!!.value.replace(":", "-")
-    if (!artifactId.startsWith("instrumentation-")) {
-        artifactId = "instrumentation-$artifactId"
+    val match = Regex("^:instrumentation:([^:]+)(:[^:]+)?\$").matchEntire(path)
+        ?: throw IllegalStateException("Invalid instrumentation path: '$path'")
+
+    if (match.groupValues[2].isEmpty()) {
+        // This is not an instrumentation subproject.
+        return projectName
     }
 
+    val instrumentationName = match.groupValues[1].replace(":", "")
+    val instrumentationSubprojectName = match.groupValues[2].replace(":", "")
+
+    // Adding instrumentation name to its related subprojects.
+    // For example, prepending "okhttp-" to both the "library" and "agent" subprojects inside the "okhttp" folder.
+    val artifactId = "$instrumentationName-$instrumentationSubprojectName"
+
     logger.debug("Using artifact id: '{}' for subproject: '{}'", artifactId, path)
     return artifactId
 }
+
+fun computeGroupId(path: String): String {
+    val groupId = project.group.toString()
+    if (!path.startsWith(":instrumentation:")) {
+        // Return default groupId for non instrumentation publications.
+        return groupId
+    }
+
+    return "$groupId.instrumentation"
+}

instrumentation/httpurlconnection/README.md

@@ -54,8 +54,8 @@ plugins {
 #### Project dependencies
 
 ```kotlin
-implementation("io.opentelemetry.android:httpurlconnection-library:AUTO_HTTP_URL_INSTRUMENTATION_VERSION")
-byteBuddy("io.opentelemetry.android:httpurlconnection-agent:AUTO_HTTP_URL_INSTRUMENTATION_VERSION")
+implementation("io.opentelemetry.android.instrumentation:httpurlconnection-library:AUTO_HTTP_URL_INSTRUMENTATION_VERSION")
+byteBuddy("io.opentelemetry.android.instrumentation:httpurlconnection-agent:AUTO_HTTP_URL_INSTRUMENTATION_VERSION")
 ```
 
 ### Configurations

…socket/okhttp-3.0/agent/build.gradle.kts …okhttp3-websocket/agent/build.gradle.ktsinstrumentation/okhttp/websocket/okhttp-3.0/agent/build.gradle.kts renamed to instrumentation/okhttp3-websocket/agent/build.gradle.kts instrumentation/okhttp/websocket/okhttp-3.0/agent/build.gradle.kts renamed to instrumentation/okhttp3-websocket/agent/build.gradle.kts

@@ -10,7 +10,7 @@ android {
 }
 
 dependencies {
-    implementation(project(":instrumentation:okhttp:websocket:okhttp-3.0:library"))
+    implementation(project(":instrumentation:okhttp3-websocket:library"))
     compileOnly(libs.okhttp)
     implementation(libs.byteBuddy)
 }