From 09cbf41735925dabe527435a7e9ae5dc5ff04e3b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 09:14:27 +0200 Subject: [PATCH 1/9] fix(deps): update module github.com/aws/aws-sdk-go-v2/service/s3 to v1.65.3 (#6234) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/aws/aws-sdk-go-v2/service/s3](https://redirect.github.com/aws/aws-sdk-go-v2) | `v1.65.2` -> `v1.65.3` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2faws%2faws-sdk-go-v2%2fservice%2fs3/v1.65.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2faws%2faws-sdk-go-v2%2fservice%2fs3/v1.65.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2faws%2faws-sdk-go-v2%2fservice%2fs3/v1.65.2/v1.65.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2faws%2faws-sdk-go-v2%2fservice%2fs3/v1.65.2/v1.65.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-go-contrib). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .../github.com/aws/aws-lambda-go/otellambda/example/go.mod | 2 +- .../github.com/aws/aws-lambda-go/otellambda/example/go.sum | 4 ++-- .../github.com/aws/aws-sdk-go-v2/otelaws/example/go.mod | 2 +- .../github.com/aws/aws-sdk-go-v2/otelaws/example/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.mod b/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.mod index 47c16185509..13cbeea52df 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.mod +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.mod @@ -12,7 +12,7 @@ replace ( require ( github.com/aws/aws-lambda-go v1.47.0 github.com/aws/aws-sdk-go-v2/config v1.27.43 - github.com/aws/aws-sdk-go-v2/service/s3 v1.65.2 + github.com/aws/aws-sdk-go-v2/service/s3 v1.65.3 go.opentelemetry.io/contrib/detectors/aws/lambda v0.55.0 go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda v0.55.0 go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.55.0 diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.sum b/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.sum index d0a2370fe85..c5f99d0bc20 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.sum +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.sum @@ -30,8 +30,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.2 h1:s7NA1SOw8 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.2/go.mod h1:fnjjWyAW/Pj5HYOxl9LJqWtEwS7W2qgcRLWP+uWbss0= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.2 h1:t7iUP9+4wdc5lt3E41huP+GvQZJD38WLsgVp4iOtAjg= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.2/go.mod h1:/niFCtmuQNxqx9v8WAPq5qh7EH25U4BF6tjoyq9bObM= -github.com/aws/aws-sdk-go-v2/service/s3 v1.65.2 h1:yi8m+jepdp6foK14xXLGkYBenxnlcfJ45ka4Pg7fDSQ= -github.com/aws/aws-sdk-go-v2/service/s3 v1.65.2/go.mod h1:cB6oAuus7YXRZhWCc1wIwPywwZ1XwweNp2TVAEGYeB8= +github.com/aws/aws-sdk-go-v2/service/s3 v1.65.3 h1:xxHGZ+wUgZNACQmxtdvP5tgzfsxGS3vPpTP5Hy3iToE= +github.com/aws/aws-sdk-go-v2/service/s3 v1.65.3/go.mod h1:cB6oAuus7YXRZhWCc1wIwPywwZ1XwweNp2TVAEGYeB8= github.com/aws/aws-sdk-go-v2/service/sqs v1.36.2 h1:kmbcoWgbzfh5a6rvfjOnfHSGEqD13qu1GfTPRZqg0FI= github.com/aws/aws-sdk-go-v2/service/sqs v1.36.2/go.mod h1:/UPx74a3M0WYeT2yLQYG/qHhkPlPXd6TsppfGgy2COk= github.com/aws/aws-sdk-go-v2/service/sso v1.24.2 h1:bSYXVyUzoTHoKalBmwaZxs97HU9DWWI3ehHSAMa7xOk= diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.mod b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.mod index 4ad94a2df38..e2ed12392bf 100644 --- a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.mod +++ b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2 v1.32.2 github.com/aws/aws-sdk-go-v2/config v1.27.43 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.36.2 - github.com/aws/aws-sdk-go-v2/service/s3 v1.65.2 + github.com/aws/aws-sdk-go-v2/service/s3 v1.65.3 go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.55.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0 diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.sum b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.sum index 32202034ea7..d602cdc4037 100644 --- a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.sum +++ b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.sum @@ -28,8 +28,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.2 h1:s7NA1SOw8 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.2/go.mod h1:fnjjWyAW/Pj5HYOxl9LJqWtEwS7W2qgcRLWP+uWbss0= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.2 h1:t7iUP9+4wdc5lt3E41huP+GvQZJD38WLsgVp4iOtAjg= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.2/go.mod h1:/niFCtmuQNxqx9v8WAPq5qh7EH25U4BF6tjoyq9bObM= -github.com/aws/aws-sdk-go-v2/service/s3 v1.65.2 h1:yi8m+jepdp6foK14xXLGkYBenxnlcfJ45ka4Pg7fDSQ= -github.com/aws/aws-sdk-go-v2/service/s3 v1.65.2/go.mod h1:cB6oAuus7YXRZhWCc1wIwPywwZ1XwweNp2TVAEGYeB8= +github.com/aws/aws-sdk-go-v2/service/s3 v1.65.3 h1:xxHGZ+wUgZNACQmxtdvP5tgzfsxGS3vPpTP5Hy3iToE= +github.com/aws/aws-sdk-go-v2/service/s3 v1.65.3/go.mod h1:cB6oAuus7YXRZhWCc1wIwPywwZ1XwweNp2TVAEGYeB8= github.com/aws/aws-sdk-go-v2/service/sqs v1.36.2 h1:kmbcoWgbzfh5a6rvfjOnfHSGEqD13qu1GfTPRZqg0FI= github.com/aws/aws-sdk-go-v2/service/sqs v1.36.2/go.mod h1:/UPx74a3M0WYeT2yLQYG/qHhkPlPXd6TsppfGgy2COk= github.com/aws/aws-sdk-go-v2/service/sso v1.24.2 h1:bSYXVyUzoTHoKalBmwaZxs97HU9DWWI3ehHSAMa7xOk= From d6305c07ae88556c5cd6af16e1b9a47362673a46 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 09:28:41 +0200 Subject: [PATCH 2/9] chore(deps): update module github.com/klauspost/compress to v1.17.11 (#6232) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/klauspost/compress](https://redirect.github.com/klauspost/compress) | `v1.17.10` -> `v1.17.11` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fklauspost%2fcompress/v1.17.11?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fklauspost%2fcompress/v1.17.11?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fklauspost%2fcompress/v1.17.10/v1.17.11?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fklauspost%2fcompress/v1.17.10/v1.17.11?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
klauspost/compress (github.com/klauspost/compress) ### [`v1.17.11`](https://redirect.github.com/klauspost/compress/releases/tag/v1.17.11) [Compare Source](https://redirect.github.com/klauspost/compress/compare/v1.17.10...v1.17.11) ##### What's Changed - zstd: Fix extra CRC written with multiple Close calls by [@​klauspost](https://redirect.github.com/klauspost) in [https://github.com/klauspost/compress/pull/1017](https://redirect.github.com/klauspost/compress/pull/1017) - s2: Don't use stack for index tables by [@​klauspost](https://redirect.github.com/klauspost) in [https://github.com/klauspost/compress/pull/1014](https://redirect.github.com/klauspost/compress/pull/1014) - gzhttp: No content-type on no body response code by [@​juliens](https://redirect.github.com/juliens) in [https://github.com/klauspost/compress/pull/1011](https://redirect.github.com/klauspost/compress/pull/1011) - gzhttp: Do not set the content-type when response has no body by [@​kevinpollet](https://redirect.github.com/kevinpollet) in [https://github.com/klauspost/compress/pull/1013](https://redirect.github.com/klauspost/compress/pull/1013) ##### New Contributors - [@​juliens](https://redirect.github.com/juliens) made their first contribution in [https://github.com/klauspost/compress/pull/1011](https://redirect.github.com/klauspost/compress/pull/1011) - [@​kevinpollet](https://redirect.github.com/kevinpollet) made their first contribution in [https://github.com/klauspost/compress/pull/1013](https://redirect.github.com/klauspost/compress/pull/1013) **Full Changelog**: https://github.com/klauspost/compress/compare/v1.17.10...v1.17.11
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-go-contrib). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- config/go.mod | 2 +- config/go.sum | 4 ++-- examples/prometheus/go.mod | 2 +- examples/prometheus/go.sum | 4 ++-- exporters/autoexport/go.mod | 2 +- exporters/autoexport/go.sum | 4 ++-- .../go.mongodb.org/mongo-driver/mongo/otelmongo/go.mod | 2 +- .../go.mongodb.org/mongo-driver/mongo/otelmongo/go.sum | 4 ++-- .../go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod | 2 +- .../go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.sum | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/go.mod b/config/go.mod index 3c03b5b0f3d..6d610914dc4 100644 --- a/config/go.mod +++ b/config/go.mod @@ -33,7 +33,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect - github.com/klauspost/compress v1.17.10 // indirect + github.com/klauspost/compress v1.17.11 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect diff --git a/config/go.sum b/config/go.sum index 6ee496e77c4..ed91dffe9c9 100644 --- a/config/go.sum +++ b/config/go.sum @@ -17,8 +17,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 h1:asbCHRVmodnJTuQ3qamDwqVOIjwqUPTYmYuemVOx+Ys= github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0/go.mod h1:ggCgvZ2r7uOoQjOyu2Y1NhHmEPPzzuhWgcza5M1Ji1I= -github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0= -github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= diff --git a/examples/prometheus/go.mod b/examples/prometheus/go.mod index 077878626e2..fb939323145 100644 --- a/examples/prometheus/go.mod +++ b/examples/prometheus/go.mod @@ -16,7 +16,7 @@ require ( github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/klauspost/compress v1.17.10 // indirect + github.com/klauspost/compress v1.17.11 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.60.0 // indirect diff --git a/examples/prometheus/go.sum b/examples/prometheus/go.sum index c6ff3924d8e..5c1fc741ebd 100644 --- a/examples/prometheus/go.sum +++ b/examples/prometheus/go.sum @@ -13,8 +13,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0= -github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= diff --git a/exporters/autoexport/go.mod b/exporters/autoexport/go.mod index ca83ede8269..c5e64538969 100644 --- a/exporters/autoexport/go.mod +++ b/exporters/autoexport/go.mod @@ -35,7 +35,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect - github.com/klauspost/compress v1.17.10 // indirect + github.com/klauspost/compress v1.17.11 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect diff --git a/exporters/autoexport/go.sum b/exporters/autoexport/go.sum index 1f391985d5e..d9c53a43f16 100644 --- a/exporters/autoexport/go.sum +++ b/exporters/autoexport/go.sum @@ -17,8 +17,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 h1:asbCHRVmodnJTuQ3qamDwqVOIjwqUPTYmYuemVOx+Ys= github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0/go.mod h1:ggCgvZ2r7uOoQjOyu2Y1NhHmEPPzzuhWgcza5M1Ji1I= -github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0= -github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.mod b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.mod index 92888b1aaf8..477d044d8eb 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.mod +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.mod @@ -12,7 +12,7 @@ require ( github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/golang/snappy v0.0.4 // indirect - github.com/klauspost/compress v1.17.10 // indirect + github.com/klauspost/compress v1.17.11 // indirect github.com/montanaflynn/stats v0.7.1 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.sum b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.sum index 5f643209c6b..24d6f1a4b6b 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.sum +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.sum @@ -9,8 +9,8 @@ github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0= -github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE= github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod index 7fcf7cd5ac7..dbdb5246a1b 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod @@ -17,7 +17,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/klauspost/compress v1.17.10 // indirect + github.com/klauspost/compress v1.17.11 // indirect github.com/montanaflynn/stats v0.7.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.sum b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.sum index c41011ec3a7..8435ab28071 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.sum +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.sum @@ -11,8 +11,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0= -github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE= github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= From 9cf5701e6b6611b2c406639039a1bccd883db080 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Mon, 14 Oct 2024 08:28:59 -0700 Subject: [PATCH 3/9] Release v1.31.0/v0.56.0/v0.25.0/v0.11.0/v0.6.0/v0.4.0/v0.3.0 (#6243) ### Added - The `Severitier` and `SeverityVar` types are added to `go.opentelemetry.io/contrib/processors/minsev` allowing dynamic configuration of the severity used by the `LogProcessor`. (#6116) - Move examples from `go.opentelemetry.io/otel` to this repository under `examples` directory. (#6158) - Support yaml/json struct tags for generated code in `go.opentelemetry.io/contrib/config`. (#5433) - Add support for parsing YAML configuration via `ParseYAML` in `go.opentelemetry.io/contrib/config`. (#5433) - Add support for temporality preference configuration in `go.opentelemetry.io/contrib/config`. (#5860) ### Changed - The function signature of `NewLogProcessor` in `go.opentelemetry.io/contrib/processors/minsev` has changed to accept the added `Severitier` interface instead of a `log.Severity`. (#6116) - Updated `go.opentelemetry.io/contrib/config` to use the [v0.3.0](https://github.com/open-telemetry/opentelemetry-configuration/releases/tag/v0.3.0) release of schema which includes backwards incompatible changes. (#6126) - `NewSDK` in `go.opentelemetry.io/contrib/config` now returns a no-op SDK if `disabled` is set to `true`. (#6185) - The deprecated `go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho` package has found a Code Owner. The package is no longer deprecated. (#6207) ### Fixed - Possible nil dereference panic in `go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace`. (#5965) - `logrus.Level` transformed to appropriate `log.Severity` in `go.opentelemetry.io/contrib/bridges/otellogrus`. (#6191) ### Removed - The `Minimum` field of the `LogProcessor` in `go.opentelemetry.io/contrib/processors/minsev` is removed. Use `NewLogProcessor` to configure this setting. (#6116) - The deprecated `go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron` package is removed. (#6186) - The deprecated `go.opentelemetry.io/contrib/samplers/aws/xray` package is removed. (#6187) --------- Co-authored-by: David Ashpole --- CHANGELOG.md | 16 ++++++++-------- detectors/aws/ec2/version.go | 2 +- detectors/aws/ecs/version.go | 2 +- detectors/aws/eks/version.go | 2 +- detectors/gcp/version.go | 2 +- exporters/autoexport/go.mod | 2 +- .../aws/aws-lambda-go/otellambda/example/go.mod | 8 ++++---- .../aws/aws-lambda-go/otellambda/test/go.mod | 6 +++--- .../aws/aws-lambda-go/otellambda/version.go | 2 +- .../aws-lambda-go/otellambda/xrayconfig/go.mod | 6 +++--- .../aws/aws-sdk-go-v2/otelaws/example/go.mod | 2 +- .../aws/aws-sdk-go-v2/otelaws/test/go.mod | 2 +- .../aws/aws-sdk-go-v2/otelaws/test/version.go | 2 +- .../aws/aws-sdk-go-v2/otelaws/version.go | 2 +- .../go-restful/otelrestful/example/go.mod | 2 +- .../emicklei/go-restful/otelrestful/go.mod | 2 +- .../emicklei/go-restful/otelrestful/test/go.mod | 2 +- .../go-restful/otelrestful/test/version.go | 2 +- .../emicklei/go-restful/otelrestful/version.go | 2 +- .../gin-gonic/gin/otelgin/example/go.mod | 2 +- .../github.com/gin-gonic/gin/otelgin/go.mod | 2 +- .../github.com/gin-gonic/gin/otelgin/test/go.mod | 2 +- .../gin-gonic/gin/otelgin/test/version.go | 2 +- .../github.com/gin-gonic/gin/otelgin/version.go | 2 +- .../gorilla/mux/otelmux/example/go.mod | 2 +- .../github.com/gorilla/mux/otelmux/test/go.mod | 2 +- .../gorilla/mux/otelmux/test/version.go | 2 +- .../github.com/gorilla/mux/otelmux/version.go | 2 +- .../labstack/echo/otelecho/example/go.mod | 2 +- .../github.com/labstack/echo/otelecho/go.mod | 2 +- .../labstack/echo/otelecho/test/go.mod | 2 +- .../labstack/echo/otelecho/test/version.go | 2 +- .../github.com/labstack/echo/otelecho/version.go | 2 +- .../mongo-driver/mongo/otelmongo/test/go.mod | 2 +- .../mongo-driver/mongo/otelmongo/test/version.go | 2 +- .../mongo-driver/mongo/otelmongo/version.go | 2 +- .../grpc/otelgrpc/example/go.mod | 2 +- .../google.golang.org/grpc/otelgrpc/test/go.mod | 2 +- .../grpc/otelgrpc/test/version.go | 2 +- .../google.golang.org/grpc/otelgrpc/version.go | 2 +- instrumentation/host/example/go.mod | 2 +- instrumentation/host/version.go | 2 +- .../http/httptrace/otelhttptrace/example/go.mod | 4 ++-- .../net/http/httptrace/otelhttptrace/go.mod | 2 +- .../net/http/httptrace/otelhttptrace/test/go.mod | 2 +- .../http/httptrace/otelhttptrace/test/version.go | 2 +- .../net/http/httptrace/otelhttptrace/version.go | 2 +- instrumentation/net/http/otelhttp/example/go.mod | 2 +- instrumentation/net/http/otelhttp/test/go.mod | 2 +- .../net/http/otelhttp/test/version.go | 2 +- instrumentation/net/http/otelhttp/version.go | 2 +- instrumentation/runtime/version.go | 2 +- propagators/autoprop/go.mod | 8 ++++---- propagators/aws/version.go | 2 +- propagators/b3/version.go | 2 +- propagators/jaeger/version.go | 2 +- propagators/opencensus/examples/go.mod | 4 ++-- propagators/opencensus/version.go | 2 +- propagators/ot/version.go | 2 +- samplers/jaegerremote/example/go.mod | 2 +- samplers/jaegerremote/version.go | 2 +- samplers/probability/consistent/version.go | 2 +- tools/version.go | 2 +- version.go | 2 +- versions.yaml | 14 +++++++------- zpages/version.go | 2 +- 66 files changed, 91 insertions(+), 91 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68e2e751314..31f15338a48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] + + + +## [1.31.0/0.56.0/0.25.0/0.11.0/0.6.0/0.4.0/0.3.0] - 2024-10-14 + ### Added - The `Severitier` and `SeverityVar` types are added to `go.opentelemetry.io/contrib/processors/minsev` allowing dynamic configuration of the severity used by the `LogProcessor`. (#6116) @@ -19,6 +24,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Changed - The function signature of `NewLogProcessor` in `go.opentelemetry.io/contrib/processors/minsev` has changed to accept the added `Severitier` interface instead of a `log.Severity`. (#6116) +- Updated `go.opentelemetry.io/contrib/config` to use the [v0.3.0](https://github.com/open-telemetry/opentelemetry-configuration/releases/tag/v0.3.0) release of schema which includes backwards incompatible changes. (#6126) - `NewSDK` in `go.opentelemetry.io/contrib/config` now returns a no-op SDK if `disabled` is set to `true`. (#6185) - The deprecated `go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho` package has found a Code Owner. The package is no longer deprecated. (#6207) @@ -35,13 +41,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - The deprecated `go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron` package is removed. (#6186) - The deprecated `go.opentelemetry.io/contrib/samplers/aws/xray` package is removed. (#6187) -### Changed - -- Updated `go.opentelemetry.io/contrib/config` to use the [v0.3.0](https://github.com/open-telemetry/opentelemetry-configuration/releases/tag/v0.3.0) release of schema which includes backwards incompatible changes. (#6126) - - - - ## [1.30.0/0.55.0/0.24.0/0.10.0/0.5.0/0.3.0/0.2.0] - 2024-09-10 ### Added @@ -1140,7 +1139,8 @@ First official tagged release of `contrib` repository. - Prefix support for dogstatsd (#34) - Update Go Runtime package to use batch observer (#44) -[Unreleased]: https://github.com/open-telemetry/opentelemetry-go-contrib/compare/v1.30.0...HEAD +[Unreleased]: https://github.com/open-telemetry/opentelemetry-go-contrib/compare/v1.31.0...HEAD +[1.31.0/0.56.0/0.25.0/0.11.0/0.6.0/0.4.0/0.3.0]: https://github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v1.31.0 [1.30.0/0.55.0/0.24.0/0.10.0/0.5.0/0.3.0/0.2.0]: https://github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v1.30.0 [1.29.0/0.54.0/0.23.0/0.9.0/0.4.0/0.2.0/0.1.0]: https://github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v1.29.0 [1.28.0/0.53.0/0.22.0/0.8.0/0.3.0/0.1.0]: https://github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v1.28.0 diff --git a/detectors/aws/ec2/version.go b/detectors/aws/ec2/version.go index 065bdab437a..1da89972811 100644 --- a/detectors/aws/ec2/version.go +++ b/detectors/aws/ec2/version.go @@ -5,7 +5,7 @@ package ec2 // import "go.opentelemetry.io/contrib/detectors/aws/ec2" // Version is the current release version of the EC2 resource detector. func Version() string { - return "1.30.0" + return "1.31.0" // This string is updated by the pre_release.sh script during release } diff --git a/detectors/aws/ecs/version.go b/detectors/aws/ecs/version.go index 3fa2405b3dc..f3432ee9956 100644 --- a/detectors/aws/ecs/version.go +++ b/detectors/aws/ecs/version.go @@ -5,7 +5,7 @@ package ecs // import "go.opentelemetry.io/contrib/detectors/aws/ecs" // Version is the current release version of the ECS resource detector. func Version() string { - return "1.30.0" + return "1.31.0" // This string is updated by the pre_release.sh script during release } diff --git a/detectors/aws/eks/version.go b/detectors/aws/eks/version.go index 5152a0f363f..3965cb7c839 100644 --- a/detectors/aws/eks/version.go +++ b/detectors/aws/eks/version.go @@ -5,7 +5,7 @@ package eks // import "go.opentelemetry.io/contrib/detectors/aws/eks" // Version is the current release version of the EKS resource detector. func Version() string { - return "1.30.0" + return "1.31.0" // This string is updated by the pre_release.sh script during release } diff --git a/detectors/gcp/version.go b/detectors/gcp/version.go index 9652f0dbec7..3c31fd1b018 100644 --- a/detectors/gcp/version.go +++ b/detectors/gcp/version.go @@ -5,7 +5,7 @@ package gcp // import "go.opentelemetry.io/contrib/detectors/gcp" // Version is the current release version of the GCP resource detector. func Version() string { - return "1.30.0" + return "1.31.0" // This string is updated by the pre_release.sh script during release } diff --git a/exporters/autoexport/go.mod b/exporters/autoexport/go.mod index c5e64538969..cde78e36f3e 100644 --- a/exporters/autoexport/go.mod +++ b/exporters/autoexport/go.mod @@ -5,7 +5,7 @@ go 1.22 require ( github.com/prometheus/client_golang v1.20.4 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/contrib/bridges/prometheus v0.55.0 + go.opentelemetry.io/contrib/bridges/prometheus v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.7.0 go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.7.0 diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.mod b/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.mod index 13cbeea52df..07e43bfffa7 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.mod +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.mod @@ -13,10 +13,10 @@ require ( github.com/aws/aws-lambda-go v1.47.0 github.com/aws/aws-sdk-go-v2/config v1.27.43 github.com/aws/aws-sdk-go-v2/service/s3 v1.65.3 - go.opentelemetry.io/contrib/detectors/aws/lambda v0.55.0 - go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda v0.55.0 - go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.55.0 - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 + go.opentelemetry.io/contrib/detectors/aws/lambda v0.56.0 + go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda v0.56.0 + go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.56.0 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/go.mod b/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/go.mod index 6960d43c74a..fc2c975dadf 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/go.mod +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/go.mod @@ -11,9 +11,9 @@ replace ( require ( github.com/aws/aws-lambda-go v1.47.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/contrib/detectors/aws/lambda v0.55.0 - go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda v0.55.0 - go.opentelemetry.io/contrib/propagators/aws v1.30.0 + go.opentelemetry.io/contrib/detectors/aws/lambda v0.56.0 + go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda v0.56.0 + go.opentelemetry.io/contrib/propagators/aws v1.31.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 go.opentelemetry.io/otel/trace v1.31.0 diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/version.go b/instrumentation/github.com/aws/aws-lambda-go/otellambda/version.go index 3d9af0cdf6e..19596553dda 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/version.go +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/version.go @@ -5,7 +5,7 @@ package otellambda // import "go.opentelemetry.io/contrib/instrumentation/github // Version is the current release version of the AWS Lambda instrumentation. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.mod b/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.mod index a1af1e630bf..1fdd50c17a0 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.mod +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.mod @@ -11,9 +11,9 @@ replace ( require ( github.com/aws/aws-lambda-go v1.47.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/contrib/detectors/aws/lambda v0.55.0 - go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda v0.55.0 - go.opentelemetry.io/contrib/propagators/aws v1.30.0 + go.opentelemetry.io/contrib/detectors/aws/lambda v0.56.0 + go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda v0.56.0 + go.opentelemetry.io/contrib/propagators/aws v1.31.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.mod b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.mod index e2ed12392bf..55926ee6ce3 100644 --- a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.mod +++ b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.mod @@ -9,7 +9,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.27.43 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.36.2 github.com/aws/aws-sdk-go-v2/service/s3 v1.65.3 - go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.55.0 + go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/go.mod b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/go.mod index c395f319cbc..a95f6e3ae5b 100644 --- a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/go.mod +++ b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53 v1.45.2 github.com/aws/smithy-go v1.22.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.55.0 + go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 go.opentelemetry.io/otel/trace v1.31.0 diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/version.go b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/version.go index bdeb33f2fa3..201d7d26ab6 100644 --- a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/version.go +++ b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/version.go @@ -5,7 +5,7 @@ package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/a // Version is the current release version of the AWS instrumentation test module. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/version.go b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/version.go index 6062f5d3b04..975a2fbd7c8 100644 --- a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/version.go +++ b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/version.go @@ -5,7 +5,7 @@ package otelaws // import "go.opentelemetry.io/contrib/instrumentation/github.co // Version is the current release version of the AWS SDKv2 instrumentation. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/example/go.mod b/instrumentation/github.com/emicklei/go-restful/otelrestful/example/go.mod index a690a0808d4..c69655e75ae 100644 --- a/instrumentation/github.com/emicklei/go-restful/otelrestful/example/go.mod +++ b/instrumentation/github.com/emicklei/go-restful/otelrestful/example/go.mod @@ -9,7 +9,7 @@ replace ( require ( github.com/emicklei/go-restful/v3 v3.12.1 - go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.55.0 + go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/go.mod b/instrumentation/github.com/emicklei/go-restful/otelrestful/go.mod index 982c5d252d7..4233d017cc1 100644 --- a/instrumentation/github.com/emicklei/go-restful/otelrestful/go.mod +++ b/instrumentation/github.com/emicklei/go-restful/otelrestful/go.mod @@ -7,7 +7,7 @@ replace go.opentelemetry.io/contrib/propagators/b3 => ../../../../../propagators require ( github.com/emicklei/go-restful/v3 v3.12.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/contrib/propagators/b3 v1.30.0 + go.opentelemetry.io/contrib/propagators/b3 v1.31.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/trace v1.31.0 ) diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/test/go.mod b/instrumentation/github.com/emicklei/go-restful/otelrestful/test/go.mod index 3fec89ac4ba..8d6c1dcf78a 100644 --- a/instrumentation/github.com/emicklei/go-restful/otelrestful/test/go.mod +++ b/instrumentation/github.com/emicklei/go-restful/otelrestful/test/go.mod @@ -5,7 +5,7 @@ go 1.22 require ( github.com/emicklei/go-restful/v3 v3.12.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.55.0 + go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 go.opentelemetry.io/otel/trace v1.31.0 diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/test/version.go b/instrumentation/github.com/emicklei/go-restful/otelrestful/test/version.go index 47f1065ef4f..2f21669d05c 100644 --- a/instrumentation/github.com/emicklei/go-restful/otelrestful/test/version.go +++ b/instrumentation/github.com/emicklei/go-restful/otelrestful/test/version.go @@ -5,7 +5,7 @@ package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/e // Version is the current release version of the go-restful instrumentation test module. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/version.go b/instrumentation/github.com/emicklei/go-restful/otelrestful/version.go index 69b00028231..83e167108b5 100644 --- a/instrumentation/github.com/emicklei/go-restful/otelrestful/version.go +++ b/instrumentation/github.com/emicklei/go-restful/otelrestful/version.go @@ -5,7 +5,7 @@ package otelrestful // import "go.opentelemetry.io/contrib/instrumentation/githu // Version is the current release version of the go-restful instrumentation. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/example/go.mod b/instrumentation/github.com/gin-gonic/gin/otelgin/example/go.mod index 74c3e7007a3..93637a58603 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/example/go.mod +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/example/go.mod @@ -9,7 +9,7 @@ replace ( require ( github.com/gin-gonic/gin v1.10.0 - go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.55.0 + go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/go.mod b/instrumentation/github.com/gin-gonic/gin/otelgin/go.mod index 173ba041450..e3de8af222f 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/go.mod +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/go.mod @@ -7,7 +7,7 @@ replace go.opentelemetry.io/contrib/propagators/b3 => ../../../../../propagators require ( github.com/gin-gonic/gin v1.10.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/contrib/propagators/b3 v1.30.0 + go.opentelemetry.io/contrib/propagators/b3 v1.31.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/trace v1.31.0 ) diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/test/go.mod b/instrumentation/github.com/gin-gonic/gin/otelgin/test/go.mod index 19f81273e99..cdf16354ed8 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/test/go.mod +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/test/go.mod @@ -5,7 +5,7 @@ go 1.22 require ( github.com/gin-gonic/gin v1.10.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.55.0 + go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 go.opentelemetry.io/otel/trace v1.31.0 diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/test/version.go b/instrumentation/github.com/gin-gonic/gin/otelgin/test/version.go index 1120a9ada58..f3f47103855 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/test/version.go +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/test/version.go @@ -5,7 +5,7 @@ package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/g // Version is the current release version of the gin instrumentation test module. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/version.go b/instrumentation/github.com/gin-gonic/gin/otelgin/version.go index faef497b733..3db3a752d13 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/version.go +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/version.go @@ -5,7 +5,7 @@ package otelgin // import "go.opentelemetry.io/contrib/instrumentation/github.co // Version is the current release version of the gin instrumentation. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/instrumentation/github.com/gorilla/mux/otelmux/example/go.mod b/instrumentation/github.com/gorilla/mux/otelmux/example/go.mod index f0a312643c3..06b64b69dc4 100644 --- a/instrumentation/github.com/gorilla/mux/otelmux/example/go.mod +++ b/instrumentation/github.com/gorilla/mux/otelmux/example/go.mod @@ -6,7 +6,7 @@ replace go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelm require ( github.com/gorilla/mux v1.8.1 - go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.55.0 + go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 diff --git a/instrumentation/github.com/gorilla/mux/otelmux/test/go.mod b/instrumentation/github.com/gorilla/mux/otelmux/test/go.mod index acbfc6c8a20..25afe5873fd 100644 --- a/instrumentation/github.com/gorilla/mux/otelmux/test/go.mod +++ b/instrumentation/github.com/gorilla/mux/otelmux/test/go.mod @@ -5,7 +5,7 @@ go 1.22 require ( github.com/gorilla/mux v1.8.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.55.0 + go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 go.opentelemetry.io/otel/trace v1.31.0 diff --git a/instrumentation/github.com/gorilla/mux/otelmux/test/version.go b/instrumentation/github.com/gorilla/mux/otelmux/test/version.go index b0e89b3235d..592f3501a44 100644 --- a/instrumentation/github.com/gorilla/mux/otelmux/test/version.go +++ b/instrumentation/github.com/gorilla/mux/otelmux/test/version.go @@ -5,7 +5,7 @@ package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/g // Version is the current release version of the gorilla/mux instrumentation test module. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/instrumentation/github.com/gorilla/mux/otelmux/version.go b/instrumentation/github.com/gorilla/mux/otelmux/version.go index e04c882652b..925b48e8a76 100644 --- a/instrumentation/github.com/gorilla/mux/otelmux/version.go +++ b/instrumentation/github.com/gorilla/mux/otelmux/version.go @@ -5,7 +5,7 @@ package otelmux // import "go.opentelemetry.io/contrib/instrumentation/github.co // Version is the current release version of the gorilla/mux instrumentation. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/instrumentation/github.com/labstack/echo/otelecho/example/go.mod b/instrumentation/github.com/labstack/echo/otelecho/example/go.mod index b82f4eff0d4..339d6fe7ed5 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/example/go.mod +++ b/instrumentation/github.com/labstack/echo/otelecho/example/go.mod @@ -9,7 +9,7 @@ replace ( require ( github.com/labstack/echo/v4 v4.12.0 - go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.55.0 + go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 diff --git a/instrumentation/github.com/labstack/echo/otelecho/go.mod b/instrumentation/github.com/labstack/echo/otelecho/go.mod index f742cc148da..df06004ef96 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/go.mod +++ b/instrumentation/github.com/labstack/echo/otelecho/go.mod @@ -7,7 +7,7 @@ replace go.opentelemetry.io/contrib/propagators/b3 => ../../../../../propagators require ( github.com/labstack/echo/v4 v4.12.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/contrib/propagators/b3 v1.30.0 + go.opentelemetry.io/contrib/propagators/b3 v1.31.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/trace v1.31.0 ) diff --git a/instrumentation/github.com/labstack/echo/otelecho/test/go.mod b/instrumentation/github.com/labstack/echo/otelecho/test/go.mod index 70691276a55..fe1dde422a8 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/test/go.mod +++ b/instrumentation/github.com/labstack/echo/otelecho/test/go.mod @@ -6,7 +6,7 @@ go 1.22 require ( github.com/labstack/echo/v4 v4.12.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.55.0 + go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 go.opentelemetry.io/otel/trace v1.31.0 diff --git a/instrumentation/github.com/labstack/echo/otelecho/test/version.go b/instrumentation/github.com/labstack/echo/otelecho/test/version.go index 14a4d9e36c8..41e8633eb4f 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/test/version.go +++ b/instrumentation/github.com/labstack/echo/otelecho/test/version.go @@ -5,7 +5,7 @@ package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/l // Version is the current release version of the echo instrumentation test module. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/instrumentation/github.com/labstack/echo/otelecho/version.go b/instrumentation/github.com/labstack/echo/otelecho/version.go index 0fb99ab9981..b8031be5561 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/version.go +++ b/instrumentation/github.com/labstack/echo/otelecho/version.go @@ -5,7 +5,7 @@ package otelecho // import "go.opentelemetry.io/contrib/instrumentation/github.c // Version is the current release version of the echo instrumentation. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod index dbdb5246a1b..b0849e50692 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod @@ -5,7 +5,7 @@ go 1.22 require ( github.com/stretchr/testify v1.9.0 go.mongodb.org/mongo-driver v1.17.1 - go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo v0.55.0 + go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 go.opentelemetry.io/otel/trace v1.31.0 diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/version.go b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/version.go index b93094013dc..7fc97face83 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/version.go +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/version.go @@ -5,7 +5,7 @@ package test // import "go.opentelemetry.io/contrib/instrumentation/go.mongodb.o // Version is the current release version of the mongo-driver instrumentation test module. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/version.go b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/version.go index 4f2abbea3fa..9e17572de4c 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/version.go +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/version.go @@ -5,7 +5,7 @@ package otelmongo // import "go.opentelemetry.io/contrib/instrumentation/go.mong // Version is the current release version of the mongo-driver instrumentation. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/example/go.mod b/instrumentation/google.golang.org/grpc/otelgrpc/example/go.mod index 233336f7e11..b44fb63d9c2 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/example/go.mod +++ b/instrumentation/google.golang.org/grpc/otelgrpc/example/go.mod @@ -6,7 +6,7 @@ replace go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelg require ( github.com/golang/protobuf v1.5.4 - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0 + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/test/go.mod b/instrumentation/google.golang.org/grpc/otelgrpc/test/go.mod index 477df9f6a6b..1a8cefb89fa 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/test/go.mod +++ b/instrumentation/google.golang.org/grpc/otelgrpc/test/go.mod @@ -4,7 +4,7 @@ go 1.22 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0 + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 go.opentelemetry.io/otel/sdk/metric v1.31.0 diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/test/version.go b/instrumentation/google.golang.org/grpc/otelgrpc/test/version.go index 16bfb1040db..6ec9394f3ad 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/test/version.go +++ b/instrumentation/google.golang.org/grpc/otelgrpc/test/version.go @@ -5,7 +5,7 @@ package test // import "go.opentelemetry.io/contrib/instrumentation/google.golan // Version is the current release version of the gRPC instrumentation test module. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/version.go b/instrumentation/google.golang.org/grpc/otelgrpc/version.go index 51d28156bef..439251e1347 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/version.go +++ b/instrumentation/google.golang.org/grpc/otelgrpc/version.go @@ -5,7 +5,7 @@ package otelgrpc // import "go.opentelemetry.io/contrib/instrumentation/google.g // Version is the current release version of the gRPC instrumentation. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/instrumentation/host/example/go.mod b/instrumentation/host/example/go.mod index 8fe6db1f763..c5103d96bfa 100644 --- a/instrumentation/host/example/go.mod +++ b/instrumentation/host/example/go.mod @@ -5,7 +5,7 @@ go 1.22 replace go.opentelemetry.io/contrib/instrumentation/host => ../ require ( - go.opentelemetry.io/contrib/instrumentation/host v0.55.0 + go.opentelemetry.io/contrib/instrumentation/host v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 diff --git a/instrumentation/host/version.go b/instrumentation/host/version.go index 25ea72012e8..c48c4ecedd3 100644 --- a/instrumentation/host/version.go +++ b/instrumentation/host/version.go @@ -5,7 +5,7 @@ package host // import "go.opentelemetry.io/contrib/instrumentation/host" // Version is the current release version of the host instrumentation. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/instrumentation/net/http/httptrace/otelhttptrace/example/go.mod b/instrumentation/net/http/httptrace/otelhttptrace/example/go.mod index ded542649c9..fd02026013b 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/example/go.mod +++ b/instrumentation/net/http/httptrace/otelhttptrace/example/go.mod @@ -8,8 +8,8 @@ replace ( ) require ( - go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.55.0 - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 + go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.56.0 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 diff --git a/instrumentation/net/http/httptrace/otelhttptrace/go.mod b/instrumentation/net/http/httptrace/otelhttptrace/go.mod index 19c4c2dee37..7d0f16ddd62 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/go.mod +++ b/instrumentation/net/http/httptrace/otelhttptrace/go.mod @@ -5,7 +5,7 @@ go 1.22 require ( github.com/google/go-cmp v0.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/trace v1.31.0 ) diff --git a/instrumentation/net/http/httptrace/otelhttptrace/test/go.mod b/instrumentation/net/http/httptrace/otelhttptrace/test/go.mod index 6fbd987e978..cb48a4b0821 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/test/go.mod +++ b/instrumentation/net/http/httptrace/otelhttptrace/test/go.mod @@ -4,7 +4,7 @@ go 1.22 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.55.0 + go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 ) diff --git a/instrumentation/net/http/httptrace/otelhttptrace/test/version.go b/instrumentation/net/http/httptrace/otelhttptrace/test/version.go index fdd01bba2fc..b2017a022ab 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/test/version.go +++ b/instrumentation/net/http/httptrace/otelhttptrace/test/version.go @@ -5,7 +5,7 @@ package test // import "go.opentelemetry.io/contrib/instrumentation/net/http/htt // Version is the current release version of the httptrace instrumentation test module. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/instrumentation/net/http/httptrace/otelhttptrace/version.go b/instrumentation/net/http/httptrace/otelhttptrace/version.go index 16d9fc97bae..a978bb5b288 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/version.go +++ b/instrumentation/net/http/httptrace/otelhttptrace/version.go @@ -5,7 +5,7 @@ package otelhttptrace // import "go.opentelemetry.io/contrib/instrumentation/net // Version is the current release version of the httptrace instrumentation. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/instrumentation/net/http/otelhttp/example/go.mod b/instrumentation/net/http/otelhttp/example/go.mod index 172c3ab9ea0..3e6b3f26178 100644 --- a/instrumentation/net/http/otelhttp/example/go.mod +++ b/instrumentation/net/http/otelhttp/example/go.mod @@ -5,7 +5,7 @@ go 1.22 replace go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => ../ require ( - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.31.0 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0 diff --git a/instrumentation/net/http/otelhttp/test/go.mod b/instrumentation/net/http/otelhttp/test/go.mod index 04832a090ee..7007dcad30b 100644 --- a/instrumentation/net/http/otelhttp/test/go.mod +++ b/instrumentation/net/http/otelhttp/test/go.mod @@ -4,7 +4,7 @@ go 1.22 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 go.opentelemetry.io/otel/sdk/metric v1.31.0 diff --git a/instrumentation/net/http/otelhttp/test/version.go b/instrumentation/net/http/otelhttp/test/version.go index 08f9ae171ea..9c800f51462 100644 --- a/instrumentation/net/http/otelhttp/test/version.go +++ b/instrumentation/net/http/otelhttp/test/version.go @@ -5,7 +5,7 @@ package test // import "go.opentelemetry.io/contrib/instrumentation/net/http/ote // Version is the current release version of the otelhttp instrumentation test module. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/instrumentation/net/http/otelhttp/version.go b/instrumentation/net/http/otelhttp/version.go index 1133961d393..a07d8689d47 100644 --- a/instrumentation/net/http/otelhttp/version.go +++ b/instrumentation/net/http/otelhttp/version.go @@ -5,7 +5,7 @@ package otelhttp // import "go.opentelemetry.io/contrib/instrumentation/net/http // Version is the current release version of the otelhttp instrumentation. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/instrumentation/runtime/version.go b/instrumentation/runtime/version.go index b1262b2ce7e..0b6b98769be 100644 --- a/instrumentation/runtime/version.go +++ b/instrumentation/runtime/version.go @@ -5,7 +5,7 @@ package runtime // import "go.opentelemetry.io/contrib/instrumentation/runtime" // Version is the current release version of the runtime instrumentation. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/propagators/autoprop/go.mod b/propagators/autoprop/go.mod index 0e8f4e7271c..6b8b0b4ec14 100644 --- a/propagators/autoprop/go.mod +++ b/propagators/autoprop/go.mod @@ -4,10 +4,10 @@ go 1.22 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/contrib/propagators/aws v1.30.0 - go.opentelemetry.io/contrib/propagators/b3 v1.30.0 - go.opentelemetry.io/contrib/propagators/jaeger v1.30.0 - go.opentelemetry.io/contrib/propagators/ot v1.30.0 + go.opentelemetry.io/contrib/propagators/aws v1.31.0 + go.opentelemetry.io/contrib/propagators/b3 v1.31.0 + go.opentelemetry.io/contrib/propagators/jaeger v1.31.0 + go.opentelemetry.io/contrib/propagators/ot v1.31.0 go.opentelemetry.io/otel v1.31.0 ) diff --git a/propagators/aws/version.go b/propagators/aws/version.go index c8349af7fb9..136ea497813 100644 --- a/propagators/aws/version.go +++ b/propagators/aws/version.go @@ -5,7 +5,7 @@ package aws // import "go.opentelemetry.io/contrib/propagators/aws" // Version is the current release version of the AWS XRay propagator. func Version() string { - return "1.30.0" + return "1.31.0" // This string is updated by the pre_release.sh script during release } diff --git a/propagators/b3/version.go b/propagators/b3/version.go index d3b6fa067a7..e3739e616e7 100644 --- a/propagators/b3/version.go +++ b/propagators/b3/version.go @@ -5,7 +5,7 @@ package b3 // import "go.opentelemetry.io/contrib/propagators/b3" // Version is the current release version of the B3 propagator. func Version() string { - return "1.30.0" + return "1.31.0" // This string is updated by the pre_release.sh script during release } diff --git a/propagators/jaeger/version.go b/propagators/jaeger/version.go index 682c4b37ac6..85ba08d6a2f 100644 --- a/propagators/jaeger/version.go +++ b/propagators/jaeger/version.go @@ -5,7 +5,7 @@ package jaeger // import "go.opentelemetry.io/contrib/propagators/jaeger" // Version is the current release version of the Jaeger propagator. func Version() string { - return "1.30.0" + return "1.31.0" // This string is updated by the pre_release.sh script during release } diff --git a/propagators/opencensus/examples/go.mod b/propagators/opencensus/examples/go.mod index 7ff71e26c8e..5f2a6a775b8 100644 --- a/propagators/opencensus/examples/go.mod +++ b/propagators/opencensus/examples/go.mod @@ -4,8 +4,8 @@ go 1.22 require ( go.opencensus.io v0.24.0 - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0 - go.opentelemetry.io/contrib/propagators/opencensus v0.55.0 + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 + go.opentelemetry.io/contrib/propagators/opencensus v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 diff --git a/propagators/opencensus/version.go b/propagators/opencensus/version.go index 652c31b5972..af4a7437264 100644 --- a/propagators/opencensus/version.go +++ b/propagators/opencensus/version.go @@ -5,7 +5,7 @@ package opencensus // import "go.opentelemetry.io/contrib/propagators/opencensus // Version is the current release version of the OpenCensus propagator. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } diff --git a/propagators/ot/version.go b/propagators/ot/version.go index 82e324ed7a9..002afa857c3 100644 --- a/propagators/ot/version.go +++ b/propagators/ot/version.go @@ -5,7 +5,7 @@ package ot // import "go.opentelemetry.io/contrib/propagators/ot" // Version is the current release version of the ot propagator. func Version() string { - return "1.30.0" + return "1.31.0" // This string is updated by the pre_release.sh script during release } diff --git a/samplers/jaegerremote/example/go.mod b/samplers/jaegerremote/example/go.mod index 4679265b750..8352ad21c54 100644 --- a/samplers/jaegerremote/example/go.mod +++ b/samplers/jaegerremote/example/go.mod @@ -4,7 +4,7 @@ go 1.22 require ( github.com/davecgh/go-spew v1.1.1 - go.opentelemetry.io/contrib/samplers/jaegerremote v0.24.0 + go.opentelemetry.io/contrib/samplers/jaegerremote v0.25.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0 go.opentelemetry.io/otel/sdk v1.31.0 diff --git a/samplers/jaegerremote/version.go b/samplers/jaegerremote/version.go index cd9146ee500..ba981e7556d 100644 --- a/samplers/jaegerremote/version.go +++ b/samplers/jaegerremote/version.go @@ -5,7 +5,7 @@ package jaegerremote // import "go.opentelemetry.io/contrib/samplers/jaegerremot // Version is the current release version of the Jaeger remote sampler. func Version() string { - return "0.24.0" + return "0.25.0" // This string is updated by the pre_release.sh script during release } diff --git a/samplers/probability/consistent/version.go b/samplers/probability/consistent/version.go index 619dc46997e..8c55fd4eee0 100644 --- a/samplers/probability/consistent/version.go +++ b/samplers/probability/consistent/version.go @@ -6,7 +6,7 @@ package consistent // import "go.opentelemetry.io/contrib/samplers/probability/c // Version is the current release version of the consistent probability // sampler. func Version() string { - return "0.24.0" + return "0.25.0" // This string is updated by the pre_release.sh script during release } diff --git a/tools/version.go b/tools/version.go index 6b83e2eaf72..fbb1c71c7a0 100644 --- a/tools/version.go +++ b/tools/version.go @@ -5,7 +5,7 @@ package tools // import "go.opentelemetry.io/contrib/tools" // Version is the current release version of the OpenTelemetry Contrib tools. func Version() string { - return "1.30.0" + return "1.31.0" // This string is updated by the pre_release.sh script during release } diff --git a/version.go b/version.go index fc70b9cb235..f3d10ffc725 100644 --- a/version.go +++ b/version.go @@ -7,7 +7,7 @@ package contrib // import "go.opentelemetry.io/contrib" // Version is the current release version of OpenTelemetry Contrib in use. func Version() string { - return "1.30.0" + return "1.31.0" // This string is updated by the pre_release.sh script during release } diff --git a/versions.yaml b/versions.yaml index a2721b14fe4..c27f16b9bf8 100644 --- a/versions.yaml +++ b/versions.yaml @@ -3,7 +3,7 @@ module-sets: stable-v1: - version: v1.30.0 + version: v1.31.0 modules: - go.opentelemetry.io/contrib - go.opentelemetry.io/contrib/tools @@ -16,7 +16,7 @@ module-sets: - go.opentelemetry.io/contrib/detectors/aws/ecs - go.opentelemetry.io/contrib/detectors/aws/eks experimental-instrumentation: - version: v0.55.0 + version: v0.56.0 modules: - go.opentelemetry.io/contrib/bridges/prometheus - go.opentelemetry.io/contrib/detectors/aws/lambda @@ -59,28 +59,28 @@ module-sets: - go.opentelemetry.io/contrib/instrumentation/runtime - go.opentelemetry.io/contrib/zpages experimental-samplers: - version: v0.24.0 + version: v0.25.0 modules: - go.opentelemetry.io/contrib/samplers/jaegerremote - go.opentelemetry.io/contrib/samplers/jaegerremote/example - go.opentelemetry.io/contrib/samplers/probability/consistent experimental-config: - version: v0.10.0 + version: v0.11.0 modules: - go.opentelemetry.io/contrib/config experimental-bridge: - version: v0.5.0 + version: v0.6.0 modules: - go.opentelemetry.io/contrib/bridges/otelslog - go.opentelemetry.io/contrib/bridges/otellogrus - go.opentelemetry.io/contrib/bridges/otelzap experimental-processors: - version: v0.3.0 + version: v0.4.0 modules: - go.opentelemetry.io/contrib/processors/baggagecopy - go.opentelemetry.io/contrib/processors/minsev experimental-detectors: - version: v0.2.0 + version: v0.3.0 modules: - go.opentelemetry.io/contrib/detectors/azure/azurevm excluded-modules: diff --git a/zpages/version.go b/zpages/version.go index ddf1bad20f8..7a81a0551d7 100644 --- a/zpages/version.go +++ b/zpages/version.go @@ -5,7 +5,7 @@ package zpages // import "go.opentelemetry.io/contrib/zpages" // Version is the current release version of the zpages span processor. func Version() string { - return "0.55.0" + return "0.56.0" // This string is updated by the pre_release.sh script during release } From c72f3cada275bc9f8a8cb9d4ae841c1e12248404 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 08:23:14 +0200 Subject: [PATCH 4/9] fix(deps): update module go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp to v0.56.0 (#6251) --- examples/dice/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/dice/go.mod b/examples/dice/go.mod index a17976394ff..948059d99af 100644 --- a/examples/dice/go.mod +++ b/examples/dice/go.mod @@ -4,7 +4,7 @@ go 1.22 require ( go.opentelemetry.io/contrib/bridges/otelslog v0.5.0 - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.7.0 go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.31.0 From d588397812273d3646494ca8762bfb8d84ceb784 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 09:17:09 +0200 Subject: [PATCH 5/9] chore(deps): update module github.com/gabriel-vasile/mimetype to v1.4.6 (#6247) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/gabriel-vasile/mimetype](https://redirect.github.com/gabriel-vasile/mimetype) | `v1.4.5` -> `v1.4.6` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fgabriel-vasile%2fmimetype/v1.4.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fgabriel-vasile%2fmimetype/v1.4.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fgabriel-vasile%2fmimetype/v1.4.5/v1.4.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fgabriel-vasile%2fmimetype/v1.4.5/v1.4.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
gabriel-vasile/mimetype (github.com/gabriel-vasile/mimetype) ### [`v1.4.6`](https://redirect.github.com/gabriel-vasile/mimetype/releases/tag/v1.4.6) [Compare Source](https://redirect.github.com/gabriel-vasile/mimetype/compare/v1.4.5...v1.4.6) #### What's Changed - Improve ftyp detection in [https://github.com/gabriel-vasile/mimetype/pull/564](https://redirect.github.com/gabriel-vasile/mimetype/pull/564) - CSV/TSV use a pool of buffered readers to avoid allocs by in [https://github.com/gabriel-vasile/mimetype/pull/573](https://redirect.github.com/gabriel-vasile/mimetype/pull/573) - feat: Add parquet file detection by [@​kwkelly](https://redirect.github.com/kwkelly) in [https://github.com/gabriel-vasile/mimetype/pull/578](https://redirect.github.com/gabriel-vasile/mimetype/pull/578) - add application/xml as alias of text/xml in [https://github.com/gabriel-vasile/mimetype/pull/581](https://redirect.github.com/gabriel-vasile/mimetype/pull/581) - retract v1.4.4; closes [#​575](https://redirect.github.com/gabriel-vasile/mimetype/issues/575) in [https://github.com/gabriel-vasile/mimetype/pull/591](https://redirect.github.com/gabriel-vasile/mimetype/pull/591) - action for benchmarking detectors in [https://github.com/gabriel-vasile/mimetype/pull/590](https://redirect.github.com/gabriel-vasile/mimetype/pull/590) - Remove GPL file by [@​canadacow](https://redirect.github.com/canadacow) in [https://github.com/gabriel-vasile/mimetype/pull/583](https://redirect.github.com/gabriel-vasile/mimetype/pull/583) #### New Contributors - [@​kwkelly](https://redirect.github.com/kwkelly) made their first contribution in [https://github.com/gabriel-vasile/mimetype/pull/578](https://redirect.github.com/gabriel-vasile/mimetype/pull/578) - [@​canadacow](https://redirect.github.com/canadacow) made their first contribution in [https://github.com/gabriel-vasile/mimetype/pull/583](https://redirect.github.com/gabriel-vasile/mimetype/pull/583) **Full Changelog**: https://github.com/gabriel-vasile/mimetype/compare/v1.4.5...v1.4.6
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-go-contrib). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .../github.com/gin-gonic/gin/otelgin/example/go.mod | 2 +- .../github.com/gin-gonic/gin/otelgin/example/go.sum | 4 ++-- instrumentation/github.com/gin-gonic/gin/otelgin/go.mod | 2 +- instrumentation/github.com/gin-gonic/gin/otelgin/go.sum | 4 ++-- instrumentation/github.com/gin-gonic/gin/otelgin/test/go.mod | 2 +- instrumentation/github.com/gin-gonic/gin/otelgin/test/go.sum | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/example/go.mod b/instrumentation/github.com/gin-gonic/gin/otelgin/example/go.mod index 93637a58603..b427907b3cc 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/example/go.mod +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/example/go.mod @@ -21,7 +21,7 @@ require ( github.com/bytedance/sonic/loader v0.2.0 // indirect github.com/cloudwego/base64x v0.1.4 // indirect github.com/cloudwego/iasm v0.2.0 // indirect - github.com/gabriel-vasile/mimetype v1.4.5 // indirect + github.com/gabriel-vasile/mimetype v1.4.6 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/example/go.sum b/instrumentation/github.com/gin-gonic/gin/otelgin/example/go.sum index 93e9dcf35b2..7201919ccb7 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/example/go.sum +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/example/go.sum @@ -10,8 +10,8 @@ github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4= -github.com/gabriel-vasile/mimetype v1.4.5/go.mod h1:ibHel+/kbxn9x2407k1izTA1S81ku1z/DlgOW2QE0M4= +github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc= +github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/go.mod b/instrumentation/github.com/gin-gonic/gin/otelgin/go.mod index e3de8af222f..cef099e6fb9 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/go.mod +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/go.mod @@ -18,7 +18,7 @@ require ( github.com/cloudwego/base64x v0.1.4 // indirect github.com/cloudwego/iasm v0.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/gabriel-vasile/mimetype v1.4.5 // indirect + github.com/gabriel-vasile/mimetype v1.4.6 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/go.sum b/instrumentation/github.com/gin-gonic/gin/otelgin/go.sum index c6ec79c43b5..693d0172bd7 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/go.sum +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/go.sum @@ -10,8 +10,8 @@ github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4= -github.com/gabriel-vasile/mimetype v1.4.5/go.mod h1:ibHel+/kbxn9x2407k1izTA1S81ku1z/DlgOW2QE0M4= +github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc= +github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/test/go.mod b/instrumentation/github.com/gin-gonic/gin/otelgin/test/go.mod index cdf16354ed8..f921a753c5a 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/test/go.mod +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/test/go.mod @@ -17,7 +17,7 @@ require ( github.com/cloudwego/base64x v0.1.4 // indirect github.com/cloudwego/iasm v0.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/gabriel-vasile/mimetype v1.4.5 // indirect + github.com/gabriel-vasile/mimetype v1.4.6 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/test/go.sum b/instrumentation/github.com/gin-gonic/gin/otelgin/test/go.sum index af428acc453..3c7f60de392 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/test/go.sum +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/test/go.sum @@ -10,8 +10,8 @@ github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4= -github.com/gabriel-vasile/mimetype v1.4.5/go.mod h1:ibHel+/kbxn9x2407k1izTA1S81ku1z/DlgOW2QE0M4= +github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc= +github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= From 4e909f0137d8afa0729aa6d2fb2ac62f2ea4653b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 09:28:05 +0200 Subject: [PATCH 6/9] fix(deps): update module go.opentelemetry.io/contrib/bridges/otelslog to v0.6.0 (#6249) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [go.opentelemetry.io/contrib/bridges/otelslog](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib) | `v0.5.0` -> `v0.6.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/go.opentelemetry.io%2fcontrib%2fbridges%2fotelslog/v0.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/go.opentelemetry.io%2fcontrib%2fbridges%2fotelslog/v0.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/go.opentelemetry.io%2fcontrib%2fbridges%2fotelslog/v0.5.0/v0.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/go.opentelemetry.io%2fcontrib%2fbridges%2fotelslog/v0.5.0/v0.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
open-telemetry/opentelemetry-go-contrib (go.opentelemetry.io/contrib/bridges/otelslog) ### [`v0.6.0`](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v0.6.0) Initial Release. Compatibility with [the opentelemetry-go v0.6.0 release](https://redirect.github.com/open-telemetry/opentelemetry-go/releases/tag/v0.6.0) added for the following: - [exporters/metric/datadog](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/exporters%2Fmetric%2Fdatadog%2Fv0.6.0) - [exporters/metric/dogstatsd](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/exporters%2Fmetric%2Fdogstatsd%2Fv0.6.0) - [instrumentation/gin-gonic/gin](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/instrumentation%2Fgin-gonic%2Fgin%2Fv0.6.0) - [instrumentation/go.mongodb.org/mongo-driver](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/instrumentation%2Fgo.mongodb.org%2Fmongo-driver%2Fv0.6.0) - [instrumentation/gorilla/mux](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/instrumentation%2Fgorilla%2Fmux%2Fv0.6.0) - [instrumentation/labstack/echo](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/instrumentation%2Flabstack%2Fecho%2Fv0.6.0) - [instrumentation/macaron](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/instrumentation%2Fmacaron%2Fv0.6.0) - [instrumentation/runtime](https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/instrumentation%2Fruntime%2Fv0.6.0)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-go-contrib). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- examples/dice/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/dice/go.mod b/examples/dice/go.mod index 948059d99af..7c5e1380a54 100644 --- a/examples/dice/go.mod +++ b/examples/dice/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/contrib/examples/dice go 1.22 require ( - go.opentelemetry.io/contrib/bridges/otelslog v0.5.0 + go.opentelemetry.io/contrib/bridges/otelslog v0.6.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.7.0 From 32c279ae7a6f902fad2cc61fecd193865c3fb882 Mon Sep 17 00:00:00 2001 From: m1heng <18018422+m1heng@users.noreply.github.com> Date: Tue, 15 Oct 2024 15:42:41 +0800 Subject: [PATCH 7/9] Fix panic for nil attributes and move convert funcs to internal/shared/logutil (#6237) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #6235 Align the `convertValue` function in the `otellogrus`, `otelzap` packages with the `otellogr`. --------- Co-authored-by: Robert Pająk --- CHANGELOG.md | 5 + bridges/otellogr/convert.go | 41 +-- bridges/otellogr/convert_test.go | 80 ++---- bridges/otellogr/gen.go | 8 + bridges/otellogr/logsink.go | 37 +++ bridges/otellogr/logsink_test.go | 80 ++++++ bridges/otellogrus/convert.go | 123 +++++++++ bridges/otellogrus/convert_test.go | 265 +++++++++++++++++++ bridges/otellogrus/gen.go | 8 + bridges/otellogrus/hook.go | 56 ---- bridges/otellogrus/hook_test.go | 16 ++ bridges/otelzap/convert.go | 123 +++++++++ bridges/otelzap/convert_test.go | 265 +++++++++++++++++++ bridges/otelzap/encoder.go | 55 ---- bridges/otelzap/encoder_test.go | 8 + bridges/otelzap/gen.go | 8 + internal/shared/logutil/convert.go.tmpl | 123 +++++++++ internal/shared/logutil/convert_test.go.tmpl | 265 +++++++++++++++++++ 18 files changed, 1354 insertions(+), 212 deletions(-) create mode 100644 bridges/otellogr/gen.go create mode 100644 bridges/otellogrus/convert.go create mode 100644 bridges/otellogrus/convert_test.go create mode 100644 bridges/otellogrus/gen.go create mode 100644 bridges/otelzap/convert.go create mode 100644 bridges/otelzap/convert_test.go create mode 100644 bridges/otelzap/gen.go create mode 100644 internal/shared/logutil/convert.go.tmpl create mode 100644 internal/shared/logutil/convert_test.go.tmpl diff --git a/CHANGELOG.md b/CHANGELOG.md index 31f15338a48..de3e71af1b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] +### Fixed + +- Transform nil attribute values to `log.Value` zero value instead of panicking in `go.opentelemetry.io/contrib/bridges/otellogrus`. (#6237) +- Transform nil attribute values to `log.Value` zero value instead of panicking in `go.opentelemetry.io/contrib/bridges/otelzap`. (#6237) + diff --git a/bridges/otellogr/convert.go b/bridges/otellogr/convert.go index 35a79e5248f..cdf2f005813 100644 --- a/bridges/otellogr/convert.go +++ b/bridges/otellogr/convert.go @@ -1,10 +1,12 @@ +// Code created by gotmpl. DO NOT MODIFY. +// source: internal/shared/logutil/convert.go.tmpl + // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 package otellogr // import "go.opentelemetry.io/contrib/bridges/otellogr" import ( - "context" "fmt" "math" "reflect" @@ -14,42 +16,7 @@ import ( "go.opentelemetry.io/otel/log" ) -// convertKVs converts a list of key-value pairs to a list of [log.KeyValue]. -// The last [context.Context] value is returned as the context. -// If no context is found, the original context is returned. -func convertKVs(ctx context.Context, keysAndValues ...any) (context.Context, []log.KeyValue) { - if len(keysAndValues) == 0 { - return ctx, nil - } - if len(keysAndValues)%2 != 0 { - // Ensure an odd number of items here does not corrupt the list. - keysAndValues = append(keysAndValues, nil) - } - - kvs := make([]log.KeyValue, 0, len(keysAndValues)/2) - for i := 0; i < len(keysAndValues); i += 2 { - k, ok := keysAndValues[i].(string) - if !ok { - // Ensure that the key is a string. - k = fmt.Sprintf("%v", keysAndValues[i]) - } - - v := keysAndValues[i+1] - if vCtx, ok := v.(context.Context); ok { - // Special case when a field is of context.Context type. - ctx = vCtx - continue - } - - kvs = append(kvs, log.KeyValue{ - Key: k, - Value: convertValue(v), - }) - } - - return ctx, kvs -} - +// convertValue converts various types to log.Value. func convertValue(v any) log.Value { // Handling the most common types without reflect is a small perf win. switch val := v.(type) { diff --git a/bridges/otellogr/convert_test.go b/bridges/otellogr/convert_test.go index d39afb9137e..1a852defbe0 100644 --- a/bridges/otellogr/convert_test.go +++ b/bridges/otellogr/convert_test.go @@ -1,3 +1,6 @@ +// Code created by gotmpl. DO NOT MODIFY. +// source: internal/shared/logutil/convert_test.go.tmpl + // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 @@ -15,70 +18,6 @@ import ( "go.opentelemetry.io/otel/log" ) -func TestConvertKVs(t *testing.T) { - ctx := context.WithValue(context.Background(), "key", "value") // nolint: revive,staticcheck // test context - - for _, tt := range []struct { - name string - kvs []any - wantKVs []log.KeyValue - wantCtx context.Context - }{ - { - name: "empty", - kvs: []any{}, - }, - { - name: "single_value", - kvs: []any{"key", "value"}, - wantKVs: []log.KeyValue{ - log.String("key", "value"), - }, - }, - { - name: "multiple_values", - kvs: []any{"key1", "value1", "key2", "value2"}, - wantKVs: []log.KeyValue{ - log.String("key1", "value1"), - log.String("key2", "value2"), - }, - }, - { - name: "missing_value", - kvs: []any{"key1", "value1", "key2"}, - wantKVs: []log.KeyValue{ - log.String("key1", "value1"), - {Key: "key2", Value: log.Value{}}, - }, - }, - { - name: "key_not_string", - kvs: []any{42, "value"}, - wantKVs: []log.KeyValue{ - log.String("42", "value"), - }, - }, - { - name: "context", - kvs: []any{"ctx", ctx, "key", "value"}, - wantKVs: []log.KeyValue{log.String("key", "value")}, - wantCtx: ctx, - }, - { - name: "last_context", - kvs: []any{"key", context.Background(), "ctx", ctx}, - wantKVs: []log.KeyValue{}, - wantCtx: ctx, - }, - } { - t.Run(tt.name, func(t *testing.T) { - ctx, kvs := convertKVs(nil, tt.kvs...) // nolint: staticcheck // pass nil context - assert.Equal(t, tt.wantKVs, kvs) - assert.Equal(t, tt.wantCtx, ctx) - }) - } -} - func TestConvertValue(t *testing.T) { for _, tt := range []struct { name string @@ -293,11 +232,24 @@ func TestConvertValue(t *testing.T) { }, wantValue: log.StringValue("{Name:John Age:42}"), }, + { + name: "nil_struct_ptr", + value: (*struct { + Name string + Age int + })(nil), + wantValue: log.Value{}, + }, { name: "ctx", value: context.Background(), wantValue: log.StringValue("context.Background"), }, + { + name: "unhandled type", + value: chan int(nil), + wantValue: log.StringValue("unhandled: (chan int) "), + }, } { t.Run(tt.name, func(t *testing.T) { assert.Equal(t, tt.wantValue, convertValue(tt.value)) diff --git a/bridges/otellogr/gen.go b/bridges/otellogr/gen.go new file mode 100644 index 00000000000..bef73947bd6 --- /dev/null +++ b/bridges/otellogr/gen.go @@ -0,0 +1,8 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package otellogr // import "go.opentelemetry.io/contrib/bridges/otellogr" + +// Generate convert: +//go:generate gotmpl --body=../../internal/shared/logutil/convert_test.go.tmpl "--data={ \"pkg\": \"otellogr\" }" --out=convert_test.go +//go:generate gotmpl --body=../../internal/shared/logutil/convert.go.tmpl "--data={ \"pkg\": \"otellogr\" }" --out=convert.go diff --git a/bridges/otellogr/logsink.go b/bridges/otellogr/logsink.go index 1acd6c55e56..482314c8719 100644 --- a/bridges/otellogr/logsink.go +++ b/bridges/otellogr/logsink.go @@ -45,6 +45,7 @@ package otellogr // import "go.opentelemetry.io/contrib/bridges/otellogr" import ( "context" + "fmt" "github.com/go-logr/logr" @@ -198,3 +199,39 @@ func (l LogSink) WithValues(keysAndValues ...any) logr.LogSink { l.ctx = ctx return &l } + +// convertKVs converts a list of key-value pairs to a list of [log.KeyValue]. +// The last [context.Context] value is returned as the context. +// If no context is found, the original context is returned. +func convertKVs(ctx context.Context, keysAndValues ...any) (context.Context, []log.KeyValue) { + if len(keysAndValues) == 0 { + return ctx, nil + } + if len(keysAndValues)%2 != 0 { + // Ensure an odd number of items here does not corrupt the list. + keysAndValues = append(keysAndValues, nil) + } + + kvs := make([]log.KeyValue, 0, len(keysAndValues)/2) + for i := 0; i < len(keysAndValues); i += 2 { + k, ok := keysAndValues[i].(string) + if !ok { + // Ensure that the key is a string. + k = fmt.Sprintf("%v", keysAndValues[i]) + } + + v := keysAndValues[i+1] + if vCtx, ok := v.(context.Context); ok { + // Special case when a field is of context.Context type. + ctx = vCtx + continue + } + + kvs = append(kvs, log.KeyValue{ + Key: k, + Value: convertValue(v), + }) + } + + return ctx, kvs +} diff --git a/bridges/otellogr/logsink_test.go b/bridges/otellogr/logsink_test.go index 8b47f871313..b0ba3446b1a 100644 --- a/bridges/otellogr/logsink_test.go +++ b/bridges/otellogr/logsink_test.go @@ -3,6 +3,7 @@ package otellogr import ( + "context" "testing" "time" @@ -216,6 +217,21 @@ func TestLogSink(t *testing.T) { }, }, }, + { + name: "info_with_normal_attr_and_nil_pointer_attr", + f: func(l *logr.Logger) { + var p *int + l.WithValues("key", "value", "nil_pointer", p).Info("info message with attrs") + }, + wantRecords: map[string][]log.Record{ + name: { + buildRecord(log.StringValue("info message with attrs"), time.Time{}, log.SeverityInfo, []log.KeyValue{ + log.String("key", "value"), + log.Empty("nil_pointer"), + }), + }, + }, + }, } { t.Run(tt.name, func(t *testing.T) { rec := logtest.NewRecorder() @@ -263,3 +279,67 @@ func assertRecords(t *testing.T, want, got []logtest.EmittedRecord) { logtest.AssertRecordEqual(t, j.Record, got[i].Record) } } + +func TestConvertKVs(t *testing.T) { + ctx := context.WithValue(context.Background(), "key", "value") // nolint: revive,staticcheck // test context + + for _, tt := range []struct { + name string + kvs []any + wantKVs []log.KeyValue + wantCtx context.Context + }{ + { + name: "empty", + kvs: []any{}, + }, + { + name: "single_value", + kvs: []any{"key", "value"}, + wantKVs: []log.KeyValue{ + log.String("key", "value"), + }, + }, + { + name: "multiple_values", + kvs: []any{"key1", "value1", "key2", "value2"}, + wantKVs: []log.KeyValue{ + log.String("key1", "value1"), + log.String("key2", "value2"), + }, + }, + { + name: "missing_value", + kvs: []any{"key1", "value1", "key2"}, + wantKVs: []log.KeyValue{ + log.String("key1", "value1"), + {Key: "key2", Value: log.Value{}}, + }, + }, + { + name: "key_not_string", + kvs: []any{42, "value"}, + wantKVs: []log.KeyValue{ + log.String("42", "value"), + }, + }, + { + name: "context", + kvs: []any{"ctx", ctx, "key", "value"}, + wantKVs: []log.KeyValue{log.String("key", "value")}, + wantCtx: ctx, + }, + { + name: "last_context", + kvs: []any{"key", context.Background(), "ctx", ctx}, + wantKVs: []log.KeyValue{}, + wantCtx: ctx, + }, + } { + t.Run(tt.name, func(t *testing.T) { + ctx, kvs := convertKVs(nil, tt.kvs...) // nolint: staticcheck // pass nil context + assert.Equal(t, tt.wantKVs, kvs) + assert.Equal(t, tt.wantCtx, ctx) + }) + } +} diff --git a/bridges/otellogrus/convert.go b/bridges/otellogrus/convert.go new file mode 100644 index 00000000000..01307719222 --- /dev/null +++ b/bridges/otellogrus/convert.go @@ -0,0 +1,123 @@ +// Code created by gotmpl. DO NOT MODIFY. +// source: internal/shared/logutil/convert.go.tmpl + +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package otellogrus // import "go.opentelemetry.io/contrib/bridges/otellogrus" + +import ( + "fmt" + "math" + "reflect" + "strconv" + "time" + + "go.opentelemetry.io/otel/log" +) + +// convertValue converts various types to log.Value. +func convertValue(v any) log.Value { + // Handling the most common types without reflect is a small perf win. + switch val := v.(type) { + case bool: + return log.BoolValue(val) + case string: + return log.StringValue(val) + case int: + return log.Int64Value(int64(val)) + case int8: + return log.Int64Value(int64(val)) + case int16: + return log.Int64Value(int64(val)) + case int32: + return log.Int64Value(int64(val)) + case int64: + return log.Int64Value(val) + case uint: + return convertUintValue(uint64(val)) + case uint8: + return log.Int64Value(int64(val)) + case uint16: + return log.Int64Value(int64(val)) + case uint32: + return log.Int64Value(int64(val)) + case uint64: + return convertUintValue(val) + case uintptr: + return convertUintValue(uint64(val)) + case float32: + return log.Float64Value(float64(val)) + case float64: + return log.Float64Value(val) + case time.Duration: + return log.Int64Value(val.Nanoseconds()) + case complex64: + r := log.Float64("r", real(complex128(val))) + i := log.Float64("i", imag(complex128(val))) + return log.MapValue(r, i) + case complex128: + r := log.Float64("r", real(val)) + i := log.Float64("i", imag(val)) + return log.MapValue(r, i) + case time.Time: + return log.Int64Value(val.UnixNano()) + case []byte: + return log.BytesValue(val) + case error: + return log.StringValue(val.Error()) + } + + t := reflect.TypeOf(v) + if t == nil { + return log.Value{} + } + val := reflect.ValueOf(v) + switch t.Kind() { + case reflect.Struct: + return log.StringValue(fmt.Sprintf("%+v", v)) + case reflect.Slice, reflect.Array: + items := make([]log.Value, 0, val.Len()) + for i := 0; i < val.Len(); i++ { + items = append(items, convertValue(val.Index(i).Interface())) + } + return log.SliceValue(items...) + case reflect.Map: + kvs := make([]log.KeyValue, 0, val.Len()) + for _, k := range val.MapKeys() { + var key string + switch k.Kind() { + case reflect.String: + key = k.String() + default: + key = fmt.Sprintf("%+v", k.Interface()) + } + kvs = append(kvs, log.KeyValue{ + Key: key, + Value: convertValue(val.MapIndex(k).Interface()), + }) + } + return log.MapValue(kvs...) + case reflect.Ptr, reflect.Interface: + if val.IsNil() { + return log.Value{} + } + return convertValue(val.Elem().Interface()) + } + + // Try to handle this as gracefully as possible. + // + // Don't panic here. it is preferable to have user's open issue + // asking why their attributes have a "unhandled: " prefix than + // say that their code is panicking. + return log.StringValue(fmt.Sprintf("unhandled: (%s) %+v", t, v)) +} + +// convertUintValue converts a uint64 to a log.Value. +// If the value is too large to fit in an int64, it is converted to a string. +func convertUintValue(v uint64) log.Value { + if v > math.MaxInt64 { + return log.StringValue(strconv.FormatUint(v, 10)) + } + return log.Int64Value(int64(v)) +} diff --git a/bridges/otellogrus/convert_test.go b/bridges/otellogrus/convert_test.go new file mode 100644 index 00000000000..ad0b30a3668 --- /dev/null +++ b/bridges/otellogrus/convert_test.go @@ -0,0 +1,265 @@ +// Code created by gotmpl. DO NOT MODIFY. +// source: internal/shared/logutil/convert_test.go.tmpl + +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package otellogrus + +import ( + "context" + "errors" + "fmt" + "testing" + "time" + + "github.com/stretchr/testify/assert" + + "go.opentelemetry.io/otel/log" +) + +func TestConvertValue(t *testing.T) { + for _, tt := range []struct { + name string + value any + wantValue log.Value + }{ + { + name: "bool", + value: true, + wantValue: log.BoolValue(true), + }, + { + name: "string", + value: "value", + wantValue: log.StringValue("value"), + }, + { + name: "int", + value: 10, + wantValue: log.Int64Value(10), + }, + { + name: "int8", + value: int8(127), + wantValue: log.Int64Value(127), + }, + { + name: "int16", + value: int16(32767), + wantValue: log.Int64Value(32767), + }, + { + name: "int32", + value: int32(2147483647), + wantValue: log.Int64Value(2147483647), + }, + { + name: "int64", + value: int64(9223372036854775807), + wantValue: log.Int64Value(9223372036854775807), + }, + { + name: "uint", + value: uint(42), + wantValue: log.Int64Value(42), + }, + { + name: "uint8", + value: uint8(255), + wantValue: log.Int64Value(255), + }, + { + name: "uint16", + value: uint16(65535), + wantValue: log.Int64Value(65535), + }, + { + name: "uint32", + value: uint32(4294967295), + wantValue: log.Int64Value(4294967295), + }, + { + name: "uint64", + value: uint64(9223372036854775807), + wantValue: log.Int64Value(9223372036854775807), + }, + { + name: "uint64-max", + value: uint64(18446744073709551615), + wantValue: log.StringValue("18446744073709551615"), + }, + { + name: "uintptr", + value: uintptr(12345), + wantValue: log.Int64Value(12345), + }, + { + name: "float64", + value: float64(3.14159), + wantValue: log.Float64Value(3.14159), + }, + { + name: "time.Duration", + value: time.Second, + wantValue: log.Int64Value(1_000_000_000), + }, + { + name: "complex64", + value: complex64(complex(float32(1), float32(2))), + wantValue: log.MapValue(log.Float64("r", 1), log.Float64("i", 2)), + }, + { + name: "complex128", + value: complex(float64(3), float64(4)), + wantValue: log.MapValue(log.Float64("r", 3), log.Float64("i", 4)), + }, + { + name: "time.Time", + value: time.Unix(1000, 1000), + wantValue: log.Int64Value(time.Unix(1000, 1000).UnixNano()), + }, + { + name: "[]byte", + value: []byte("hello"), + wantValue: log.BytesValue([]byte("hello")), + }, + { + name: "error", + value: errors.New("test error"), + wantValue: log.StringValue("test error"), + }, + { + name: "error", + value: errors.New("test error"), + wantValue: log.StringValue("test error"), + }, + { + name: "error-nested", + value: fmt.Errorf("test error: %w", errors.New("nested error")), + wantValue: log.StringValue("test error: nested error"), + }, + { + name: "nil", + value: nil, + wantValue: log.Value{}, + }, + { + name: "nil_ptr", + value: (*int)(nil), + wantValue: log.Value{}, + }, + { + name: "int_ptr", + value: func() *int { i := 93; return &i }(), + wantValue: log.Int64Value(93), + }, + { + name: "string_ptr", + value: func() *string { s := "hello"; return &s }(), + wantValue: log.StringValue("hello"), + }, + { + name: "bool_ptr", + value: func() *bool { b := true; return &b }(), + wantValue: log.BoolValue(true), + }, + { + name: "int_empty_array", + value: []int{}, + wantValue: log.SliceValue([]log.Value{}...), + }, + { + name: "int_array", + value: []int{1, 2, 3}, + wantValue: log.SliceValue([]log.Value{ + log.Int64Value(1), + log.Int64Value(2), + log.Int64Value(3), + }...), + }, + { + name: "key_value_map", + value: map[string]int{"one": 1}, + wantValue: log.MapValue( + log.Int64("one", 1), + ), + }, + { + name: "int_string_map", + value: map[int]string{1: "one"}, + wantValue: log.MapValue( + log.String("1", "one"), + ), + }, + { + name: "nested_map", + value: map[string]map[string]int{"nested": {"one": 1}}, + wantValue: log.MapValue( + log.Map("nested", + log.Int64("one", 1), + ), + ), + }, + { + name: "struct_key_map", + value: map[struct{ Name string }]int{ + {Name: "John"}: 42, + }, + wantValue: log.MapValue( + log.Int64("{Name:John}", 42), + ), + }, + { + name: "struct", + value: struct { + Name string + Age int + }{ + Name: "John", + Age: 42, + }, + wantValue: log.StringValue("{Name:John Age:42}"), + }, + { + name: "struct_ptr", + value: &struct { + Name string + Age int + }{ + Name: "John", + Age: 42, + }, + wantValue: log.StringValue("{Name:John Age:42}"), + }, + { + name: "nil_struct_ptr", + value: (*struct { + Name string + Age int + })(nil), + wantValue: log.Value{}, + }, + { + name: "ctx", + value: context.Background(), + wantValue: log.StringValue("context.Background"), + }, + { + name: "unhandled type", + value: chan int(nil), + wantValue: log.StringValue("unhandled: (chan int) "), + }, + } { + t.Run(tt.name, func(t *testing.T) { + assert.Equal(t, tt.wantValue, convertValue(tt.value)) + }) + } +} + +func TestConvertValueFloat32(t *testing.T) { + value := convertValue(float32(3.14)) + want := log.Float64Value(3.14) + + assert.InDelta(t, value.AsFloat64(), want.AsFloat64(), 0.0001) +} diff --git a/bridges/otellogrus/gen.go b/bridges/otellogrus/gen.go new file mode 100644 index 00000000000..f1813dddb7b --- /dev/null +++ b/bridges/otellogrus/gen.go @@ -0,0 +1,8 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package otellogrus // import "go.opentelemetry.io/contrib/bridges/otellogrus" + +// Generate convert: +//go:generate gotmpl --body=../../internal/shared/logutil/convert_test.go.tmpl "--data={ \"pkg\": \"otellogrus\" }" --out=convert_test.go +//go:generate gotmpl --body=../../internal/shared/logutil/convert.go.tmpl "--data={ \"pkg\": \"otellogrus\" }" --out=convert.go diff --git a/bridges/otellogrus/hook.go b/bridges/otellogrus/hook.go index 6ebe85d138f..16dbc607926 100644 --- a/bridges/otellogrus/hook.go +++ b/bridges/otellogrus/hook.go @@ -33,9 +33,6 @@ package otellogrus // import "go.opentelemetry.io/contrib/bridges/otellogrus" import ( - "fmt" - "reflect" - "github.com/sirupsen/logrus" "go.opentelemetry.io/otel/log" @@ -206,56 +203,3 @@ func convertSeverity(level logrus.Level) log.Severity { return log.SeverityUndefined } } - -func convertValue(v interface{}) log.Value { - switch v := v.(type) { - case bool: - return log.BoolValue(v) - case []byte: - return log.BytesValue(v) - case float64: - return log.Float64Value(v) - case int: - return log.IntValue(v) - case int64: - return log.Int64Value(v) - case string: - return log.StringValue(v) - } - - t := reflect.TypeOf(v) - if t == nil { - return log.Value{} - } - val := reflect.ValueOf(v) - switch t.Kind() { - case reflect.Struct: - return log.StringValue(fmt.Sprintf("%+v", v)) - case reflect.Slice, reflect.Array: - items := make([]log.Value, 0, val.Len()) - for i := 0; i < val.Len(); i++ { - items = append(items, convertValue(val.Index(i).Interface())) - } - return log.SliceValue(items...) - case reflect.Map: - kvs := make([]log.KeyValue, 0, val.Len()) - for _, k := range val.MapKeys() { - var key string - // If the key is a struct, use %+v to print the struct fields. - if k.Kind() == reflect.Struct { - key = fmt.Sprintf("%+v", k.Interface()) - } else { - key = fmt.Sprintf("%v", k.Interface()) - } - kvs = append(kvs, log.KeyValue{ - Key: key, - Value: convertValue(val.MapIndex(k).Interface()), - }) - } - return log.MapValue(kvs...) - case reflect.Ptr, reflect.Interface: - return convertValue(val.Elem().Interface()) - } - - return log.StringValue(fmt.Sprintf("unhandled attribute type: (%s) %+v", t, v)) -} diff --git a/bridges/otellogrus/hook_test.go b/bridges/otellogrus/hook_test.go index 6e95bb93ddd..300c59a0253 100644 --- a/bridges/otellogrus/hook_test.go +++ b/bridges/otellogrus/hook_test.go @@ -148,6 +148,7 @@ func TestHookLevels(t *testing.T) { func TestHookFire(t *testing.T) { const name = "name" now := time.Now() + var nilPointer *struct{} for _, tt := range []struct { name string @@ -269,6 +270,21 @@ func TestHookFire(t *testing.T) { }, }, }, + { + name: "emits a log entry with data containing a nil pointer", + entry: &logrus.Entry{ + Data: logrus.Fields{ + "nil_pointer": nilPointer, + }, + }, + wantRecords: map[string][]log.Record{ + name: { + buildRecord(log.StringValue(""), time.Time{}, log.SeverityFatal4, []log.KeyValue{ + {Key: "nil_pointer", Value: log.Value{}}, + }), + }, + }, + }, } { t.Run(tt.name, func(t *testing.T) { rec := logtest.NewRecorder() diff --git a/bridges/otelzap/convert.go b/bridges/otelzap/convert.go new file mode 100644 index 00000000000..6f64c794b76 --- /dev/null +++ b/bridges/otelzap/convert.go @@ -0,0 +1,123 @@ +// Code created by gotmpl. DO NOT MODIFY. +// source: internal/shared/logutil/convert.go.tmpl + +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package otelzap // import "go.opentelemetry.io/contrib/bridges/otelzap" + +import ( + "fmt" + "math" + "reflect" + "strconv" + "time" + + "go.opentelemetry.io/otel/log" +) + +// convertValue converts various types to log.Value. +func convertValue(v any) log.Value { + // Handling the most common types without reflect is a small perf win. + switch val := v.(type) { + case bool: + return log.BoolValue(val) + case string: + return log.StringValue(val) + case int: + return log.Int64Value(int64(val)) + case int8: + return log.Int64Value(int64(val)) + case int16: + return log.Int64Value(int64(val)) + case int32: + return log.Int64Value(int64(val)) + case int64: + return log.Int64Value(val) + case uint: + return convertUintValue(uint64(val)) + case uint8: + return log.Int64Value(int64(val)) + case uint16: + return log.Int64Value(int64(val)) + case uint32: + return log.Int64Value(int64(val)) + case uint64: + return convertUintValue(val) + case uintptr: + return convertUintValue(uint64(val)) + case float32: + return log.Float64Value(float64(val)) + case float64: + return log.Float64Value(val) + case time.Duration: + return log.Int64Value(val.Nanoseconds()) + case complex64: + r := log.Float64("r", real(complex128(val))) + i := log.Float64("i", imag(complex128(val))) + return log.MapValue(r, i) + case complex128: + r := log.Float64("r", real(val)) + i := log.Float64("i", imag(val)) + return log.MapValue(r, i) + case time.Time: + return log.Int64Value(val.UnixNano()) + case []byte: + return log.BytesValue(val) + case error: + return log.StringValue(val.Error()) + } + + t := reflect.TypeOf(v) + if t == nil { + return log.Value{} + } + val := reflect.ValueOf(v) + switch t.Kind() { + case reflect.Struct: + return log.StringValue(fmt.Sprintf("%+v", v)) + case reflect.Slice, reflect.Array: + items := make([]log.Value, 0, val.Len()) + for i := 0; i < val.Len(); i++ { + items = append(items, convertValue(val.Index(i).Interface())) + } + return log.SliceValue(items...) + case reflect.Map: + kvs := make([]log.KeyValue, 0, val.Len()) + for _, k := range val.MapKeys() { + var key string + switch k.Kind() { + case reflect.String: + key = k.String() + default: + key = fmt.Sprintf("%+v", k.Interface()) + } + kvs = append(kvs, log.KeyValue{ + Key: key, + Value: convertValue(val.MapIndex(k).Interface()), + }) + } + return log.MapValue(kvs...) + case reflect.Ptr, reflect.Interface: + if val.IsNil() { + return log.Value{} + } + return convertValue(val.Elem().Interface()) + } + + // Try to handle this as gracefully as possible. + // + // Don't panic here. it is preferable to have user's open issue + // asking why their attributes have a "unhandled: " prefix than + // say that their code is panicking. + return log.StringValue(fmt.Sprintf("unhandled: (%s) %+v", t, v)) +} + +// convertUintValue converts a uint64 to a log.Value. +// If the value is too large to fit in an int64, it is converted to a string. +func convertUintValue(v uint64) log.Value { + if v > math.MaxInt64 { + return log.StringValue(strconv.FormatUint(v, 10)) + } + return log.Int64Value(int64(v)) +} diff --git a/bridges/otelzap/convert_test.go b/bridges/otelzap/convert_test.go new file mode 100644 index 00000000000..79d41de30b0 --- /dev/null +++ b/bridges/otelzap/convert_test.go @@ -0,0 +1,265 @@ +// Code created by gotmpl. DO NOT MODIFY. +// source: internal/shared/logutil/convert_test.go.tmpl + +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package otelzap + +import ( + "context" + "errors" + "fmt" + "testing" + "time" + + "github.com/stretchr/testify/assert" + + "go.opentelemetry.io/otel/log" +) + +func TestConvertValue(t *testing.T) { + for _, tt := range []struct { + name string + value any + wantValue log.Value + }{ + { + name: "bool", + value: true, + wantValue: log.BoolValue(true), + }, + { + name: "string", + value: "value", + wantValue: log.StringValue("value"), + }, + { + name: "int", + value: 10, + wantValue: log.Int64Value(10), + }, + { + name: "int8", + value: int8(127), + wantValue: log.Int64Value(127), + }, + { + name: "int16", + value: int16(32767), + wantValue: log.Int64Value(32767), + }, + { + name: "int32", + value: int32(2147483647), + wantValue: log.Int64Value(2147483647), + }, + { + name: "int64", + value: int64(9223372036854775807), + wantValue: log.Int64Value(9223372036854775807), + }, + { + name: "uint", + value: uint(42), + wantValue: log.Int64Value(42), + }, + { + name: "uint8", + value: uint8(255), + wantValue: log.Int64Value(255), + }, + { + name: "uint16", + value: uint16(65535), + wantValue: log.Int64Value(65535), + }, + { + name: "uint32", + value: uint32(4294967295), + wantValue: log.Int64Value(4294967295), + }, + { + name: "uint64", + value: uint64(9223372036854775807), + wantValue: log.Int64Value(9223372036854775807), + }, + { + name: "uint64-max", + value: uint64(18446744073709551615), + wantValue: log.StringValue("18446744073709551615"), + }, + { + name: "uintptr", + value: uintptr(12345), + wantValue: log.Int64Value(12345), + }, + { + name: "float64", + value: float64(3.14159), + wantValue: log.Float64Value(3.14159), + }, + { + name: "time.Duration", + value: time.Second, + wantValue: log.Int64Value(1_000_000_000), + }, + { + name: "complex64", + value: complex64(complex(float32(1), float32(2))), + wantValue: log.MapValue(log.Float64("r", 1), log.Float64("i", 2)), + }, + { + name: "complex128", + value: complex(float64(3), float64(4)), + wantValue: log.MapValue(log.Float64("r", 3), log.Float64("i", 4)), + }, + { + name: "time.Time", + value: time.Unix(1000, 1000), + wantValue: log.Int64Value(time.Unix(1000, 1000).UnixNano()), + }, + { + name: "[]byte", + value: []byte("hello"), + wantValue: log.BytesValue([]byte("hello")), + }, + { + name: "error", + value: errors.New("test error"), + wantValue: log.StringValue("test error"), + }, + { + name: "error", + value: errors.New("test error"), + wantValue: log.StringValue("test error"), + }, + { + name: "error-nested", + value: fmt.Errorf("test error: %w", errors.New("nested error")), + wantValue: log.StringValue("test error: nested error"), + }, + { + name: "nil", + value: nil, + wantValue: log.Value{}, + }, + { + name: "nil_ptr", + value: (*int)(nil), + wantValue: log.Value{}, + }, + { + name: "int_ptr", + value: func() *int { i := 93; return &i }(), + wantValue: log.Int64Value(93), + }, + { + name: "string_ptr", + value: func() *string { s := "hello"; return &s }(), + wantValue: log.StringValue("hello"), + }, + { + name: "bool_ptr", + value: func() *bool { b := true; return &b }(), + wantValue: log.BoolValue(true), + }, + { + name: "int_empty_array", + value: []int{}, + wantValue: log.SliceValue([]log.Value{}...), + }, + { + name: "int_array", + value: []int{1, 2, 3}, + wantValue: log.SliceValue([]log.Value{ + log.Int64Value(1), + log.Int64Value(2), + log.Int64Value(3), + }...), + }, + { + name: "key_value_map", + value: map[string]int{"one": 1}, + wantValue: log.MapValue( + log.Int64("one", 1), + ), + }, + { + name: "int_string_map", + value: map[int]string{1: "one"}, + wantValue: log.MapValue( + log.String("1", "one"), + ), + }, + { + name: "nested_map", + value: map[string]map[string]int{"nested": {"one": 1}}, + wantValue: log.MapValue( + log.Map("nested", + log.Int64("one", 1), + ), + ), + }, + { + name: "struct_key_map", + value: map[struct{ Name string }]int{ + {Name: "John"}: 42, + }, + wantValue: log.MapValue( + log.Int64("{Name:John}", 42), + ), + }, + { + name: "struct", + value: struct { + Name string + Age int + }{ + Name: "John", + Age: 42, + }, + wantValue: log.StringValue("{Name:John Age:42}"), + }, + { + name: "struct_ptr", + value: &struct { + Name string + Age int + }{ + Name: "John", + Age: 42, + }, + wantValue: log.StringValue("{Name:John Age:42}"), + }, + { + name: "nil_struct_ptr", + value: (*struct { + Name string + Age int + })(nil), + wantValue: log.Value{}, + }, + { + name: "ctx", + value: context.Background(), + wantValue: log.StringValue("context.Background"), + }, + { + name: "unhandled type", + value: chan int(nil), + wantValue: log.StringValue("unhandled: (chan int) "), + }, + } { + t.Run(tt.name, func(t *testing.T) { + assert.Equal(t, tt.wantValue, convertValue(tt.value)) + }) + } +} + +func TestConvertValueFloat32(t *testing.T) { + value := convertValue(float32(3.14)) + want := log.Float64Value(3.14) + + assert.InDelta(t, value.AsFloat64(), want.AsFloat64(), 0.0001) +} diff --git a/bridges/otelzap/encoder.go b/bridges/otelzap/encoder.go index a5ddfb48d32..1144ec579a5 100644 --- a/bridges/otelzap/encoder.go +++ b/bridges/otelzap/encoder.go @@ -4,8 +4,6 @@ package otelzap // import "go.opentelemetry.io/contrib/bridges/otelzap" import ( - "fmt" - "reflect" "time" "go.uber.org/zap/zapcore" @@ -274,56 +272,3 @@ func (a *arrayEncoder) AppendUint32(v uint32) { a.AppendInt64(int64(v)) func (a *arrayEncoder) AppendUint16(v uint16) { a.AppendInt64(int64(v)) } func (a *arrayEncoder) AppendUint8(v uint8) { a.AppendInt64(int64(v)) } func (a *arrayEncoder) AppendUintptr(v uintptr) { a.AppendUint64(uint64(v)) } - -func convertValue(v interface{}) log.Value { - switch v := v.(type) { - case bool: - return log.BoolValue(v) - case []byte: - return log.BytesValue(v) - case float64: - return log.Float64Value(v) - case int: - return log.IntValue(v) - case int64: - return log.Int64Value(v) - case string: - return log.StringValue(v) - } - - t := reflect.TypeOf(v) - if t == nil { - return log.Value{} - } - val := reflect.ValueOf(v) - switch t.Kind() { - case reflect.Struct: - return log.StringValue(fmt.Sprintf("%+v", v)) - case reflect.Slice, reflect.Array: - items := make([]log.Value, 0, val.Len()) - for i := 0; i < val.Len(); i++ { - items = append(items, convertValue(val.Index(i).Interface())) - } - return log.SliceValue(items...) - case reflect.Map: - kvs := make([]log.KeyValue, 0, val.Len()) - for _, k := range val.MapKeys() { - var key string - // If the key is a struct, use %+v to print the struct fields. - if k.Kind() == reflect.Struct { - key = fmt.Sprintf("%+v", k.Interface()) - } else { - key = fmt.Sprintf("%v", k.Interface()) - } - kvs = append(kvs, log.KeyValue{ - Key: key, - Value: convertValue(val.MapIndex(k).Interface()), - }) - } - return log.MapValue(kvs...) - case reflect.Ptr, reflect.Interface: - return convertValue(val.Elem().Interface()) - } - - return log.StringValue(fmt.Sprintf("unhandled attribute type: (%s) %+v", t, v)) -} diff --git a/bridges/otelzap/encoder_test.go b/bridges/otelzap/encoder_test.go index 4e284b82d35..ba3d726e3c6 100644 --- a/bridges/otelzap/encoder_test.go +++ b/bridges/otelzap/encoder_test.go @@ -72,6 +72,14 @@ func TestObjectEncoder(t *testing.T) { }, expected: map[string]interface{}{"foo": int64(5)}, }, + { + desc: "AddReflected (nil pointer)", + f: func(e zapcore.ObjectEncoder) { + var p *struct{} + assert.NoError(t, e.AddReflected("k", p), "Expected AddReflected to succeed.") + }, + expected: nil, + }, { desc: "AddBinary", f: func(e zapcore.ObjectEncoder) { e.AddBinary("k", []byte("foo")) }, diff --git a/bridges/otelzap/gen.go b/bridges/otelzap/gen.go new file mode 100644 index 00000000000..5c8b2eea7e4 --- /dev/null +++ b/bridges/otelzap/gen.go @@ -0,0 +1,8 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package otelzap // import "go.opentelemetry.io/contrib/bridges/otelzap" + +// Generate convert: +//go:generate gotmpl --body=../../internal/shared/logutil/convert_test.go.tmpl "--data={ \"pkg\": \"otelzap\" }" --out=convert_test.go +//go:generate gotmpl --body=../../internal/shared/logutil/convert.go.tmpl "--data={ \"pkg\": \"otelzap\" }" --out=convert.go diff --git a/internal/shared/logutil/convert.go.tmpl b/internal/shared/logutil/convert.go.tmpl new file mode 100644 index 00000000000..22be1e2a62a --- /dev/null +++ b/internal/shared/logutil/convert.go.tmpl @@ -0,0 +1,123 @@ +// Code created by gotmpl. DO NOT MODIFY. +// source: internal/shared/logutil/convert.go.tmpl + +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package {{.pkg}} // import "go.opentelemetry.io/contrib/bridges/{{.pkg}}" + +import ( + "fmt" + "math" + "reflect" + "strconv" + "time" + + "go.opentelemetry.io/otel/log" +) + +// convertValue converts various types to log.Value. +func convertValue(v any) log.Value { + // Handling the most common types without reflect is a small perf win. + switch val := v.(type) { + case bool: + return log.BoolValue(val) + case string: + return log.StringValue(val) + case int: + return log.Int64Value(int64(val)) + case int8: + return log.Int64Value(int64(val)) + case int16: + return log.Int64Value(int64(val)) + case int32: + return log.Int64Value(int64(val)) + case int64: + return log.Int64Value(val) + case uint: + return convertUintValue(uint64(val)) + case uint8: + return log.Int64Value(int64(val)) + case uint16: + return log.Int64Value(int64(val)) + case uint32: + return log.Int64Value(int64(val)) + case uint64: + return convertUintValue(val) + case uintptr: + return convertUintValue(uint64(val)) + case float32: + return log.Float64Value(float64(val)) + case float64: + return log.Float64Value(val) + case time.Duration: + return log.Int64Value(val.Nanoseconds()) + case complex64: + r := log.Float64("r", real(complex128(val))) + i := log.Float64("i", imag(complex128(val))) + return log.MapValue(r, i) + case complex128: + r := log.Float64("r", real(val)) + i := log.Float64("i", imag(val)) + return log.MapValue(r, i) + case time.Time: + return log.Int64Value(val.UnixNano()) + case []byte: + return log.BytesValue(val) + case error: + return log.StringValue(val.Error()) + } + + t := reflect.TypeOf(v) + if t == nil { + return log.Value{} + } + val := reflect.ValueOf(v) + switch t.Kind() { + case reflect.Struct: + return log.StringValue(fmt.Sprintf("%+v", v)) + case reflect.Slice, reflect.Array: + items := make([]log.Value, 0, val.Len()) + for i := 0; i < val.Len(); i++ { + items = append(items, convertValue(val.Index(i).Interface())) + } + return log.SliceValue(items...) + case reflect.Map: + kvs := make([]log.KeyValue, 0, val.Len()) + for _, k := range val.MapKeys() { + var key string + switch k.Kind() { + case reflect.String: + key = k.String() + default: + key = fmt.Sprintf("%+v", k.Interface()) + } + kvs = append(kvs, log.KeyValue{ + Key: key, + Value: convertValue(val.MapIndex(k).Interface()), + }) + } + return log.MapValue(kvs...) + case reflect.Ptr, reflect.Interface: + if val.IsNil() { + return log.Value{} + } + return convertValue(val.Elem().Interface()) + } + + // Try to handle this as gracefully as possible. + // + // Don't panic here. it is preferable to have user's open issue + // asking why their attributes have a "unhandled: " prefix than + // say that their code is panicking. + return log.StringValue(fmt.Sprintf("unhandled: (%s) %+v", t, v)) +} + +// convertUintValue converts a uint64 to a log.Value. +// If the value is too large to fit in an int64, it is converted to a string. +func convertUintValue(v uint64) log.Value { + if v > math.MaxInt64 { + return log.StringValue(strconv.FormatUint(v, 10)) + } + return log.Int64Value(int64(v)) +} diff --git a/internal/shared/logutil/convert_test.go.tmpl b/internal/shared/logutil/convert_test.go.tmpl new file mode 100644 index 00000000000..0e44527dec6 --- /dev/null +++ b/internal/shared/logutil/convert_test.go.tmpl @@ -0,0 +1,265 @@ +// Code created by gotmpl. DO NOT MODIFY. +// source: internal/shared/logutil/convert_test.go.tmpl + +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package {{.pkg}} + +import ( + "context" + "errors" + "fmt" + "testing" + "time" + + "github.com/stretchr/testify/assert" + + "go.opentelemetry.io/otel/log" +) + +func TestConvertValue(t *testing.T) { + for _, tt := range []struct { + name string + value any + wantValue log.Value + }{ + { + name: "bool", + value: true, + wantValue: log.BoolValue(true), + }, + { + name: "string", + value: "value", + wantValue: log.StringValue("value"), + }, + { + name: "int", + value: 10, + wantValue: log.Int64Value(10), + }, + { + name: "int8", + value: int8(127), + wantValue: log.Int64Value(127), + }, + { + name: "int16", + value: int16(32767), + wantValue: log.Int64Value(32767), + }, + { + name: "int32", + value: int32(2147483647), + wantValue: log.Int64Value(2147483647), + }, + { + name: "int64", + value: int64(9223372036854775807), + wantValue: log.Int64Value(9223372036854775807), + }, + { + name: "uint", + value: uint(42), + wantValue: log.Int64Value(42), + }, + { + name: "uint8", + value: uint8(255), + wantValue: log.Int64Value(255), + }, + { + name: "uint16", + value: uint16(65535), + wantValue: log.Int64Value(65535), + }, + { + name: "uint32", + value: uint32(4294967295), + wantValue: log.Int64Value(4294967295), + }, + { + name: "uint64", + value: uint64(9223372036854775807), + wantValue: log.Int64Value(9223372036854775807), + }, + { + name: "uint64-max", + value: uint64(18446744073709551615), + wantValue: log.StringValue("18446744073709551615"), + }, + { + name: "uintptr", + value: uintptr(12345), + wantValue: log.Int64Value(12345), + }, + { + name: "float64", + value: float64(3.14159), + wantValue: log.Float64Value(3.14159), + }, + { + name: "time.Duration", + value: time.Second, + wantValue: log.Int64Value(1_000_000_000), + }, + { + name: "complex64", + value: complex64(complex(float32(1), float32(2))), + wantValue: log.MapValue(log.Float64("r", 1), log.Float64("i", 2)), + }, + { + name: "complex128", + value: complex(float64(3), float64(4)), + wantValue: log.MapValue(log.Float64("r", 3), log.Float64("i", 4)), + }, + { + name: "time.Time", + value: time.Unix(1000, 1000), + wantValue: log.Int64Value(time.Unix(1000, 1000).UnixNano()), + }, + { + name: "[]byte", + value: []byte("hello"), + wantValue: log.BytesValue([]byte("hello")), + }, + { + name: "error", + value: errors.New("test error"), + wantValue: log.StringValue("test error"), + }, + { + name: "error", + value: errors.New("test error"), + wantValue: log.StringValue("test error"), + }, + { + name: "error-nested", + value: fmt.Errorf("test error: %w", errors.New("nested error")), + wantValue: log.StringValue("test error: nested error"), + }, + { + name: "nil", + value: nil, + wantValue: log.Value{}, + }, + { + name: "nil_ptr", + value: (*int)(nil), + wantValue: log.Value{}, + }, + { + name: "int_ptr", + value: func() *int { i := 93; return &i }(), + wantValue: log.Int64Value(93), + }, + { + name: "string_ptr", + value: func() *string { s := "hello"; return &s }(), + wantValue: log.StringValue("hello"), + }, + { + name: "bool_ptr", + value: func() *bool { b := true; return &b }(), + wantValue: log.BoolValue(true), + }, + { + name: "int_empty_array", + value: []int{}, + wantValue: log.SliceValue([]log.Value{}...), + }, + { + name: "int_array", + value: []int{1, 2, 3}, + wantValue: log.SliceValue([]log.Value{ + log.Int64Value(1), + log.Int64Value(2), + log.Int64Value(3), + }...), + }, + { + name: "key_value_map", + value: map[string]int{"one": 1}, + wantValue: log.MapValue( + log.Int64("one", 1), + ), + }, + { + name: "int_string_map", + value: map[int]string{1: "one"}, + wantValue: log.MapValue( + log.String("1", "one"), + ), + }, + { + name: "nested_map", + value: map[string]map[string]int{"nested": {"one": 1}}, + wantValue: log.MapValue( + log.Map("nested", + log.Int64("one", 1), + ), + ), + }, + { + name: "struct_key_map", + value: map[struct{ Name string }]int{ + {Name: "John"}: 42, + }, + wantValue: log.MapValue( + log.Int64("{Name:John}", 42), + ), + }, + { + name: "struct", + value: struct { + Name string + Age int + }{ + Name: "John", + Age: 42, + }, + wantValue: log.StringValue("{Name:John Age:42}"), + }, + { + name: "struct_ptr", + value: &struct { + Name string + Age int + }{ + Name: "John", + Age: 42, + }, + wantValue: log.StringValue("{Name:John Age:42}"), + }, + { + name: "nil_struct_ptr", + value: (*struct { + Name string + Age int + })(nil), + wantValue: log.Value{}, + }, + { + name: "ctx", + value: context.Background(), + wantValue: log.StringValue("context.Background"), + }, + { + name: "unhandled type", + value: chan int(nil), + wantValue: log.StringValue("unhandled: (chan int) "), + }, + } { + t.Run(tt.name, func(t *testing.T) { + assert.Equal(t, tt.wantValue, convertValue(tt.value)) + }) + } +} + +func TestConvertValueFloat32(t *testing.T) { + value := convertValue(float32(3.14)) + want := log.Float64Value(3.14) + + assert.InDelta(t, value.AsFloat64(), want.AsFloat64(), 0.0001) +} From 0aad96ec48db6d3ad7d4582d54baa1bb54a06f10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Paj=C4=85k?= Date: Tue, 15 Oct 2024 09:54:35 +0200 Subject: [PATCH 8/9] otelslog: Transform nil attribute to empty log.Value (#6246) Fixes https://github.com/open-telemetry/opentelemetry-go-contrib/issues/6242 --- CHANGELOG.md | 1 + bridges/otelslog/handler.go | 6 +++++- bridges/otelslog/handler_test.go | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de3e71af1b5..75e6f953d79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Transform nil attribute values to `log.Value` zero value instead of panicking in `go.opentelemetry.io/contrib/bridges/otellogrus`. (#6237) - Transform nil attribute values to `log.Value` zero value instead of panicking in `go.opentelemetry.io/contrib/bridges/otelzap`. (#6237) +- Transform nil attribute values to `log.Value` zero value instead of `log.StringValue("")` in `go.opentelemetry.io/contrib/bridges/otelslog`. (#6246) diff --git a/bridges/otelslog/handler.go b/bridges/otelslog/handler.go index 348cf81b1fa..dc3e985a897 100644 --- a/bridges/otelslog/handler.go +++ b/bridges/otelslog/handler.go @@ -26,8 +26,9 @@ // // Attribute values are transformed based on their [slog.Kind]: // -// - [slog.KindAny] are transformed to [log.StringValue]. The value is +// - [slog.KindAny] non-nil values are transformed to [log.StringValue] // encoded using [fmt.Sprintf]. +// Nil values are transformed to a zero value of [log.Value]. // - [slog.KindBool] are transformed to [log.BoolValue] directly. // - [slog.KindDuration] are transformed to [log.Int64Value] as nanoseconds. // - [slog.KindFloat64] are transformed to [log.Float64Value] directly. @@ -411,6 +412,9 @@ func (b *kvBuffer) AddAttr(attr slog.Attr) bool { func convertValue(v slog.Value) log.Value { switch v.Kind() { case slog.KindAny: + if v.Any() == nil { + return log.Value{} + } return log.StringValue(fmt.Sprintf("%+v", v.Any())) case slog.KindBool: return log.BoolValue(v.Bool()) diff --git a/bridges/otelslog/handler_test.go b/bridges/otelslog/handler_test.go index 761889de2ee..febc496bcf2 100644 --- a/bridges/otelslog/handler_test.go +++ b/bridges/otelslog/handler_test.go @@ -240,6 +240,7 @@ func TestSLogHandler(t *testing.T) { "string", "str", "time", now, "uint64", uint64(3), + "nil", nil, // KindGroup and KindLogValuer are left for slogtest.TestHandler. ) }, @@ -254,6 +255,7 @@ func TestSLogHandler(t *testing.T) { hasAttr("string", "str"), hasAttr("time", now.UnixNano()), hasAttr("uint64", int64(3)), + hasAttr("nil", nil), }}, }, { From 856523b45f7473e0d14a842b25f056a9ef993d4e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 12:46:15 +0200 Subject: [PATCH 9/9] fix(deps): update module github.com/prometheus/client_golang to v1.20.5 (#6255) --- bridges/prometheus/go.mod | 2 +- bridges/prometheus/go.sum | 4 ++-- config/go.mod | 2 +- config/go.sum | 4 ++-- examples/prometheus/go.mod | 2 +- examples/prometheus/go.sum | 4 ++-- exporters/autoexport/go.mod | 2 +- exporters/autoexport/go.sum | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bridges/prometheus/go.mod b/bridges/prometheus/go.mod index 4902de9d403..27c689568ad 100644 --- a/bridges/prometheus/go.mod +++ b/bridges/prometheus/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/contrib/bridges/prometheus go 1.22 require ( - github.com/prometheus/client_golang v1.20.4 + github.com/prometheus/client_golang v1.20.5 github.com/prometheus/client_model v0.6.1 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/otel v1.31.0 diff --git a/bridges/prometheus/go.sum b/bridges/prometheus/go.sum index cb9dd431830..96eb7480697 100644 --- a/bridges/prometheus/go.sum +++ b/bridges/prometheus/go.sum @@ -24,8 +24,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= -github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= +github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.60.0 h1:+V9PAREWNvJMAuJ1x1BaWl9dewMW4YrHZQbx0sJNllA= diff --git a/config/go.mod b/config/go.mod index 6d610914dc4..a8244f9f61b 100644 --- a/config/go.mod +++ b/config/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/contrib/config go 1.22 require ( - github.com/prometheus/client_golang v1.20.4 + github.com/prometheus/client_golang v1.20.5 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.7.0 diff --git a/config/go.sum b/config/go.sum index ed91dffe9c9..de27d8bac1d 100644 --- a/config/go.sum +++ b/config/go.sum @@ -29,8 +29,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= -github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= +github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.60.0 h1:+V9PAREWNvJMAuJ1x1BaWl9dewMW4YrHZQbx0sJNllA= diff --git a/examples/prometheus/go.mod b/examples/prometheus/go.mod index fb939323145..8dd904e8c82 100644 --- a/examples/prometheus/go.mod +++ b/examples/prometheus/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/contrib/examples/prometheus go 1.22 require ( - github.com/prometheus/client_golang v1.20.4 + github.com/prometheus/client_golang v1.20.5 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/exporters/prometheus v0.53.0 go.opentelemetry.io/otel/metric v1.31.0 diff --git a/examples/prometheus/go.sum b/examples/prometheus/go.sum index 5c1fc741ebd..0161fc6daea 100644 --- a/examples/prometheus/go.sum +++ b/examples/prometheus/go.sum @@ -21,8 +21,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= -github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= +github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.60.0 h1:+V9PAREWNvJMAuJ1x1BaWl9dewMW4YrHZQbx0sJNllA= diff --git a/exporters/autoexport/go.mod b/exporters/autoexport/go.mod index cde78e36f3e..cf0d7f93d5a 100644 --- a/exporters/autoexport/go.mod +++ b/exporters/autoexport/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/contrib/exporters/autoexport go 1.22 require ( - github.com/prometheus/client_golang v1.20.4 + github.com/prometheus/client_golang v1.20.5 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/contrib/bridges/prometheus v0.56.0 go.opentelemetry.io/otel v1.31.0 diff --git a/exporters/autoexport/go.sum b/exporters/autoexport/go.sum index d9c53a43f16..4130a17bfad 100644 --- a/exporters/autoexport/go.sum +++ b/exporters/autoexport/go.sum @@ -29,8 +29,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= -github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= +github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.60.0 h1:+V9PAREWNvJMAuJ1x1BaWl9dewMW4YrHZQbx0sJNllA=