Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(meshmetric): add missing timestamp in mapper (backport of #10966) #10979

Closed
wants to merge 1 commit into from

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Jul 25, 2024

Automatic cherry-pick of #10966 for branch release-2.4

Generated by action

cherry-picked commit 4045726
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

On branch release-2.4
Your branch is up to date with 'origin/release-2.4'.

You are currently cherry-picking commit 404572688.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   app/kuma-dp/pkg/dataplane/metrics/metrics_format_mapper.go
	deleted by us:   app/kuma-dp/pkg/dataplane/metrics/metrics_format_mapper_test.go
	deleted by us:   app/kuma-dp/pkg/dataplane/metrics/metrics_producer.go
	deleted by us:   app/kuma-dp/pkg/dataplane/metrics/testdata/otel/counter.golden.json
	deleted by us:   app/kuma-dp/pkg/dataplane/metrics/testdata/otel/counter.in
	deleted by us:   app/kuma-dp/pkg/dataplane/metrics/testdata/otel/gauge.golden.json
	deleted by us:   app/kuma-dp/pkg/dataplane/metrics/testdata/otel/histogram.golden.json
	deleted by us:   app/kuma-dp/pkg/dataplane/metrics/testdata/otel/summary.golden.json

no changes added to commit (use "git add" and/or "git commit -a")

* fix(meshmetric): add missing timestamp

Signed-off-by: slonka <[email protected]>

* fix(meshmetric): use times in UTC

Signed-off-by: slonka <[email protected]>

---------

Signed-off-by: slonka <[email protected]>
@kumahq kumahq bot requested a review from a team as a code owner July 25, 2024 06:56
@kumahq kumahq bot requested review from jijiechen and lukidzi and removed request for a team July 25, 2024 06:56
@slonka
Copy link
Contributor

slonka commented Jul 25, 2024

MeshMetric was introduced in 2.6.0

@slonka slonka closed this Jul 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant