Skip to content

Commit

Permalink
fix(deps): update module cloud.google.com/go/compute/metadata to v0.4…
Browse files Browse the repository at this point in the history
….0 (#5835)

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[cloud.google.com/go/compute/metadata](https://togithub.com/googleapis/google-cloud-go)
| `v0.3.0` -> `v0.4.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/cloud.google.com%2fgo%2fcompute%2fmetadata/v0.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/cloud.google.com%2fgo%2fcompute%2fmetadata/v0.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/cloud.google.com%2fgo%2fcompute%2fmetadata/v0.3.0/v0.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/cloud.google.com%2fgo%2fcompute%2fmetadata/v0.3.0/v0.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>googleapis/google-cloud-go
(cloud.google.com/go/compute/metadata)</summary>

###
[`v0.4.0`](https://togithub.com/googleapis/google-cloud-go/blob/HEAD/CHANGES.md#v040)

[Compare
Source](https://togithub.com/googleapis/google-cloud-go/compare/v0.3.0...v0.4.0)

-   bigquery:
    \-`NewGCSReference` is now a function, not a method on `Client`.
    -   `Table.LoaderFrom` now accepts a `ReaderSource`, enabling
        loading data into a table from a file or any `io.Reader`.

    <!---->

    -   Client.Table and Client.OpenTable have been removed.
        Replace
        ```go
        client.OpenTable("project", "dataset", "table")
        ```
        with
        ```go
        client.DatasetInProject("project", "dataset").Table("table")
        ```

    -   Client.CreateTable has been removed.
        Replace
        ```go
        client.CreateTable(ctx, "project", "dataset", "table")
        ```
        with
        ```go
client.DatasetInProject("project", "dataset").Table("table").Create(ctx)
        ```

    -   Dataset.ListTables have been replaced with Dataset.Tables.
        Replace
        ```go
        tables, err := ds.ListTables(ctx)
        ```
        with
        ```go
        it := ds.Tables(ctx)
        for {
            table, err := it.Next()
            if err == iterator.Done {
                break
            }
            if err != nil {
                // TODO: Handle error.
            }
            // TODO: use table.
        }
        ```

- Client.Read has been replaced with Job.Read, Table.Read and
Query.Read.
        Replace
        ```go
        it, err := client.Read(ctx, job)
        ```
        with
        ```go
        it, err := job.Read(ctx)
        ```
        and similarly for reading from tables or queries.

- The iterator returned from the Read methods is now named RowIterator.
Its
behavior is closer to the other iterators in these libraries. It no
longer
        supports the Schema method; see the next item.
        Replace
        ```go
        for it.Next(ctx) {
            var vals ValueList
            if err := it.Get(&vals); err != nil {
                // TODO: Handle error.
            }
            // TODO: use vals.
        }
        if err := it.Err(); err != nil {
            // TODO: Handle error.
        }
        ```
        with
            for {
                var vals ValueList
                err := it.Next(&vals)
                if err == iterator.Done {
                    break
                }
                if err != nil {
                    // TODO: Handle error.
                }
                // TODO: use vals.
            }
        Instead of the `RecordsPerRequest(n)` option, write
        ```go
        it.PageInfo().MaxSize = n
        ```
        Instead of the `StartIndex(i)` option, write
        ```go
        it.StartIndex = i
        ```

- ValueLoader.Load now takes a Schema in addition to a slice of Values.
        Replace
        ```go
        func (vl *myValueLoader) Load(v []bigquery.Value)
        ```
        with
        ```go
func (vl *myValueLoader) Load(v []bigquery.Value, s bigquery.Schema)
        ```

    -   Table.Patch is replace by Table.Update.
        Replace
        ```go
        p := table.Patch()
        p.Description("new description")
        metadata, err := p.Apply(ctx)
        ```
        with
        ```go
metadata, err := table.Update(ctx, bigquery.TableMetadataToUpdate{
            Description: "new description",
        })
        ```

- Client.Copy is replaced by separate methods for each of its four
functions.
        All options have been replaced by struct fields.

- To load data from Google Cloud Storage into a table, use
Table.LoaderFrom.

            Replace

            ```go
            client.Copy(ctx, table, gcsRef)
            ```

            with

            ```go
            table.LoaderFrom(gcsRef).Run(ctx)
            ```

Instead of passing options to Copy, set fields on the Loader:

            ```go
            loader := table.LoaderFrom(gcsRef)
            loader.WriteDisposition = bigquery.WriteTruncate
            ```

        -   To extract data from a table into Google Cloud Storage, use
Table.ExtractorTo. Set fields on the returned Extractor instead of
            passing options.

            Replace

            ```go
            client.Copy(ctx, gcsRef, table)
            ```

            with

            ```go
            table.ExtractorTo(gcsRef).Run(ctx)
            ```

        -   To copy data into a table from one or more other tables, use
Table.CopierFrom. Set fields on the returned Copier instead of passing
options.

            Replace

            ```go
            client.Copy(ctx, dstTable, srcTable)
            ```

            with

            ```go
            dst.Table.CopierFrom(srcTable).Run(ctx)
            ```

- To start a query job, create a Query and call its Run method. Set
fields
            on the query instead of passing options.

            Replace

            ```go
            client.Copy(ctx, table, query)
            ```

            with

            ```go
            query.Run(ctx)
            ```

- Table.NewUploader has been renamed to Table.Uploader. Instead of
options,
        configure an Uploader by setting its fields.
        Replace
        ```go
        u := table.NewUploader(bigquery.UploadIgnoreUnknownValues())
        ```
        with
        ```go
        u := table.NewUploader(bigquery.UploadIgnoreUnknownValues())
        u.IgnoreUnknownValues = true
        ```

- pubsub: remove `pubsub.Done`. Use `iterator.Done` instead, where
`iterator` is the package
    `google.golang.org/api/iterator`.

</details>

---

### 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.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/open-telemetry/opentelemetry-go-contrib).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40MjEuMCIsInVwZGF0ZWRJblZlciI6IjM3LjQyMS45IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJTa2lwIENoYW5nZWxvZyIsImRlcGVuZGVuY2llcyJdfQ==-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Tyler Yahn <codingalias@gmail.com>
  • Loading branch information
renovate[bot] and MrAlias authored Jul 2, 2024
1 parent 56e279e commit 53f34f2
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions detectors/gcp/gce.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ func (gce *GCE) Detect(ctx context.Context) (*resource.Resource, error) {

var errInfo []string

if projectID, err := metadata.ProjectID(); hasProblem(err) {
if projectID, err := metadata.ProjectIDWithContext(ctx); hasProblem(err) {
errInfo = append(errInfo, err.Error())
} else if projectID != "" {
attributes = append(attributes, semconv.CloudAccountID(projectID))
}

if zone, err := metadata.Zone(); hasProblem(err) {
if zone, err := metadata.ZoneWithContext(ctx); hasProblem(err) {
errInfo = append(errInfo, err.Error())
} else if zone != "" {
attributes = append(attributes, semconv.CloudAvailabilityZone(zone))
Expand All @@ -54,13 +54,13 @@ func (gce *GCE) Detect(ctx context.Context) (*resource.Resource, error) {
}
}

if instanceID, err := metadata.InstanceID(); hasProblem(err) {
if instanceID, err := metadata.InstanceIDWithContext(ctx); hasProblem(err) {
errInfo = append(errInfo, err.Error())
} else if instanceID != "" {
attributes = append(attributes, semconv.HostID(instanceID))
}

if name, err := metadata.InstanceName(); hasProblem(err) {
if name, err := metadata.InstanceNameWithContext(ctx); hasProblem(err) {
errInfo = append(errInfo, err.Error())
} else if name != "" {
attributes = append(attributes, semconv.HostName(name))
Expand Down
2 changes: 1 addition & 1 deletion detectors/gcp/gke.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func (gke *GKE) Detect(ctx context.Context) (*resource.Resource, error) {
attributes = append(attributes, semconv.ContainerName(containerName))
}

if clusterName, err := metadata.InstanceAttributeValue("cluster-name"); hasProblem(err) {
if clusterName, err := metadata.InstanceAttributeValueWithContext(ctx, "cluster-name"); hasProblem(err) {
errInfo = append(errInfo, err.Error())
} else if clusterName != "" {
attributes = append(attributes, semconv.K8SClusterName(clusterName))
Expand Down
2 changes: 1 addition & 1 deletion detectors/gcp/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module go.opentelemetry.io/contrib/detectors/gcp
go 1.21

require (
cloud.google.com/go/compute/metadata v0.3.0
cloud.google.com/go/compute/metadata v0.4.0
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.0
github.com/google/go-cmp v0.6.0
github.com/stretchr/testify v1.9.0
Expand Down
4 changes: 2 additions & 2 deletions detectors/gcp/go.sum
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=
cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
cloud.google.com/go/compute/metadata v0.4.0 h1:vHzJCWaM4g8XIcm8kopr3XmDA4Gy/lblD3EhhSux05c=
cloud.google.com/go/compute/metadata v0.4.0/go.mod h1:SIQh1Kkb4ZJ8zJ874fqVkslA29PRXuleyj6vOzlbK7M=
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.0 h1:N4xzkSD2BkRwEZSPf3C2eUZxjS5trpo4gOwRh8mu+BA=
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.0/go.mod h1:p2puVVSKjQ84Qb1gzw2XHLs34WQyHTYFZLaVxypAFYs=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
Expand Down

0 comments on commit 53f34f2

Please sign in to comment.