Don't use variables for wrappers

orbinson · Oct 15, 2024 · 03f0a1b · 03f0a1b
1 parent 53e3e93
commit 03f0a1b
Show file tree

Hide file tree

Showing 31 changed files with 229 additions and 352 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,31 +4,96 @@ on:
   workflow_dispatch:
     inputs:
       central:
-        description: 'Release to Maven Central'
+        description: Release to Maven repository
         required: false
         default: true
         type: boolean
       github:
-        description: 'Create GitHub release'
+        description: Create GitHub release
         required: false
         default: true
         type: boolean
       push:
-        description: 'Push changes'
+        description: Push changes
         required: false
         default: true
         type: boolean
 
+permissions:
+  contents: write
+
 jobs:
-  maven-release:
-    uses: orbinson/workflows/.github/workflows/maven-release.yml@main
-    with:
-      java-version: 17
-      central: ${{ inputs.central }}
-      github: ${{ inputs.github }}
-      push: ${{ inputs.push }}
-    secrets:
-      username: ${{ secrets.SONATYPE_USERNAME }}
-      password: ${{ secrets.SONATYPE_PASSWORD }}
-      gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
-      gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+  release:
+    name: Maven and GitHub Release
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Java with Maven repository
+        uses: actions/setup-java@v4
+        with:
+          distribution: zulu
+          java-version: 11
+          cache: maven
+          server-id: ossrh
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE
+
+      - name: Remove SNAPSHOT from version
+        run: mvn --batch-mode versions:set -DremoveSnapshot versions:commit
+
+      - name: Set RELEASE_VERSION environment variable
+        run: |
+          echo "RELEASE_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
+
+      - name: Update CHANGELOG.md
+        uses: thomaseizinger/keep-a-changelog-new-release@v3
+        with:
+          tag: ${{ env.RELEASE_VERSION }}
+
+      - name: Query release info
+        id: query-release-info
+        uses: release-flow/keep-a-changelog-action@v3
+        with:
+          command: query
+          version: latest
+
+      - name: Deploy package
+        if: ${{ inputs.central }}
+        run: mvn --batch-mode deploy --activate-profiles release
+        env:
+          MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+
+      - name: Commit and push release
+        if: ${{ inputs.push }}
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: "Create release ${{ steps.query-release-info.outputs.version }}"
+          tagging_message: ${{ steps.query-release-info.outputs.version }}
+
+      - name: Create release
+        if: ${{ inputs.github }}
+        uses: softprops/action-gh-release@v2
+        with:
+          name: ${{ steps.update-query-release-info.outputs.version }}
+          tag_name: ${{ steps.query-release-info.outputs.version }}
+          body: ${{ steps.query-release-info.outputs.release-notes }}
+
+      - name: Next SNAPSHOT version
+        run: mvn --batch-mode versions:set -DnextSnapshot versions:commit
+
+      - name: Set RELEASE_VERSION env variable
+        run: |
+          echo "RELEASE_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
+
+      - name: Commit and push development version
+        if: ${{ inputs.push }}
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: "Bump development version to ${{ env.RELEASE_VERSION }}"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,9 +7,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [1.0.0] - 2024-10-15
-
 - Add OSGi wrappers for [OpenTelemetry Java](https://github.com/open-telemetry/opentelemetry-java), [OpenTelemetry Java Instrumentation](https://github.com/open-telemetry/opentelemetry-java-instrumentation) and [Semantic Conventions Java](https://github.com/open-telemetry/semantic-conventions-java).
-
-[unreleased]: https://github.com/orbinson/opentelemetry-osgi-wrappers/compare/1.0.0...HEAD
-[1.0.0]: https://github.com/orbinson/opentelemetry-osgi-wrappers/compare/1152e16452c2512f47b89818156e4236faf34dde...1.0.0
diff --git a/README.md b/README.md
@@ -2,10 +2,6 @@
 
 Provide OSGi wrappers for OpenTelemetry artifacts.
 
-Every Maven module maps to a specific GitHub repository in the `open-telemetry` namespace that has a fixed `opentelemetry.groupId` and `opentelemetry.version` that is defined by the code repository.
-
-Example: the `opentelemetry-java` module will contain artifacts that are generated and maintained in the https://github.com/open-telemetry/opentelemetry-java repository. If the repository has a version `1.40.0` the resulting bundle will have version `1.40.0.000` which can still be incremented for bugfixes or issues.
-
 ## OpenTelemetry Java
 
 Bundle with artifacts from the [opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) libraries:

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -30,21 +30,21 @@
 
         <!-- OpenTelemetry -->
         <dependency>
-            <groupId>${opentelemetry.java.groupId}</groupId>
+            <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-api</artifactId>
-            <version>${opentelemetry.java.version}</version>
+            <version>1.43.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>${opentelemetry.java.groupId}</groupId>
+            <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-sdk</artifactId>
-            <version>${opentelemetry.java.version}</version>
+            <version>1.43.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>${opentelemetry.java.groupId}</groupId>
+            <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-sdk-testing</artifactId>
-            <version>${opentelemetry.java.version}</version>
+            <version>1.43.0</version>
         </dependency>
 
         <!-- Testing -->
@@ -78,7 +78,7 @@
                         Export-Package: be.orbinson.osgi.opentelemetry
                         Import-Package: *;resolution:=optional
 
-                        -includeresource: @opentelemetry-sdk-testing-${opentelemetry.java.version}.jar;lib:=true
+                        -includeresource: @opentelemetry-sdk-testing-1.43.0.jar;lib:=true
                    ]]></bnd>
                         </configuration>
                     </execution>
@@ -171,10 +171,11 @@
                                 <frameworkProperties>
                                     <org.osgi.service.http.port>${http.port}</org.osgi.service.http.port>
                                 </frameworkProperties>
-                                <!-- Uncomment to enable debugging of IT tests -->
-<!--                                                                        <vmOptions>-->
-<!--                                                                            <value>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5000</value>-->
-<!--                                                                        </vmOptions>-->
+                                <!-- Uncomment to enable debugging of IT tests
+                                <vmOptions>
+                                <value>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5000</value>
+                                </vmOptions>
+                                -->
                             </launcherArguments>
                             <startTimeoutSeconds>180</startTimeoutSeconds>
                         </launch>

diff --git a/integration-tests/src/main/features/opentelemetry-java-instrumentation.json b/integration-tests/src/main/features/opentelemetry-java-instrumentation.json
@@ -2,15 +2,15 @@
   "id": "${project.groupId}:${project.artifactId}:slingfeature:opentelemetry-java-instrumentation:${project.version}",
   "bundles": [
     {
-      "id": "${project.groupId}:opentelemetry-instrumentation-annotations:${opentelemetry.java.instrumentation.version}.000-SNAPSHOT",
+      "id": "${project.groupId}:opentelemetry-instrumentation-annotations:1.33.6.0000-SNAPSHOT",
       "start-order": 5
     },
     {
-      "id": "${project.groupId}:opentelemetry-instrumentation-api:${opentelemetry.java.instrumentation.version}.000-SNAPSHOT",
+      "id": "${project.groupId}:opentelemetry-instrumentation-api:1.33.6.0000-SNAPSHOT",
       "start-order": 5
     },
     {
-      "id": "${project.groupId}:opentelemetry-logback-appender-1.0:${opentelemetry.java.instrumentation.version}.000-SNAPSHOT",
+      "id": "${project.groupId}:opentelemetry-logback-appender-1.0:1.33.6-alpha.0000-SNAPSHOT",
       "start-order": 5
     }
   ]

diff --git a/integration-tests/src/main/features/opentelemetry-java.json b/integration-tests/src/main/features/opentelemetry-java.json
@@ -2,63 +2,63 @@
   "id": "${project.groupId}:${project.artifactId}:slingfeature:opentelemetry-java:${project.version}",
   "bundles": [
     {
-      "id": "${project.groupId}:opentelemetry-api:${opentelemetry.java.version}.000-SNAPSHOT",
+      "id": "${project.groupId}:opentelemetry-api:1.43.0.0000-SNAPSHOT",
       "start-order": 5
     },
     {
-      "id": "${project.groupId}:opentelemetry-api-incubator:${opentelemetry.java.version}.000-SNAPSHOT",
+      "id": "${project.groupId}:opentelemetry-api-incubator:1.43.0.0000-SNAPSHOT",
       "start-order": 5
     },
     {
-      "id": "${project.groupId}:opentelemetry-context:${opentelemetry.java.version}.000-SNAPSHOT",
+      "id": "${project.groupId}:opentelemetry-context:1.43.0.0000-SNAPSHOT",
       "start-order": 5
     },
     {
-      "id": "${project.groupId}:opentelemetry-sdk:${opentelemetry.java.version}.000-SNAPSHOT",
+      "id": "${project.groupId}:opentelemetry-sdk:1.43.0.0000-SNAPSHOT",
       "start-order": 5
     },
     {
-      "id": "${project.groupId}:opentelemetry-sdk-common:${opentelemetry.java.version}.000-SNAPSHOT",
+      "id": "${project.groupId}:opentelemetry-sdk-common:1.43.0.0000-SNAPSHOT",
       "start-order": 5
     },
     {
-      "id": "${project.groupId}:opentelemetry-sdk-logs:${opentelemetry.java.version}.000-SNAPSHOT",
+      "id": "${project.groupId}:opentelemetry-sdk-logs:1.43.0.0000-SNAPSHOT",
       "start-order": 5
     },
     {
-      "id": "${project.groupId}:opentelemetry-sdk-metrics:${opentelemetry.java.version}.000-SNAPSHOT",
+      "id": "${project.groupId}:opentelemetry-sdk-metrics:1.43.0.0000-SNAPSHOT",
       "start-order": 5
     },
     {
-      "id": "${project.groupId}:opentelemetry-sdk-trace:${opentelemetry.java.version}.000-SNAPSHOT",
+      "id": "${project.groupId}:opentelemetry-sdk-trace:1.43.0.0000-SNAPSHOT",
       "start-order": 5
     },
     {
-      "id": "${project.groupId}:opentelemetry-sdk-extension-autoconfigure:${opentelemetry.java.version}.000-SNAPSHOT",
+      "id": "${project.groupId}:opentelemetry-sdk-extension-autoconfigure:1.43.0.0000-SNAPSHOT",
       "start-order": 5
     },
     {
-      "id": "${project.groupId}:opentelemetry-sdk-extension-autoconfigure-spi:${opentelemetry.java.version}.000-SNAPSHOT",
+      "id": "${project.groupId}:opentelemetry-sdk-extension-autoconfigure-spi:1.43.0.0000-SNAPSHOT",
       "start-order": 5
     },
     {
-      "id": "${project.groupId}:opentelemetry-sdk-extension-incubator:${opentelemetry.java.version}.000-SNAPSHOT",
+      "id": "${project.groupId}:opentelemetry-sdk-extension-incubator:1.43.0.0000-SNAPSHOT",
       "start-order": 5
     },
     {
-      "id": "${project.groupId}:opentelemetry-exporter-common:${opentelemetry.java.version}.000-SNAPSHOT",
+      "id": "${project.groupId}:opentelemetry-exporter-common:1.43.0.0000-SNAPSHOT",
       "start-order": 5
     },
     {
-      "id": "${project.groupId}:opentelemetry-exporter-logging:${opentelemetry.java.version}.000-SNAPSHOT",
+      "id": "${project.groupId}:opentelemetry-exporter-logging:1.43.0.0000-SNAPSHOT",
       "start-order": 5
     },
     {
-      "id": "${project.groupId}:opentelemetry-exporter-otlp:${opentelemetry.java.version}.000-SNAPSHOT",
+      "id": "${project.groupId}:opentelemetry-exporter-otlp:1.43.0.0000-SNAPSHOT",
       "start-order": 5
     },
     {
-      "id": "${project.groupId}:opentelemetry-exporter-otlp-common:${opentelemetry.java.version}.000-SNAPSHOT",
+      "id": "${project.groupId}:opentelemetry-exporter-otlp-common:1.43.0.0000-SNAPSHOT",
       "start-order": 5
     },
     {

diff --git a/integration-tests/src/main/features/otlp-okhttp.json b/integration-tests/src/main/features/otlp-okhttp.json
@@ -2,7 +2,7 @@
   "id": "${project.groupId}:${project.artifactId}:slingfeature:otlp-okhttp:${project.version}",
   "bundles": [
     {
-      "id": "${project.groupId}:opentelemetry-exporter-sender-okhttp:${opentelemetry.java.version}.000-SNAPSHOT",
+      "id": "${project.groupId}:opentelemetry-exporter-sender-okhttp:1.43.0.0000-SNAPSHOT",
       "start-order": 5
     },
     {

diff --git a/integration-tests/src/main/features/semantic-conventions-java.json b/integration-tests/src/main/features/semantic-conventions-java.json
@@ -2,7 +2,7 @@
   "id": "${project.groupId}:${project.artifactId}:slingfeature:opentelemetry-semconv:${project.version}",
   "bundles": [
     {
-      "id": "${project.groupId}:opentelemetry-semconv:${opentelemetry.semconv.version}.000-SNAPSHOT",
+      "id": "${project.groupId}:opentelemetry-semconv:1.27.0-alpha.0000-SNAPSHOT",
       "start-order": 5
     }
   ]

diff --git a/opentelemetry-java-instrumentation/opentelemetry-instrumentation-annotations/pom.xml b/opentelemetry-java-instrumentation/opentelemetry-instrumentation-annotations/pom.xml
@@ -12,20 +12,13 @@
     </parent>
 
     <artifactId>opentelemetry-instrumentation-annotations</artifactId>
-    <version>${opentelemetry.version}.000-SNAPSHOT</version>
-
-
-    <properties>
-        <opentelemetry.groupId>${opentelemetry.java.instrumentation.groupId}</opentelemetry.groupId>
-        <opentelemetry.artifactId>${project.artifactId}</opentelemetry.artifactId>
-        <opentelemetry.version>${opentelemetry.java.instrumentation.version}</opentelemetry.version>
-    </properties>
+    <version>1.33.6.0000-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
-            <groupId>${opentelemetry.groupId}</groupId>
-            <artifactId>${project.artifactId}</artifactId>
-            <version>${opentelemetry.version}</version>
+            <groupId>io.opentelemetry.instrumentation</groupId>
+            <artifactId>opentelemetry-instrumentation-annotations</artifactId>
+            <version>1.33.6</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>

diff --git a/opentelemetry-java-instrumentation/opentelemetry-instrumentation-api/pom.xml b/opentelemetry-java-instrumentation/opentelemetry-instrumentation-api/pom.xml
@@ -12,20 +12,13 @@
     </parent>
 
     <artifactId>opentelemetry-instrumentation-api</artifactId>
-    <version>${opentelemetry.version}.000-SNAPSHOT</version>
-
-
-    <properties>
-        <opentelemetry.groupId>${opentelemetry.java.instrumentation.groupId}</opentelemetry.groupId>
-        <opentelemetry.artifactId>${project.artifactId}</opentelemetry.artifactId>
-        <opentelemetry.version>${opentelemetry.java.instrumentation.version}</opentelemetry.version>
-    </properties>
+    <version>1.33.6.0000-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
-            <groupId>${opentelemetry.groupId}</groupId>
-            <artifactId>${project.artifactId}</artifactId>
-            <version>${opentelemetry.version}</version>
+            <groupId>io.opentelemetry.instrumentation</groupId>
+            <artifactId>opentelemetry-instrumentation-api</artifactId>
+            <version>1.33.6</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>

diff --git a/opentelemetry-java-instrumentation/opentelemetry-logback-appender-1.0/pom.xml b/opentelemetry-java-instrumentation/opentelemetry-logback-appender-1.0/pom.xml
@@ -12,20 +12,13 @@
     </parent>
 
     <artifactId>opentelemetry-logback-appender-1.0</artifactId>
-    <version>${opentelemetry.version}.000-SNAPSHOT</version>
-
-
-    <properties>
-        <opentelemetry.groupId>${opentelemetry.java.instrumentation.groupId}</opentelemetry.groupId>
-        <opentelemetry.artifactId>${project.artifactId}</opentelemetry.artifactId>
-        <opentelemetry.version>${opentelemetry.java.instrumentation.version}</opentelemetry.version>
-    </properties>
+    <version>1.33.6-alpha.0000-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
-            <groupId>${opentelemetry.groupId}</groupId>
-            <artifactId>${project.artifactId}</artifactId>
-            <version>${opentelemetry.version}-alpha</version>
+            <groupId>io.opentelemetry.instrumentation</groupId>
+            <artifactId>opentelemetry-logback-appender-1.0</artifactId>
+            <version>1.33.6-alpha</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>

diff --git a/opentelemetry-java-instrumentation/pom.xml b/opentelemetry-java-instrumentation/pom.xml
@@ -14,11 +14,6 @@
     <artifactId>opentelemetry-java-instrumentation</artifactId>
     <packaging>pom</packaging>
 
-    <properties>
-        <opentelemetry.groupId>${opentelemetry.java.instrumentation.groupId}</opentelemetry.groupId>
-        <opentelemetry.version>${opentelemetry.java.instrumentation.version}</opentelemetry.version>
-    </properties>
-
     <modules>
         <module>opentelemetry-instrumentation-annotations</module>
         <module>opentelemetry-instrumentation-api</module>