Skip to content

[7.x] systemtest: update opentelemetry-go (backport #6124)#6199

Merged
axw merged 2 commits into7.xfrom
mergify/bp/7.x/pr-6124
Sep 23, 2021
Merged

[7.x] systemtest: update opentelemetry-go (backport #6124)#6199
axw merged 2 commits into7.xfrom
mergify/bp/7.x/pr-6124

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Sep 21, 2021

This is an automatic backport of pull request #6124 done by Mergify.
Cherry-pick of 117ca87 has failed:

On branch mergify/bp/7.x/pr-6124
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 117ca878.
  (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)

Changes to be committed:
	modified:   systemtest/approvals/TestOTLPGRPCMetrics.approved.json
	modified:   systemtest/approvals/TestOTLPGRPCTraces/data_streams_disabled.approved.json
	modified:   systemtest/approvals/TestOTLPGRPCTraces/data_streams_enabled.approved.json
	modified:   systemtest/benchtest/clients.go
	modified:   systemtest/logging_test.go
	modified:   systemtest/otlp_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   systemtest/go.mod
	both modified:   systemtest/go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

Default span status changed to Unset: open-telemetry/opentelemetry-go#2102

(cherry picked from commit 117ca87)

# Conflicts:
#	systemtest/go.mod
#	systemtest/go.sum
@mergify mergify Bot added the conflicts There is a conflict in the backported pull request label Sep 21, 2021
@mergify mergify Bot assigned axw Sep 21, 2021
@ghost
Copy link
Copy Markdown

ghost commented Sep 21, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-09-23T03:16:18.916+0000

  • Duration: 51 min 50 sec

  • Commit: c2c7380

Test stats 🧪

Test Results
Failed 0
Passed 4475
Skipped 15
Total 4490

@axw axw removed the conflicts There is a conflict in the backported pull request label Sep 23, 2021
@axw axw enabled auto-merge (squash) September 23, 2021 03:16
@axw axw merged commit 1b76dde into 7.x Sep 23, 2021
@mergify mergify Bot deleted the mergify/bp/7.x/pr-6124 branch September 23, 2021 04:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant