ci(deps): upgrade x package (#1051)

Because

- the `x` package has a major update to catch up
- the latest instrument logic in the `x/client` and `x/server` package
can be easily adopted. In this commit, we instrument the Temporal worker
respectively.

This commit

- upgrade `x` package
- fix a minor CI step error.

Author: pinglin

.github/workflows/integration-test.yml

@@ -72,9 +72,15 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Set short commit SHA
+        if: github.ref == 'refs/heads/main'
         run: |
           echo "COMMIT_SHORT_SHA=${GITHUB_SHA:0:7}" >> $GITHUB_ENV
 
+      - name: Set PR head commit SHA
+        if: github.event_name == 'pull_request'
+        run: |
+          echo "COMMIT_SHORT_SHA=$(echo ${{ github.event.pull_request.head.sha }} | cut -c1-7)" >> $GITHUB_ENV
+
       - name: Build image
         uses: docker/build-push-action@v6
         with:

cmd/worker/main.go

@@ -49,8 +49,8 @@ const gracefulShutdownTimeout = 60 * time.Minute
 
 var (
 	// These variables might be overridden at buildtime.
-	serviceVersion = "dev"
 	serviceName    = "pipeline-backend-worker"
+	serviceVersion = "dev"
 )
 
 func main() {
@@ -130,6 +130,19 @@ func main() {
 		WorkflowPanicPolicy:                    worker.BlockWorkflow,
 		WorkerStopTimeout:                      gracefulShutdownTimeout,
 		MaxConcurrentWorkflowTaskExecutionSize: 100,
+		Interceptors: func() []interceptor.WorkerInterceptor {
+			if !config.Config.OTELCollector.Enable {
+				return nil
+			}
+			workerInterceptor, err := opentelemetry.NewTracingInterceptor(opentelemetry.TracerOptions{
+				Tracer:            otel.Tracer(serviceName),
+				TextMapPropagator: otel.GetTextMapPropagator(),
+			})
+			if err != nil {
+				logger.Fatal("Unable to create worker tracing interceptor", zap.Error(err))
+			}
+			return []interceptor.WorkerInterceptor{workerInterceptor}
+		}(),
 	})
 
 	w.RegisterWorkflow(cw.TriggerPipelineWorkflow)
@@ -253,20 +266,23 @@ func newClients(ctx context.Context, logger *zap.Logger) (
 	}
 
 	// Initialize Temporal client
-	temporalTracingInterceptor, err := opentelemetry.NewTracingInterceptor(opentelemetry.TracerOptions{
-		Tracer:            otel.Tracer(serviceName + "-temporal"),
-		TextMapPropagator: otel.GetTextMapPropagator(),
-	})
-	if err != nil {
-		logger.Fatal("Unable to create temporal tracing interceptor", zap.Error(err))
-	}
-
 	temporalClientOptions, err := temporal.ClientOptions(config.Config.Temporal, logger)
 	if err != nil {
 		logger.Fatal("Unable to build Temporal client options", zap.Error(err))
 	}
 
-	temporalClientOptions.Interceptors = []interceptor.ClientInterceptor{temporalTracingInterceptor}
+	// Only add interceptor if tracing is enabled
+	if config.Config.OTELCollector.Enable {
+		temporalTracingInterceptor, err := opentelemetry.NewTracingInterceptor(opentelemetry.TracerOptions{
+			Tracer:            otel.Tracer(serviceName),
+			TextMapPropagator: otel.GetTextMapPropagator(),
+		})
+		if err != nil {
+			logger.Fatal("Unable to create temporal tracing interceptor", zap.Error(err))
+		}
+		temporalClientOptions.Interceptors = []interceptor.ClientInterceptor{temporalTracingInterceptor}
+	}
+
 	temporalClient, err := temporalclient.Dial(temporalClientOptions)
 	if err != nil {
 		logger.Fatal("Unable to create Temporal client", zap.Error(err))

go.mod

@@ -47,7 +47,7 @@ require (
 	github.com/influxdata/influxdb-client-go/v2 v2.14.0
 	github.com/instill-ai/protogen-go v0.3.3-alpha.0.20250707160902-77023eb2f033
 	github.com/instill-ai/usage-client v0.4.0
-	github.com/instill-ai/x v0.8.0-alpha.0.20250714023551-3829fd844cd5
+	github.com/instill-ai/x v0.9.0-alpha
 	github.com/itchyny/gojq v0.12.17
 	github.com/jackc/pgx/v5 v5.7.5
 	github.com/jmoiron/sqlx v1.4.0
@@ -121,6 +121,10 @@ require (
 	github.com/hhrutter/lzw v1.0.0 // indirect
 	github.com/hhrutter/pkcs7 v0.2.0 // indirect
 	github.com/hhrutter/tiff v1.0.2 // indirect
+	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
+	github.com/jackc/pgconn v1.14.3 // indirect
+	github.com/jackc/pgio v1.0.0 // indirect
+	github.com/jackc/pgproto3/v2 v2.3.3 // indirect
 	github.com/minio/crc64nvme v1.0.2 // indirect
 	github.com/minio/minio-go/v7 v7.0.92 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect

go.sum

@@ -464,14 +464,25 @@ github.com/instill-ai/protogen-go v0.3.3-alpha.0.20250707160902-77023eb2f033 h1:
 github.com/instill-ai/protogen-go v0.3.3-alpha.0.20250707160902-77023eb2f033/go.mod h1:bCnBosofpaUxKBuTTJM3/I3thAK37kvfBnKByjnLsl4=
 github.com/instill-ai/usage-client v0.4.0 h1:xf1hAlO4a8lZwZzz9bprZOJqU3ghIcIsavUUB7UURyg=
 github.com/instill-ai/usage-client v0.4.0/go.mod h1:zZ9LRoXps2u63ARYPAbR2YvqTib3dWJLObZn+9YqhF0=
-github.com/instill-ai/x v0.8.0-alpha.0.20250714023551-3829fd844cd5 h1:2iy0ssXScON7XgFLLR4NUSjYszpXfPbMUlmPNPXppzY=
-github.com/instill-ai/x v0.8.0-alpha.0.20250714023551-3829fd844cd5/go.mod h1:RXY1NPBMxe3K7bBecPALw+Af2dT+gJSb89BOlLIPfx4=
+github.com/instill-ai/x v0.9.0-alpha h1:J11sJNMe39GAQ69tPy7OWV/hBD39oyF+4wHB1fKiwvw=
+github.com/instill-ai/x v0.9.0-alpha/go.mod h1:vAzbuQ7HAWdQkkpDq9mvWjSXQEJZSgJhguN6NhpLTUk=
 github.com/itchyny/gojq v0.12.17 h1:8av8eGduDb5+rvEdaOO+zQUjA04MS0m3Ps8HiD+fceg=
 github.com/itchyny/gojq v0.12.17/go.mod h1:WBrEMkgAfAGO1LUcGOckBl5O726KPp+OlkKug0I/FEY=
 github.com/itchyny/timefmt-go v0.1.6 h1:ia3s54iciXDdzWzwaVKXZPbiXzxxnv1SPGFfM/myJ5Q=
 github.com/itchyny/timefmt-go v0.1.6/go.mod h1:RRDZYC5s9ErkjQvTvvU7keJjxUYzIISJGxm9/mAERQg=
+github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
+github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
+github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
+github.com/jackc/pgconn v1.14.3 h1:bVoTr12EGANZz66nZPkMInAV/KHD2TxH9npjXXgiB3w=
+github.com/jackc/pgconn v1.14.3/go.mod h1:RZbme4uasqzybK2RK5c65VsHxoyaml09lx3tXOcO/VM=
+github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
+github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
+github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5Wi/+Zz7xoE5ALHsRQlOctkOiHc=
+github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
+github.com/jackc/pgproto3/v2 v2.3.3 h1:1HLSx5H+tXR9pW3in3zaztoEwQYRC9SQaYUHjTSUOag=
+github.com/jackc/pgproto3/v2 v2.3.3/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
 github.com/jackc/pgx/v5 v5.7.5 h1:JHGfMnQY+IEtGM63d+NGMjoRpysB2JBwDr5fsngwmJs=