Update to v2.1.1 of OpenTelemetry-swift-core (#917)

ArielDemarco · web-flow · commit b9af129083a1 · 2025-09-10T18:03:52.000-03:00
* Added script and github action to make this process seamless

* Bumped to 2.1.0 (test)

* Updated to 2.1.1

* Using the right secret + using specific github action versions
diff --git a/.github/workflows/update-core-dependencies.yml b/.github/workflows/update-core-dependencies.yml
@@ -0,0 +1,76 @@
+name: Update Core Dependencies
+
+on:
+  workflow_dispatch:
+    inputs:
+      core_version:
+        description: 'OpenTelemetry-swift-core version to update to'
+        required: true
+        type: string
+      create_pr:
+        description: 'Create pull request with changes'
+        required: false
+        default: true
+        type: boolean
+
+jobs:
+  update-dependencies:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Validate version format
+        run: |
+          if [[ ! "${{ github.event.inputs.core_version }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.-]+)?(\+[a-zA-Z0-9.-]+)?$ ]]; then
+            echo "Error: Version must follow semantic versioning"
+            exit 1
+          fi
+
+      - name: Update dependencies
+        run: |
+          ./Scripts/versioning/update_core_dependencies.sh "${{ github.event.inputs.core_version }}"
+
+      - name: Check for changes
+        id: changes
+        run: |
+          if [[ -n $(git diff --name-only) ]]; then
+            echo "has_changes=true" >> $GITHUB_OUTPUT
+          else
+            echo "has_changes=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Create Pull Request
+        if: steps.changes.outputs.has_changes == 'true' && github.event.inputs.create_pr == 'true'
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
+        with:
+          token: ${{ secrets.RELEASE_TOKEN }}
+          commit-message: |
+            Update opentelemetry-swift-core dependencies to ${{ github.event.inputs.core_version }}
+            
+            - Updated Package.swift dependency version
+            - Updated all .podspec files with new core dependency versions
+          title: "Update core dependencies to ${{ github.event.inputs.core_version }}"
+          body: |
+            This PR updates the openTelemetry-swift-core dependencies to version `${{ github.event.inputs.core_version }}`.
+
+            ## Changes
+            - Updated `Package.swift` to use core version `${{ github.event.inputs.core_version }}`
+            - Updated all `.podspec` files to reference core dependencies at version `${{ github.event.inputs.core_version }}`
+
+            Auto-generated by update-core-dependencies workflow.
+          branch: update-core-deps-${{ github.event.inputs.core_version }}
+          delete-branch: true
+
+      - name: Output result
+        run: |
+          if [[ "${{ steps.changes.outputs.has_changes }}" == "true" ]]; then
+            echo "Dependencies updated to version ${{ github.event.inputs.core_version }}"
+            if [[ "${{ github.event.inputs.create_pr }}" == "true" ]]; then
+              echo "Pull request created"
+            else
+              echo "Changes committed but no PR created"
+            fi
+          else
+            echo "No changes detected - dependencies might already be at version ${{ github.event.inputs.core_version }}"
+          fi
diff --git a/OpenTelemetry-Swift-BaggagePropagationProcessor.podspec b/OpenTelemetry-Swift-BaggagePropagationProcessor.podspec
@@ -18,8 +18,8 @@ Pod::Spec.new do |spec|
   spec.visionos.deployment_target = "1.0"
   spec.module_name = "BaggagePropagationProcessor"
 
-  spec.dependency 'OpenTelemetry-Swift-Api', spec.version.to_s
-  spec.dependency 'OpenTelemetry-Swift-Sdk', spec.version.to_s
+  spec.dependency 'OpenTelemetry-Swift-Api', '~> 2.1.1'
+  spec.dependency 'OpenTelemetry-Swift-Sdk', '~> 2.1.1'
   spec.pod_target_xcconfig = { "OTHER_SWIFT_FLAGS" => "-module-name BaggagePropagationProcessor -package-name opentelemetry_swift_baggage_propagation_processor" }
 
 end
diff --git a/OpenTelemetry-Swift-Instrumentation-NetworkStatus.podspec b/OpenTelemetry-Swift-Instrumentation-NetworkStatus.podspec
@@ -20,7 +20,7 @@ Pod::Spec.new do |spec|
 
   spec.ios.frameworks = 'CoreTelephony'
 
-  spec.dependency 'OpenTelemetry-Swift-Api', spec.version.to_s
+  spec.dependency 'OpenTelemetry-Swift-Api', '~> 2.1.1'
   spec.pod_target_xcconfig = { "OTHER_SWIFT_FLAGS" => "-module-name NetworkStatus -package-name opentelemetry_swift_network_status" }
 
 end
diff --git a/OpenTelemetry-Swift-Instrumentation-URLSession.podspec b/OpenTelemetry-Swift-Instrumentation-URLSession.podspec
@@ -19,7 +19,7 @@ Pod::Spec.new do |spec|
   spec.module_name = "URLSession"
 
   spec.dependency 'OpenTelemetry-Swift-Instrumentation-NetworkStatus', spec.version.to_s
-  spec.dependency 'OpenTelemetry-Swift-Sdk', spec.version.to_s
+  spec.dependency 'OpenTelemetry-Swift-Sdk', '~> 2.1.1'
   spec.pod_target_xcconfig = { "OTHER_SWIFT_FLAGS" => "-module-name URLSession -package-name opentelemetry_swift_urlsession" }
 
 end
diff --git a/OpenTelemetry-Swift-PersistenceExporter.podspec b/OpenTelemetry-Swift-PersistenceExporter.podspec
@@ -18,7 +18,7 @@ Pod::Spec.new do |spec|
   spec.visionos.deployment_target = "1.0"
   spec.module_name = "PersistenceExporter"
 
-  spec.dependency 'OpenTelemetry-Swift-Sdk', spec.version.to_s
+  spec.dependency 'OpenTelemetry-Swift-Sdk', '~> 2.1.1'
   spec.pod_target_xcconfig = { "OTHER_SWIFT_FLAGS" => "-module-name PersistenceExporter -package-name opentelemetry_swift_persistence_exporter" }
 
 end
diff --git a/OpenTelemetry-Swift-Protocol-Exporter-Common.podspec b/OpenTelemetry-Swift-Protocol-Exporter-Common.podspec
@@ -18,8 +18,8 @@ Pod::Spec.new do |spec|
   spec.visionos.deployment_target = "1.0"
   spec.module_name = "OpenTelemetryProtocolExporterCommon"
 
-  spec.dependency 'OpenTelemetry-Swift-Api', spec.version.to_s
-  spec.dependency 'OpenTelemetry-Swift-Sdk', spec.version.to_s
+  spec.dependency 'OpenTelemetry-Swift-Api', '~> 2.1.1'
+  spec.dependency 'OpenTelemetry-Swift-Sdk', '~> 2.1.1'
   spec.dependency 'SwiftProtobuf', '~> 1.28'
   spec.pod_target_xcconfig = { "OTHER_SWIFT_FLAGS" => "-module-name OpenTelemetryProtocolExporterCommon -package-name opentelemetry_swift_exporter_common" }
 
diff --git a/OpenTelemetry-Swift-Protocol-Exporter-Http.podspec b/OpenTelemetry-Swift-Protocol-Exporter-Http.podspec
@@ -18,8 +18,8 @@ Pod::Spec.new do |spec|
   spec.visionos.deployment_target = "1.0"
   spec.module_name = "OpenTelemetryProtocolExporterHttp"
 
-  spec.dependency 'OpenTelemetry-Swift-Api', spec.version.to_s
-  spec.dependency 'OpenTelemetry-Swift-Sdk', spec.version.to_s
+  spec.dependency 'OpenTelemetry-Swift-Api', '~> 2.1.1'
+  spec.dependency 'OpenTelemetry-Swift-Sdk', '~> 2.1.1'
   spec.dependency 'OpenTelemetry-Swift-Protocol-Exporter-Common', spec.version.to_s
   spec.dependency 'SwiftProtobuf', '~> 1.28'
   spec.pod_target_xcconfig = { "OTHER_SWIFT_FLAGS" => "-module-name OpenTelemetryProtocolExporterHttp -package-name opentelemetry_swift_exporter_http" }
diff --git a/OpenTelemetry-Swift-SdkResourceExtension.podspec b/OpenTelemetry-Swift-SdkResourceExtension.podspec
@@ -18,8 +18,8 @@ Pod::Spec.new do |spec|
   spec.visionos.deployment_target = "1.0"
   spec.module_name = "ResourceExtension"
 
-  spec.dependency 'OpenTelemetry-Swift-Api', spec.version.to_s
-  spec.dependency 'OpenTelemetry-Swift-Sdk', spec.version.to_s
+  spec.dependency 'OpenTelemetry-Swift-Api', '~> 2.1.1'
+  spec.dependency 'OpenTelemetry-Swift-Sdk', '~> 2.1.1'
   spec.pod_target_xcconfig = { "OTHER_SWIFT_FLAGS" => "-module-name ResourceExtension -package-name opentelemetry_swift_resource_extension" }
 
 end
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -28,7 +28,7 @@ let package = Package(
     .executable(name: "StableMetricSample", targets: ["StableMetricSample"])
   ],
   dependencies: [
-    .package(url: "https://github.com/open-telemetry/opentelemetry-swift-core.git", from: "1.0.0"),
+    .package(url: "https://github.com/open-telemetry/opentelemetry-swift-core.git", from: "2.1.1"),
     .package(url: "https://github.com/apple/swift-nio.git", from: "2.86.0"),
     .package(url: "https://github.com/grpc/grpc-swift.git", exact: "1.26.1"),
     .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.30.0"),
diff --git a/Scripts/versioning/update_core_dependencies.sh b/Scripts/versioning/update_core_dependencies.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# Script to update OpenTelemetry-swift-core dependency versions
+# Usage: ./update_core_dependencies.sh <new_version>
+# Example: ./update_core_dependencies.sh 1.2.0
+
+set -e
+
+if [ $# -eq 0 ]; then
+    echo "Error: Must provide new opentelemetry-swift-core version"
+    echo "Usage: $0 <new_version>"
+    echo "Example: $0 1.2.0"
+    exit 1
+fi
+
+NEW_VERSION=$1
+
+# Validate semantic version format (accepts prereleases)
+if [[ ! $NEW_VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.-]+)?(\+[a-zA-Z0-9.-]+)?$ ]]; then
+    echo "Error: Version must follow semantic versioning (e.g., 1.2.3, 1.0.0-beta.1)"
+    exit 1
+fi
+
+echo "Updating opentelemetry-swift-core dependencies to version $NEW_VERSION"
+
+# Update Package.swift
+echo "Updating Package.swift..."
+sed -i '' "s|.package(url: \"https://github.com/open-telemetry/opentelemetry-swift-core.git\", from: \".*\")|.package(url: \"https://github.com/open-telemetry/opentelemetry-swift-core.git\", from: \"$NEW_VERSION\")|" Package.swift
+
+# Update all .podspec files
+PODSPEC_FILES=$(find . -maxdepth 1 -name "*.podspec")
+PODSPEC_COUNT=$(echo "$PODSPEC_FILES" | wc -l | tr -d ' ')
+
+echo "Updating $PODSPEC_COUNT .podspec files..."
+
+for podspec in $PODSPEC_FILES; do
+    sed -i '' "s|spec.dependency 'OpenTelemetry-Swift-Api', '[^']*'|spec.dependency 'OpenTelemetry-Swift-Api', '~> $NEW_VERSION'|g" "$podspec"
+    sed -i '' "s|spec.dependency 'OpenTelemetry-Swift-Sdk', '[^']*'|spec.dependency 'OpenTelemetry-Swift-Sdk', '~> $NEW_VERSION'|g" "$podspec"
+done
+
+echo "Update completed successfully"
