Merge branch 'release/v1.27.3'

bububa · Aug 27, 2024 · e8f36da · e8f36da
2 parents c0707dd + 58cc85e
commit e8f36da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
@@ -9,23 +9,17 @@ jobs:
   goreleaser:
     runs-on: ubuntu-latest
     env:
-      GOPATH: ${{ github.workspace }}
-      package: src/github.com/${{ github.repository }}
-    defaults:
-      run:
-        working-directory: ${{ env.GOPATH }}/${{ env.package }}
+      cache: ${{ github.workspace }}/go.sum
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          path: ${{ env.GOPATH }}/${{ env.package }}
+          fetch-depth: 0
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
           go-version: ">=1.21.0"
-          cache-dependency-path: |
-            ${{ env.GOPATH }}/${{ env.package }}/go.mod
-            ${{ env.GOPATH }}/${{ env.package }}/go.sum
+          cache-dependency-path: ${{ env.cache }}
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v6
         with:

diff --git a/marketing-api/core/otel.go b/marketing-api/core/otel.go
@@ -65,6 +65,8 @@ func (o *Otel) WithSpan(ctx context.Context, req *http.Request, resp model.Respo
 	startTime := time.Now()
 	attrs := append(o.attrs,
 		semconv10.HTTPURLKey.String(req.URL.String()),
+		semconv10.HTTPMethodKey.String(req.Method),
+		semconv10.HTTPTargetKey.String(req.URL.Path),
 		semconv.URLFull(req.URL.String()),
 		semconv.HTTPRequestMethodKey.String(req.Method),
 		semconv.URLPath(req.URL.Path),