From e092fbbfd09bb7ddd7b28a9a022c6e9d128545cc Mon Sep 17 00:00:00 2001 From: Gal Kleinman Date: Wed, 17 Jan 2024 21:12:06 +0200 Subject: [PATCH 1/6] try to fix ci --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 115dbe5..7b56ec9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go-version: ["1.18", "1.19", "1.20", "1.21.x"] + go-version: ["1.18.x", "1.19.x", "1.20.x", "1.21.x"] steps: - uses: actions/checkout@v4 @@ -20,7 +20,7 @@ jobs: with: go-version: ${{ matrix.go-version }} - name: Install dependencies - run: go get . + run: go get ./... - name: Build run: go build -v ./... - name: Test From 85513723ea556082a39a274933a24de7b59f9a2b Mon Sep 17 00:00:00 2001 From: Gal Kleinman Date: Wed, 17 Jan 2024 21:22:30 +0200 Subject: [PATCH 2/6] fix go version --- sample-app/go.mod | 2 +- traceloop-sdk/go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sample-app/go.mod b/sample-app/go.mod index e3fc172..b7720b2 100644 --- a/sample-app/go.mod +++ b/sample-app/go.mod @@ -1,5 +1,5 @@ module github.com/traceloop/go-openllmetry/sample-app -go 1.21.4 +go 1.21 require github.com/sashabaranov/go-openai v1.18.1 diff --git a/traceloop-sdk/go.mod b/traceloop-sdk/go.mod index a60d608..30d301e 100644 --- a/traceloop-sdk/go.mod +++ b/traceloop-sdk/go.mod @@ -1,6 +1,6 @@ module github.com/traceloop/go-openllmetry/traceloop-sdk -go 1.21.4 +go 1.21 require ( github.com/cenkalti/backoff/v4 v4.2.1 From d11931ba266e2542417d73224f0553ae620ca217 Mon Sep 17 00:00:00 2001 From: Gal Kleinman Date: Wed, 17 Jan 2024 21:34:45 +0200 Subject: [PATCH 3/6] fix go version --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 67c5fab..95f57ee 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ module github.com/traceloop/go-openllmetry -go 1.21.4 +go 1.21 From 5dcb5d0a9820d1311e5b13ba2dadabeca4ad83bd Mon Sep 17 00:00:00 2001 From: Gal Kleinman Date: Wed, 17 Jan 2024 21:45:40 +0200 Subject: [PATCH 4/6] use only 1.21 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b56ec9..53bae52 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go-version: ["1.18.x", "1.19.x", "1.20.x", "1.21.x"] + go-version: ["1.21"] steps: - uses: actions/checkout@v4 From b2454bb11e2c820d6d88c6d6048bcef412812ff2 Mon Sep 17 00:00:00 2001 From: Gal Kleinman Date: Sun, 21 Jan 2024 20:01:37 +0200 Subject: [PATCH 5/6] fix ci --- .github/workflows/ci.yml | 8 ++++---- go.work.sum | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 53bae52..f982bf8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go-version: ["1.21"] + go-version: ["1.18", "1.19", "1.20", "1.21"] steps: - uses: actions/checkout@v4 @@ -20,8 +20,8 @@ jobs: with: go-version: ${{ matrix.go-version }} - name: Install dependencies - run: go get ./... + run: find . -name go.mod -execdir go get . \; - name: Build - run: go build -v ./... + run: find . -name go.mod -execdir go build . \; - name: Test - run: go test + run: find . -name go.mod -execdir go test ./... \; diff --git a/go.work.sum b/go.work.sum index b65bd2c..2e1bb4d 100644 --- a/go.work.sum +++ b/go.work.sum @@ -1,8 +1,18 @@ dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/klauspost/compress v1.15.15/go.mod h1:ZcK2JAFqKOpnBlxcLsJzYfrS9X1akm9fHZNnD9+Vo/4= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= +go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= +go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= +go.opentelemetry.io/otel/metric v1.22.0/go.mod h1:evJGjVpZv0mQ5QBRJoBF64yMuOf4xCWdXjK8pzFvliY= +go.opentelemetry.io/otel/trace v1.22.0 h1:Hg6pPujv0XG9QaVbGOBVHunyuLcCC3jN7WEhPx83XD0= +go.opentelemetry.io/otel/trace v1.22.0/go.mod h1:RbbHXVqKES9QhzZq/fE5UnOSILqRt40a21sPw2He1xo= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= From e64f1086fac6d4da76547a07e97b40ad5596860c Mon Sep 17 00:00:00 2001 From: Gal Kleinman Date: Sun, 21 Jan 2024 21:19:42 +0200 Subject: [PATCH 6/6] fix ci --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f982bf8..2e6a18a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,4 +24,4 @@ jobs: - name: Build run: find . -name go.mod -execdir go build . \; - name: Test - run: find . -name go.mod -execdir go test ./... \; + run: find . -name go.mod -execdir go test . \;