add info about models usage to OpenTelemetry spans #13094
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
glours
commented
Jul 24, 2025
| @@ -110,6 +112,7 @@ func ServiceOptions(service types.ServiceConfig) SpanOptions { | |||
| attribute.String("service.name", service.Name), | |||
| attribute.String("service.image", service.Image), | |||
| attribute.StringSlice("service.networks", keys(service.Networks)), | |||
| attribute.StringSlice("service.models", keys(service.Models)), | |||
There was a problem hiding this comment.
I wonder if you should collect names of the models configuration or the real model names defined with the model attribute
There was a problem hiding this comment.
all names we collect are abstract name, used inside compose.yaml as references, and do not reflect the actual resource. I wonder any of those is of any use. Maybe we should better collect a count of those
ndeloof
approved these changes
Jul 24, 2025
tmeijn
pushed a commit
to tmeijn/dotfiles
that referenced
this pull request
Jul 28, 2025
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [docker/compose](https://github.com/docker/compose) | minor | `v2.38.2` -> `v2.39.1` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>docker/compose (docker/compose)</summary> ### [`v2.39.1`](https://github.com/docker/compose/releases/tag/v2.39.1) [Compare Source](docker/compose@v2.39.0...v2.39.1) #### What's Changed 🔧 Internal - Add info about models usage to OpenTelemetry spans by [@​glours](https://github.com/glours) in docker/compose#13094 ⚙️ Dependencies - Bump compose-go to v2.8.1 by [@​glours](https://github.com/glours) in docker/compose#13096 **Full Changelog**: docker/compose@v2.39.0...v2.39.1 ### [`v2.39.0`](https://github.com/docker/compose/releases/tag/v2.39.0) [Compare Source](docker/compose@v2.38.2...v2.39.0) #### What's Changed ##### ✨ Improvements - Add `--since` & `--until` flags to `events` command by [@​jarqvi](https://github.com/jarqvi) in docker/compose#13030 - Feat(os): add FreeBSD support by [@​atagtm](https://github.com/atagtm) in docker/compose#13036 - Add `--models` flag to `config` command by [@​jarqvi](https://github.com/jarqvi) in docker/compose#13022 - Warn user `COMPOSE_BAKE=false` is deprecated by [@​ndeloof](https://github.com/ndeloof) in docker/compose#13065 - Simpler stop UI by [@​ndeloof](https://github.com/ndeloof) in docker/compose#13064 - Introduce build `provenance` and `sbom` attributes support by [@​ndeloof](https://github.com/ndeloof) in docker/compose#13067 - Show build progress during watch rebuild by [@​ndeloof](https://github.com/ndeloof) in docker/compose#13059 ##### 🐛 Fixes - Add dry-run support to bake build by [@​glours](https://github.com/glours) in docker/compose#13042 - Keep containers attached on stop to capture termination logs by [@​ndeloof](https://github.com/ndeloof) in docker/compose#13010 - Add default compose labels to images built from bake by [@​glours](https://github.com/glours) in docker/compose#13049 - Fix report image name in bake result by [@​principis](https://github.com/principis) in docker/compose#13047 - Don't run navigation menu if stdin isn't a terminal by [@​ndeloof](https://github.com/ndeloof) in docker/compose#13054 - Monitor must watch events even when context is cancelled by [@​ndeloof](https://github.com/ndeloof) in docker/compose#13062 - Force `plain` display mode if stdout isn't a terminal by [@​ndeloof](https://github.com/ndeloof) in docker/compose#13074 - Do not pass user id on Windows system as engine is not able to handel it by [@​glours](https://github.com/glours) in docker/compose#13080 - Forward git command error to user by [@​ndeloof](https://github.com/ndeloof) in docker/compose#13084 - Use output registry when push true and load to docker store if not by [@​glours](https://github.com/glours) in docker/compose#13085 ##### 🔧 Internal - Add a space character to separate the timestamp from the log message by [@​xduugu](https://github.com/xduugu) in docker/compose#13038 - Fix the Helm bridge e2e tests after the latest update of the templates by [@​glours](https://github.com/glours) in docker/compose#13053 - Introduce monitor to manage containers events and application termination by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12906 - Abstract model-cli commands execution with a model (pseudo) API by [@​ndeloof](https://github.com/ndeloof) in docker/compose#13051 - Swarm by [@​ndeloof](https://github.com/ndeloof) in docker/compose#13071 - Remove uses of `moby/errdefs` by [@​thaJeztah](https://github.com/thaJeztah) in docker/compose#13076 - Use local copy of `pkg/system.IsAbs` by [@​thaJeztah](https://github.com/thaJeztah) in docker/compose#13075 - Optimize ansiColorCode by replacing fmt.Sprintf with strings.Builder by [@​suwakei](https://github.com/suwakei) in docker/compose#13091 - Eliminate magic number in init functions by [@​suwakei](https://github.com/suwakei) in docker/compose#13090 - Integration of SetAttributes calls by [@​suwakei](https://github.com/suwakei) in docker/compose#13089 ##### ⚙️ Dependencies - Bump engine and cli to `v28.3.2` by [@​ndeloof](https://github.com/ndeloof) in docker/compose#13035 - Build(deps): bump github.com/spf13/pflag from `1.0.6` to `1.0.7` by [@​dependabot](https://github.com/dependabot)\[bot] in docker/compose#13060 - Bump `compose-go` to version `v2.8.0` by [@​glours](https://github.com/glours) in docker/compose#13082 - Build(deps): bump google.golang.org/grpc from `1.73.0` to `1.74.2` by [@​dependabot](https://github.com/dependabot)\[bot] in docker/compose#13081 - bump buildx to `v0.26.1` by [@​glours](https://github.com/glours) in docker/compose#13086 #### New Contributors - [@​atagtm](https://github.com/atagtm) made their first contribution in docker/compose#13036 - [@​xduugu](https://github.com/xduugu) made their first contribution in docker/compose#13038 - [@​principis](https://github.com/principis) made their first contribution in docker/compose#13047 - [@​suwakei](https://github.com/suwakei) made their first contribution in docker/compose#13091 **Full Changelog**: docker/compose@v2.38.2...v2.39.0 </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 MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MC42Mi4xIiwidXBkYXRlZEluVmVyIjoiNDAuNjIuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiUmVub3ZhdGUgQm90Il19-->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What I did
Add
modelsdata to OpenTelemetry spans, so we could monitor usage of this new featureRelated issue
(not mandatory) A picture of a cute animal, if possible in relation to what you did
