From ef848afa30307e9ba65da149977d7fbb5e8b926e Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Thu, 20 Jun 2024 17:54:51 +0200 Subject: [PATCH 1/3] Add tenv linter (#5524) This starts adding more linters we aren't currently using, based on the ones used by [the collector](https://github.com/open-telemetry/opentelemetry-collector/blob/main/.golangci.yml#L122-L139). This linter does not currently have any issues, so it requires no further changes. I'll be opening other PRs for linters that do require fixes. * [tenv](https://github.com/sivchari/tenv) requires using `t.Setenv` rather than `os.Setenv` in tests. --------- Co-authored-by: Sam Xie --- .golangci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.golangci.yml b/.golangci.yml index 03581a02a3e..e46e4e37895 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -21,6 +21,7 @@ linters: - misspell - revive - staticcheck + - tenv - typecheck - unused From 86a40d57210fb86162eb5c8f9e931f15e15f192c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2024 09:01:33 -0700 Subject: [PATCH 2/3] chore(deps): update otel/opentelemetry-collector-contrib docker tag to v0.103.0 (#5526) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [otel/opentelemetry-collector-contrib](https://togithub.com/open-telemetry/opentelemetry-collector-releases) | minor | `0.102.1` -> `0.103.0` | --- ### Release Notes
open-telemetry/opentelemetry-collector-releases (otel/opentelemetry-collector-contrib) ### [`v0.103.0`](https://togithub.com/open-telemetry/opentelemetry-collector-releases/releases/tag/v0.103.0) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-collector-releases/compare/v0.102.1...v0.103.0) Check the [v0.103.0 contrib changelog](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.103.0) and the [v0.103.0 core changelog](https://togithub.com/open-telemetry/opentelemetry-collector/releases/tag/v0.103.0) for changelogs on specific components. #### Changelog - [`d3637d2`](https://togithub.com/open-telemetry/opentelemetry-collector-releases/commit/d3637d2) Update Makefile OTELCOL_BUILDER_VERSION ([#​580](https://togithub.com/open-telemetry/opentelemetry-collector-releases/issues/580)) - [`7029e89`](https://togithub.com/open-telemetry/opentelemetry-collector-releases/commit/7029e89) Prepare release v0.103.0 ([#​579](https://togithub.com/open-telemetry/opentelemetry-collector-releases/issues/579)) - [`7e58a5d`](https://togithub.com/open-telemetry/opentelemetry-collector-releases/commit/7e58a5d) Add googleclientauth extension to release manifest ([#​577](https://togithub.com/open-telemetry/opentelemetry-collector-releases/issues/577)) - [`d77bd28`](https://togithub.com/open-telemetry/opentelemetry-collector-releases/commit/d77bd28) Update manifest.yaml ([#​563](https://togithub.com/open-telemetry/opentelemetry-collector-releases/issues/563)) - [`46be8f7`](https://togithub.com/open-telemetry/opentelemetry-collector-releases/commit/46be8f7) Bump goreleaser/goreleaser-action from 5.1.0 to 6.0.0 ([#​574](https://togithub.com/open-telemetry/opentelemetry-collector-releases/issues/574)) - [`414594f`](https://togithub.com/open-telemetry/opentelemetry-collector-releases/commit/414594f) Fix MSI release ([#​572](https://togithub.com/open-telemetry/opentelemetry-collector-releases/issues/572))
--- ### 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 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). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- example/otel-collector/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/otel-collector/docker-compose.yaml b/example/otel-collector/docker-compose.yaml index 4db0802f73a..830ce71cde1 100644 --- a/example/otel-collector/docker-compose.yaml +++ b/example/otel-collector/docker-compose.yaml @@ -3,7 +3,7 @@ services: otel-collector: - image: otel/opentelemetry-collector-contrib:0.102.1 + image: otel/opentelemetry-collector-contrib:0.103.0 command: ["--config=/etc/otel-collector.yaml"] volumes: - ./otel-collector.yaml:/etc/otel-collector.yaml From eb6bd28f3288b173d148c67f9ed45390594abdc2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2024 09:15:46 -0700 Subject: [PATCH 3/3] chore(deps): update prom/prometheus docker tag to v2.53.0 (#5525) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | prom/prometheus | minor | `v2.52.0` -> `v2.53.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 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 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). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- example/otel-collector/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/otel-collector/docker-compose.yaml b/example/otel-collector/docker-compose.yaml index 830ce71cde1..fc231cc1a91 100644 --- a/example/otel-collector/docker-compose.yaml +++ b/example/otel-collector/docker-compose.yaml @@ -11,7 +11,7 @@ services: - 4317:4317 prometheus: - image: prom/prometheus:v2.52.0 + image: prom/prometheus:v2.53.0 volumes: - ./prometheus.yaml:/etc/prometheus/prometheus.yml ports: