From 0363fc5d478cb62b7cd8e5089f59136c7b9afeed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 12:39:50 +0000 Subject: mod: do: bump google.golang.org/api from 0.153.0 to 0.156.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.153.0 to 0.156.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.153.0...v0.156.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../go/.release-please-manifest-individual.json | 6 +- .../go/.release-please-manifest-submodules.json | 259 +++++++++++---------- .../go/.release-please-manifest.json | 2 +- vendor/cloud.google.com/go/CHANGES.md | 12 + vendor/cloud.google.com/go/go.work | 3 + vendor/cloud.google.com/go/go.work.sum | 50 ++-- .../go/internal/.repo-metadata-full.json | 40 ++++ vendor/cloud.google.com/go/internal/trace/trace.go | 146 ++++++++++-- .../go/release-please-config-yoshi-submodules.json | 9 + 9 files changed, 359 insertions(+), 168 deletions(-) (limited to 'vendor/cloud.google.com') diff --git a/vendor/cloud.google.com/go/.release-please-manifest-individual.json b/vendor/cloud.google.com/go/.release-please-manifest-individual.json index 38a67bae4..cb4a64b1f 100644 --- a/vendor/cloud.google.com/go/.release-please-manifest-individual.json +++ b/vendor/cloud.google.com/go/.release-please-manifest-individual.json @@ -1,7 +1,7 @@ { "auth": "0.1.0", "auth/oauth2adapt": "0.1.0", - "bigquery": "1.57.0", + "bigquery": "1.57.1", "bigtable": "1.20.0", "datastore": "1.15.0", "errorreporting": "0.3.0", @@ -10,6 +10,6 @@ "profiler": "0.4.0", "pubsub": "1.33.0", "pubsublite": "1.8.1", - "spanner": "1.51.0", - "storage": "1.34.0" + "spanner": "1.53.0", + "storage": "1.35.1" } diff --git a/vendor/cloud.google.com/go/.release-please-manifest-submodules.json b/vendor/cloud.google.com/go/.release-please-manifest-submodules.json index 12fed1bc1..74dd7d1a5 100644 --- a/vendor/cloud.google.com/go/.release-please-manifest-submodules.json +++ b/vendor/cloud.google.com/go/.release-please-manifest-submodules.json @@ -1,131 +1,134 @@ { - "accessapproval": "1.7.3", - "accesscontextmanager": "1.8.3", - "advisorynotifications": "1.2.2", - "ai": "0.1.3", - "aiplatform": "1.51.2", - "alloydb": "1.6.2", - "analytics": "0.21.5", - "apigateway": "1.6.3", - "apigeeconnect": "1.6.3", - "apigeeregistry": "0.8.1", - "apikeys": "1.1.3", - "appengine": "1.8.3", - "area120": "0.8.3", - "artifactregistry": "1.14.5", - "asset": "1.15.2", - "assuredworkloads": "1.11.3", - "automl": "1.13.3", - "baremetalsolution": "1.2.2", - "batch": "1.6.2", - "beyondcorp": "1.0.2", - "billing": "1.17.3", - "binaryauthorization": "1.7.2", - "certificatemanager": "1.7.3", - "channel": "1.17.2", - "cloudbuild": "1.14.2", - "clouddms": "1.7.2", - "cloudtasks": "1.12.3", - "commerce": "0.1.2", - "compute": "1.23.2", + "accessapproval": "1.7.4", + "accesscontextmanager": "1.8.4", + "advisorynotifications": "1.2.3", + "ai": "0.1.4", + "aiplatform": "1.55.0", + "alloydb": "1.7.0", + "analytics": "0.21.6", + "apigateway": "1.6.4", + "apigeeconnect": "1.6.4", + "apigeeregistry": "0.8.2", + "apikeys": "1.1.4", + "appengine": "1.8.4", + "area120": "0.8.4", + "artifactregistry": "1.14.6", + "asset": "1.15.3", + "assuredworkloads": "1.11.4", + "automl": "1.13.4", + "baremetalsolution": "1.2.3", + "batch": "1.7.0", + "beyondcorp": "1.0.3", + "billing": "1.17.4", + "binaryauthorization": "1.8.0", + "certificatemanager": "1.7.4", + "channel": "1.17.3", + "cloudbuild": "1.15.0", + "clouddms": "1.7.3", + "cloudprofiler": "0.1.0", + "cloudtasks": "1.12.4", + "commerce": "0.1.3", + "compute": "1.23.3", "compute/metadata": "0.2.3", - "confidentialcomputing": "1.3.2", - "config": "0.1.3", - "contactcenterinsights": "1.11.2", - "container": "1.27.0", - "containeranalysis": "0.11.2", - "datacatalog": "1.18.2", - "dataflow": "0.9.3", - "dataform": "0.9.0", - "datafusion": "1.7.3", - "datalabeling": "0.8.3", - "dataplex": "1.11.0", - "dataproc": "2.2.2", - "dataqna": "0.8.3", - "datastream": "1.10.2", - "deploy": "1.14.1", - "dialogflow": "1.44.2", - "discoveryengine": "1.2.2", - "dlp": "1.11.0", - "documentai": "1.23.4", - "domains": "0.9.3", - "edgecontainer": "1.1.3", - "essentialcontacts": "1.6.4", - "eventarc": "1.13.2", - "filestore": "1.7.3", - "functions": "1.15.3", - "gkebackup": "1.3.3", - "gkeconnect": "0.8.3", - "gkehub": "0.14.3", - "gkemulticloud": "1.0.2", - "grafeas": "0.3.3", - "gsuiteaddons": "1.6.3", - "iam": "1.1.4", - "iap": "1.9.2", - "ids": "1.4.3", - "iot": "1.7.3", - "kms": "1.15.4", - "language": "1.12.1", - "lifesciences": "0.9.3", - "longrunning": "0.5.3", - "managedidentities": "1.6.3", - "maps": "1.6.0", - "mediatranslation": "0.8.3", - "memcache": "1.10.3", - "metastore": "1.13.2", - "migrationcenter": "0.2.2", - "monitoring": "1.16.2", - "netapp": "0.2.2", - "networkconnectivity": "1.14.2", - "networkmanagement": "1.9.2", - "networksecurity": "0.9.3", - "notebooks": "1.11.1", - "optimization": "1.6.1", - "orchestration": "1.8.3", - "orgpolicy": "1.11.3", - "osconfig": "1.12.3", - "oslogin": "1.12.1", - "phishingprotection": "0.8.3", - "policysimulator": "0.2.1", - "policytroubleshooter": "1.10.1", - "privatecatalog": "0.9.3", - "rapidmigrationassessment": "1.0.3", - "recaptchaenterprise": "2.8.2", - "recommendationengine": "0.8.3", - "recommender": "1.11.2", - "redis": "1.14.0", - "resourcemanager": "1.9.3", - "resourcesettings": "1.6.3", - "retail": "1.14.3", - "run": "1.3.2", - "scheduler": "1.10.3", - "secretmanager": "1.11.3", - "securesourcemanager": "0.1.1", - "security": "1.15.3", - "securitycenter": "1.24.1", - "servicecontrol": "1.12.3", - "servicedirectory": "1.11.2", - "servicemanagement": "1.9.4", - "serviceusage": "1.8.2", - "shell": "1.7.3", - "shopping": "0.2.1", - "speech": "1.20.0", - "storageinsights": "1.0.3", - "storagetransfer": "1.10.2", - "support": "1.0.2", - "talent": "1.6.4", - "texttospeech": "1.7.3", - "tpu": "1.6.3", - "trace": "1.10.3", - "translate": "1.9.2", - "video": "1.20.2", - "videointelligence": "1.11.3", - "vision": "2.7.4", - "vmmigration": "1.7.3", - "vmwareengine": "1.0.2", - "vpcaccess": "1.7.3", - "webrisk": "1.9.3", - "websecurityscanner": "1.6.3", - "workflows": "1.12.2", - "workstations": "0.5.2" + "confidentialcomputing": "1.4.0", + "config": "0.1.4", + "contactcenterinsights": "1.12.1", + "container": "1.29.0", + "containeranalysis": "0.11.3", + "datacatalog": "1.19.0", + "dataflow": "0.9.4", + "dataform": "0.9.1", + "datafusion": "1.7.4", + "datalabeling": "0.8.4", + "dataplex": "1.12.0", + "dataproc": "2.3.0", + "dataqna": "0.8.4", + "datastream": "1.10.3", + "deploy": "1.15.0", + "dialogflow": "1.46.0", + "discoveryengine": "1.2.3", + "dlp": "1.11.1", + "documentai": "1.23.6", + "domains": "0.9.4", + "edgecontainer": "1.1.4", + "edgenetwork": "0.1.0", + "essentialcontacts": "1.6.5", + "eventarc": "1.13.3", + "filestore": "1.8.0", + "functions": "1.15.4", + "gkebackup": "1.3.4", + "gkeconnect": "0.8.4", + "gkehub": "0.14.4", + "gkemulticloud": "1.0.3", + "grafeas": "0.3.4", + "gsuiteaddons": "1.6.4", + "iam": "1.1.5", + "iap": "1.9.3", + "ids": "1.4.4", + "iot": "1.7.4", + "kms": "1.15.5", + "language": "1.12.2", + "lifesciences": "0.9.4", + "longrunning": "0.5.4", + "managedidentities": "1.6.4", + "maps": "1.6.1", + "mediatranslation": "0.8.4", + "memcache": "1.10.4", + "metastore": "1.13.3", + "migrationcenter": "0.2.3", + "monitoring": "1.16.3", + "netapp": "0.2.3", + "networkconnectivity": "1.14.3", + "networkmanagement": "1.9.3", + "networksecurity": "0.9.4", + "notebooks": "1.11.2", + "optimization": "1.6.2", + "orchestration": "1.8.4", + "orgpolicy": "1.11.4", + "osconfig": "1.12.4", + "oslogin": "1.12.2", + "phishingprotection": "0.8.4", + "policysimulator": "0.2.2", + "policytroubleshooter": "1.10.2", + "privatecatalog": "0.9.4", + "rapidmigrationassessment": "1.0.4", + "recaptchaenterprise": "2.9.0", + "recommendationengine": "0.8.4", + "recommender": "1.11.3", + "redis": "1.14.1", + "resourcemanager": "1.9.4", + "resourcesettings": "1.6.4", + "retail": "1.14.4", + "run": "1.3.3", + "scheduler": "1.10.5", + "secretmanager": "1.11.4", + "securesourcemanager": "0.1.2", + "security": "1.15.4", + "securitycenter": "1.24.3", + "servicecontrol": "1.12.4", + "servicedirectory": "1.11.3", + "servicemanagement": "1.9.5", + "serviceusage": "1.8.3", + "shell": "1.7.4", + "shopping": "0.2.2", + "speech": "1.21.0", + "storageinsights": "1.0.4", + "storagetransfer": "1.10.3", + "support": "1.0.3", + "talent": "1.6.5", + "telcoautomation": "0.1.1", + "texttospeech": "1.7.4", + "tpu": "1.6.4", + "trace": "1.10.4", + "translate": "1.9.3", + "video": "1.20.3", + "videointelligence": "1.11.4", + "vision": "2.7.5", + "vmmigration": "1.7.4", + "vmwareengine": "1.0.3", + "vpcaccess": "1.7.4", + "webrisk": "1.9.4", + "websecurityscanner": "1.6.4", + "workflows": "1.12.3", + "workstations": "0.5.3" } diff --git a/vendor/cloud.google.com/go/.release-please-manifest.json b/vendor/cloud.google.com/go/.release-please-manifest.json index f1afd6591..6d4c016ba 100644 --- a/vendor/cloud.google.com/go/.release-please-manifest.json +++ b/vendor/cloud.google.com/go/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.110.10" + ".": "0.111.0" } diff --git a/vendor/cloud.google.com/go/CHANGES.md b/vendor/cloud.google.com/go/CHANGES.md index a418e2ee1..acb4bc570 100644 --- a/vendor/cloud.google.com/go/CHANGES.md +++ b/vendor/cloud.google.com/go/CHANGES.md @@ -1,5 +1,17 @@ # Changes +## [0.111.0](https://github.com/googleapis/google-cloud-go/compare/v0.110.10...v0.111.0) (2023-11-29) + + +### Features + +* **internal/trace:** Add OpenTelemetry support ([#8655](https://github.com/googleapis/google-cloud-go/issues/8655)) ([7a46b54](https://github.com/googleapis/google-cloud-go/commit/7a46b5428f239871993d66be2c7c667121f60a6f)), refs [#2205](https://github.com/googleapis/google-cloud-go/issues/2205) + + +### Bug Fixes + +* **all:** Bump google.golang.org/api to v0.149.0 ([#8959](https://github.com/googleapis/google-cloud-go/issues/8959)) ([8d2ab9f](https://github.com/googleapis/google-cloud-go/commit/8d2ab9f320a86c1c0fab90513fc05861561d0880)) + ## [0.110.10](https://github.com/googleapis/google-cloud-go/compare/v0.110.9...v0.110.10) (2023-10-31) diff --git a/vendor/cloud.google.com/go/go.work b/vendor/cloud.google.com/go/go.work index 09b4ea64a..6080ac63b 100644 --- a/vendor/cloud.google.com/go/go.work +++ b/vendor/cloud.google.com/go/go.work @@ -32,6 +32,7 @@ use ( ./channel ./cloudbuild ./clouddms + ./cloudprofiler ./cloudtasks ./commerce ./compute @@ -58,6 +59,7 @@ use ( ./documentai ./domains ./edgecontainer + ./edgenetwork ./errorreporting ./essentialcontacts ./eventarc @@ -141,6 +143,7 @@ use ( ./storagetransfer ./support ./talent + ./telcoautomation ./texttospeech ./tpu ./trace diff --git a/vendor/cloud.google.com/go/go.work.sum b/vendor/cloud.google.com/go/go.work.sum index 1d48c1d9e..3cfd0678e 100644 --- a/vendor/cloud.google.com/go/go.work.sum +++ b/vendor/cloud.google.com/go/go.work.sum @@ -1,40 +1,48 @@ cloud.google.com/go/gaming v1.9.0 h1:7vEhFnZmd931Mo7sZ6pJy7uQPDxF7m7v8xtBheG08tc= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.18.0 h1:ugYJK/neZQtQeh2jc5xNoDFiMQojlAkoqJMRb7vTu1U= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.18.0/go.mod h1:Xx0VKh7GJ4si3rmElbh19Mejxz68ibWg/J30ZOMrqzU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.20.0 h1:tk85AYGwOf6VNtoOQi8w/kVDi2vmPxp3/OU2FsUpdcA= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.20.0/go.mod h1:Xx0VKh7GJ4si3rmElbh19Mejxz68ibWg/J30ZOMrqzU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.21.0 h1:OEgjQy1rH4Fbn5IpuI9d0uhLl+j6DkDvh9Q2Ucd6GK8= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.21.0/go.mod h1:EUfJ8lb3pjD8VasPPwqIvG2XVCE6DOT8tY5tcwbWA+A= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.45.0 h1:o/Nf55GfyLwGDaHkVAkRGgBXeExce73L6N9w2PZTB3k= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.45.0/go.mod h1:qkFPtMouQjW5ugdHIOthiTbweVHUTqbS0Qsu55KqXks= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk= -github.com/cloudprober/cloudprober v0.12.8/go.mod h1:RBgsmwfacACvW/VX6/iNVEK+WnNXDhj/5WvII8N76KQ= github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20230305113008-0c11038e723f/go.mod h1:8LHG1a3SRW71ettAD/jW13h8c6AqjVSeL11RAdgaqpo= +github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= +github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= github.com/googleapis/gax-go/v2 v2.9.1/go.mod h1:4FG3gMrVZlyMp5itSYKMU9z/lBE7+SbnUOvzH2HqbEY= github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/mmcloughlin/avo v0.5.0/go.mod h1:ChHFdoV7ql95Wi7vuq2YT1bwCJqiWdZrQ1im3VujLYM= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +go.opentelemetry.io/contrib/detectors/gcp v1.21.0 h1:K0k6FDSGs65yAka7HFKOqRHagqlMImHUUztERrCkpQc= +go.opentelemetry.io/contrib/detectors/gcp v1.21.0/go.mod h1:G+Ci5NwilrCP1bj79ApA5wKQnKKBQI46as55sz+y0rQ= +go.opentelemetry.io/otel v1.20.0 h1:vsb/ggIY+hUjD/zCAQHpzTmndPqv/ml2ArbsbfBYTAc= +go.opentelemetry.io/otel v1.20.0/go.mod h1:oUIGj3D77RwJdM6PPZImDpSZGDvkD9fhesHny69JFrs= +go.opentelemetry.io/otel/bridge/opencensus v0.43.0 h1:E/sf+2slCUb7wqh5FHwhdwKWTA+VXyMMAcFNlKVf4yw= +go.opentelemetry.io/otel/bridge/opencensus v0.43.0/go.mod h1:2xuXI78Xp9cttLsJMF/Y08cJUqckLt0kLasn+vcHR5w= +go.opentelemetry.io/otel/metric v1.20.0 h1:ZlrO8Hu9+GAhnepmRGhSU7/VkpjrNowxRN9GyKR4wzA= +go.opentelemetry.io/otel/metric v1.20.0/go.mod h1:90DRw3nfK4D7Sm/75yQ00gTJxtkBxX+wu6YaNymbpVM= +go.opentelemetry.io/otel/sdk v1.20.0 h1:5Jf6imeFZlZtKv9Qbo6qt2ZkmWtdWx/wzcCbNUlAWGM= +go.opentelemetry.io/otel/sdk v1.20.0/go.mod h1:rmkSx1cZCm/tn16iWDn1GQbLtsW/LvsdEEFzCSRM6V0= +go.opentelemetry.io/otel/sdk/metric v1.20.0 h1:5eD40l/H2CqdKmbSV7iht2KMK0faAIL2pVYzJOWobGk= +go.opentelemetry.io/otel/sdk/metric v1.20.0/go.mod h1:AGvpC+YF/jblITiafMTYgvRBUiwi9hZf0EYE2E5XlS8= +go.opentelemetry.io/otel/trace v1.20.0 h1:+yxVAPZPbQhbC3OfAkeIVTky6iTFpcr4SiY9om7mXSQ= +go.opentelemetry.io/otel/trace v1.20.0/go.mod h1:HJSK7F/hA5RlzpZ0zKDCHCDHm556LCDtKaAo6JmBFUU= golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= -golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= +golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= golang.org/x/tools v0.10.0 h1:tvDr/iQoUqNdohiYm0LmmKcBk+q86lb9EprIUFhHHGg= -google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98/go.mod h1:S7mY02OqCJTD0E1OiQy1F72PWFB4bZJ87cAtLPYgDR0= -google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= -google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:CCviP9RmpZ1mxVr8MUjCnSiY09IbAXZxhLE6EhHIdPU= -google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97/go.mod h1:t1VqOqqvce95G3hIDCT5FeO3YUc6Q4Oe24L/+rNMxRk= -google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:EMfReVxb80Dq1hhioy0sOsY9jCE46YDgHlJ7fWVUWRE= -google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= -google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= -google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97/go.mod h1:iargEX0SFPm3xcfMI0d1domjg0ZF4Aa0p2awqyxhvF0= -google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:SUBoKXbI1Efip18FClrQVGjWcyd0QZd8KkvdP34t7ww= -google.golang.org/genproto/googleapis/bytestream v0.0.0-20230629202037-9506855d4529/go.mod h1:ylj+BE99M198VPbBh6A8d9n3w8fChvyLK3wwBOjXBFA= -google.golang.org/genproto/googleapis/bytestream v0.0.0-20230911183012-2d3300fd4832/go.mod h1:NjCQG/D8JandXxM57PZbAJL1DCNL6EypA0vPPwfsc7c= -google.golang.org/genproto/googleapis/bytestream v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:qDbnxtViX5J6CvFbxeNUSzKgVlDLJ/6L+caxye9+Flo= -google.golang.org/genproto/googleapis/bytestream v0.0.0-20231009173412-8bfb1ae86b6c/go.mod h1:itlFWGBbEyD32PUeJsTG8h8Wz7iJXfVK4gt1EJ+pAG0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:KSqppvjFjtoCI+KGd4PELB0qLNxdJHRGqRI09mB6pQA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c/go.mod h1:4cYg8o5yUbm77w8ZX00LhMVNl/YVBFJRYWDc0uYWMs0= -google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= -google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4= +google.golang.org/genproto/googleapis/api v0.0.0-20231030173426-d783a09b4405/go.mod h1:oT32Z4o8Zv2xPQTg0pbVaPr0MPOH6f14RgXt7zfIpwg= diff --git a/vendor/cloud.google.com/go/internal/.repo-metadata-full.json b/vendor/cloud.google.com/go/internal/.repo-metadata-full.json index 31d172047..46c4094d3 100644 --- a/vendor/cloud.google.com/go/internal/.repo-metadata-full.json +++ b/vendor/cloud.google.com/go/internal/.repo-metadata-full.json @@ -619,6 +619,16 @@ "release_level": "stable", "library_type": "GAPIC_AUTO" }, + "cloud.google.com/go/cloudprofiler/apiv2": { + "api_shortname": "cloudprofiler", + "distribution_name": "cloud.google.com/go/cloudprofiler/apiv2", + "description": "Cloud Profiler API", + "language": "go", + "client_library_type": "generated", + "client_documentation": "https://cloud.google.com/go/docs/reference/cloud.google.com/go/cloudprofiler/latest/apiv2", + "release_level": "preview", + "library_type": "GAPIC_AUTO" + }, "cloud.google.com/go/cloudtasks/apiv2": { "api_shortname": "cloudtasks", "distribution_name": "cloud.google.com/go/cloudtasks/apiv2", @@ -1019,6 +1029,16 @@ "release_level": "stable", "library_type": "GAPIC_AUTO" }, + "cloud.google.com/go/edgenetwork/apiv1": { + "api_shortname": "edgenetwork", + "distribution_name": "cloud.google.com/go/edgenetwork/apiv1", + "description": "Distributed Cloud Edge Network API", + "language": "go", + "client_library_type": "generated", + "client_documentation": "https://cloud.google.com/go/docs/reference/cloud.google.com/go/edgenetwork/latest/apiv1", + "release_level": "preview", + "library_type": "GAPIC_AUTO" + }, "cloud.google.com/go/errorreporting": { "api_shortname": "clouderrorreporting", "distribution_name": "cloud.google.com/go/errorreporting", @@ -1099,6 +1119,16 @@ "release_level": "stable", "library_type": "GAPIC_AUTO" }, + "cloud.google.com/go/firestore/apiv1/admin": { + "api_shortname": "firestore", + "distribution_name": "cloud.google.com/go/firestore/apiv1/admin", + "description": "Cloud Firestore API", + "language": "go", + "client_library_type": "generated", + "client_documentation": "https://cloud.google.com/go/docs/reference/cloud.google.com/go/firestore/latest/apiv1/admin", + "release_level": "stable", + "library_type": "GAPIC_AUTO" + }, "cloud.google.com/go/functions/apiv1": { "api_shortname": "cloudfunctions", "distribution_name": "cloud.google.com/go/functions/apiv1", @@ -2279,6 +2309,16 @@ "release_level": "preview", "library_type": "GAPIC_AUTO" }, + "cloud.google.com/go/telcoautomation/apiv1": { + "api_shortname": "telcoautomation", + "distribution_name": "cloud.google.com/go/telcoautomation/apiv1", + "description": "Telco Automation API", + "language": "go", + "client_library_type": "generated", + "client_documentation": "https://cloud.google.com/go/docs/reference/cloud.google.com/go/telcoautomation/latest/apiv1", + "release_level": "preview", + "library_type": "GAPIC_AUTO" + }, "cloud.google.com/go/texttospeech/apiv1": { "api_shortname": "texttospeech", "distribution_name": "cloud.google.com/go/texttospeech/apiv1", diff --git a/vendor/cloud.google.com/go/internal/trace/trace.go b/vendor/cloud.google.com/go/internal/trace/trace.go index c201d343e..f6b88253b 100644 --- a/vendor/cloud.google.com/go/internal/trace/trace.go +++ b/vendor/cloud.google.com/go/internal/trace/trace.go @@ -16,35 +16,94 @@ package trace import ( "context" + "errors" "fmt" + "os" + "strings" "go.opencensus.io/trace" - "golang.org/x/xerrors" + "go.opentelemetry.io/otel" + "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/codes" + ottrace "go.opentelemetry.io/otel/trace" "google.golang.org/api/googleapi" "google.golang.org/genproto/googleapis/rpc/code" "google.golang.org/grpc/status" ) -// StartSpan adds a span to the trace with the given name. +const ( + telemetryPlatformTracingOpenCensus = "opencensus" + telemetryPlatformTracingOpenTelemetry = "opentelemetry" + telemetryPlatformTracingVar = "GOOGLE_API_GO_EXPERIMENTAL_TELEMETRY_PLATFORM_TRACING" +) + +var ( + // TODO(chrisdsmith): Should the name of the OpenTelemetry tracer be public and mutable? + openTelemetryTracerName string = "cloud.google.com/go" + openTelemetryTracingEnabled bool = strings.EqualFold(strings.TrimSpace( + os.Getenv(telemetryPlatformTracingVar)), telemetryPlatformTracingOpenTelemetry) +) + +// IsOpenCensusTracingEnabled returns true if the environment variable +// GOOGLE_API_GO_EXPERIMENTAL_TELEMETRY_PLATFORM_TRACING is NOT set to the +// case-insensitive value "opentelemetry". +func IsOpenCensusTracingEnabled() bool { + return !IsOpenTelemetryTracingEnabled() +} + +// IsOpenTelemetryTracingEnabled returns true if the environment variable +// GOOGLE_API_GO_EXPERIMENTAL_TELEMETRY_PLATFORM_TRACING is set to the +// case-insensitive value "opentelemetry". +func IsOpenTelemetryTracingEnabled() bool { + return openTelemetryTracingEnabled +} + +// StartSpan adds a span to the trace with the given name. If IsOpenCensusTracingEnabled +// returns true, the span will be an OpenCensus span. If IsOpenTelemetryTracingEnabled +// returns true, the span will be an OpenTelemetry span. Set the environment variable +// GOOGLE_API_GO_EXPERIMENTAL_TELEMETRY_PLATFORM_TRACING to the case-insensitive +// value "opentelemetry" before loading the package to use OpenTelemetry tracing. +// The default will remain OpenCensus until [TBD], at which time the default will +// switch to "opentelemetry" and explicitly setting the environment variable to +// "opencensus" will be required to continue using OpenCensus tracing. func StartSpan(ctx context.Context, name string) context.Context { - ctx, _ = trace.StartSpan(ctx, name) + if IsOpenTelemetryTracingEnabled() { + ctx, _ = otel.GetTracerProvider().Tracer(openTelemetryTracerName).Start(ctx, name) + } else { + ctx, _ = trace.StartSpan(ctx, name) + } return ctx } -// EndSpan ends a span with the given error. +// EndSpan ends a span with the given error. If IsOpenCensusTracingEnabled +// returns true, the span will be an OpenCensus span. If IsOpenTelemetryTracingEnabled +// returns true, the span will be an OpenTelemetry span. Set the environment variable +// GOOGLE_API_GO_EXPERIMENTAL_TELEMETRY_PLATFORM_TRACING to the case-insensitive +// value "opentelemetry" before loading the package to use OpenTelemetry tracing. +// The default will remain OpenCensus until [TBD], at which time the default will +// switch to "opentelemetry" and explicitly setting the environment variable to +// "opencensus" will be required to continue using OpenCensus tracing. func EndSpan(ctx context.Context, err error) { - span := trace.FromContext(ctx) - if err != nil { - span.SetStatus(toStatus(err)) + if IsOpenTelemetryTracingEnabled() { + span := ottrace.SpanFromContext(ctx) + if err != nil { + span.SetStatus(codes.Error, toOpenTelemetryStatusDescription(err)) + span.RecordError(err) + } + span.End() + } else { + span := trace.FromContext(ctx) + if err != nil { + span.SetStatus(toStatus(err)) + } + span.End() } - span.End() } -// toStatus interrogates an error and converts it to an appropriate -// OpenCensus status. +// toStatus converts an error to an equivalent OpenCensus status. func toStatus(err error) trace.Status { var err2 *googleapi.Error - if ok := xerrors.As(err, &err2); ok { + if ok := errors.As(err, &err2); ok { return trace.Status{Code: httpStatusCodeToOCCode(err2.Code), Message: err2.Message} } else if s, ok := status.FromError(err); ok { return trace.Status{Code: int32(s.Code()), Message: s.Message()} @@ -53,6 +112,18 @@ func toStatus(err error) trace.Status { } } +// toOpenTelemetryStatus converts an error to an equivalent OpenTelemetry status description. +func toOpenTelemetryStatusDescription(err error) string { + var err2 *googleapi.Error + if ok := errors.As(err, &err2); ok { + return err2.Message + } else if s, ok := status.FromError(err); ok { + return s.Message() + } else { + return err.Error() + } +} + // TODO(deklerk): switch to using OpenCensus function when it becomes available. // Reference: https://github.com/googleapis/googleapis/blob/26b634d2724ac5dd30ae0b0cbfb01f07f2e4050e/google/rpc/code.proto func httpStatusCodeToOCCode(httpStatusCode int) int32 { @@ -86,10 +157,33 @@ func httpStatusCodeToOCCode(httpStatusCode int) int32 { } } -// TODO: (odeke-em): perhaps just pass around spans due to the cost -// incurred from using trace.FromContext(ctx) yet we could avoid -// throwing away the work done by ctx, span := trace.StartSpan. +// TracePrintf retrieves the current OpenCensus or OpenTelemetry span from context, then: +// * calls Span.Annotatef if OpenCensus is enabled; or +// * calls Span.AddEvent if OpenTelemetry is enabled. +// +// If IsOpenCensusTracingEnabled returns true, the expected span must be an +// OpenCensus span. If IsOpenTelemetryTracingEnabled returns true, the expected +// span must be an OpenTelemetry span. Set the environment variable +// GOOGLE_API_GO_EXPERIMENTAL_TELEMETRY_PLATFORM_TRACING to the case-insensitive +// value "opentelemetry" before loading the package to use OpenTelemetry tracing. +// The default will remain OpenCensus until [TBD], at which time the default will +// switch to "opentelemetry" and explicitly setting the environment variable to +// "opencensus" will be required to continue using OpenCensus tracing. func TracePrintf(ctx context.Context, attrMap map[string]interface{}, format string, args ...interface{}) { + if IsOpenTelemetryTracingEnabled() { + attrs := otAttrs(attrMap) + ottrace.SpanFromContext(ctx).AddEvent(fmt.Sprintf(format, args...), ottrace.WithAttributes(attrs...)) + } else { + attrs := ocAttrs(attrMap) + // TODO: (odeke-em): perhaps just pass around spans due to the cost + // incurred from using trace.FromContext(ctx) yet we could avoid + // throwing away the work done by ctx, span := trace.StartSpan. + trace.FromContext(ctx).Annotatef(attrs, format, args...) + } +} + +// ocAttrs converts a generic map to OpenCensus attributes. +func ocAttrs(attrMap map[string]interface{}) []trace.Attribute { var attrs []trace.Attribute for k, v := range attrMap { var a trace.Attribute @@ -107,5 +201,27 @@ func TracePrintf(ctx context.Context, attrMap map[string]interface{}, format str } attrs = append(attrs, a) } - trace.FromContext(ctx).Annotatef(attrs, format, args...) + return attrs +} + +// otAttrs converts a generic map to OpenTelemetry attributes. +func otAttrs(attrMap map[string]interface{}) []attribute.KeyValue { + var attrs []attribute.KeyValue + for k, v := range attrMap { + var a attribute.KeyValue + switch v := v.(type) { + case string: + a = attribute.Key(k).String(v) + case bool: + a = attribute.Key(k).Bool(v) + case int: + a = attribute.Key(k).Int(v) + case int64: + a = attribute.Key(k).Int64(v) + default: + a = attribute.Key(k).String(fmt.Sprintf("%#v", v)) + } + attrs = append(attrs, a) + } + return attrs } diff --git a/vendor/cloud.google.com/go/release-please-config-yoshi-submodules.json b/vendor/cloud.google.com/go/release-please-config-yoshi-submodules.json index d2bd9b417..db5a40d65 100644 --- a/vendor/cloud.google.com/go/release-please-config-yoshi-submodules.json +++ b/vendor/cloud.google.com/go/release-please-config-yoshi-submodules.json @@ -81,6 +81,9 @@ "clouddms": { "component": "clouddms" }, + "cloudprofiler": { + "component": "cloudprofiler" + }, "cloudtasks": { "component": "cloudtasks" }, @@ -156,6 +159,9 @@ "edgecontainer": { "component": "edgecontainer" }, + "edgenetwork": { + "component": "edgenetwork" + }, "essentialcontacts": { "component": "essentialcontacts" }, @@ -348,6 +354,9 @@ "talent": { "component": "talent" }, + "telcoautomation": { + "component": "telcoautomation" + }, "texttospeech": { "component": "texttospeech" }, -- cgit mrf-deployment