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

Update opentelemetry docs to prefer OTLP http/protobuf over grpc #15846

Merged
merged 6 commits into from
Jan 19, 2024

Conversation

Copy link

Hi @jack-berg 👋

Thanks for your pull request! Your PR is in a queue, and a writer will take a look soon. We generally publish small edits within one business day, and larger edits within three days.

Gatsby Cloud will automatically generate a preview of your request, and will comment with a link when the preview is ready (usually 20 to 30 minutes).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file was odd. It doesn't appear in the navigation, but is linked to by the metrics best practices page.

The problem is that the page is wrong. It seems to be a copy / paste of the python getting started guide, but was never updated to actually be a go getting started guide like the title states.

Better to delete the document for now and re-add it when someone wants to properly add a go getting started page.

cc @reese-lee who committed the page

Copy link

gatsby-cloud bot commented Jan 17, 2024

✅ docs-website-develop deploy preview ready

Co-authored-by: Kayla Reopelle (she/her) <[email protected]>
rhetoric101
rhetoric101 previously approved these changes Jan 19, 2024
Copy link
Contributor

@rhetoric101 rhetoric101 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jack-berg thanks for tackling this sweeping update! This looks good!

jeff-colucci
jeff-colucci previously approved these changes Jan 19, 2024
Copy link
Contributor

@jeff-colucci jeff-colucci left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All green, looks good to me!

@jeff-colucci jeff-colucci self-assigned this Jan 19, 2024
@jeff-colucci jeff-colucci added content requests related to docs site content from_internal Identifies issues/PRs from Relics (except writers) labels Jan 19, 2024
@jack-berg
Copy link
Contributor Author

@jeff-colucci is there automated tooling for resolving the merge conflicts or should I take care of that?

@jeff-colucci
Copy link
Contributor

@jack-berg Unfortunately, there is no automated tool that I'm aware of for branch conflicts, so they have to be resolved manually. I'm not sure where these branch conflicts came from since they weren't there when I approved the request I don't think.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jack-berg Are these android gradle/studio files related to OpenTelemetry? Why are they being deleted?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know. I didn't commit those changes [see commit here]. I assumed it was some sort of unrelated automated cleanup required to get the develop branch back healthy which was just being bundled with this PR by coincidence, but @rhetoric101 and @jeff-colucci may know more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file I commented on went away, but there are still a few others.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi guys! Thanks for fixing this. I was able to track down that there was a script that was run that deleted some orphaned translated files, and that seems to be where the discrepancy came from. I'm going to re-check the files now to make sure there are no more issues. We have an auto-translator that does our translation work for us, so if a translated doc that doesn't cause branch commits gets deleted, that translator will re-translate the files so we won't actually lose anything.

Apologies for the confusion and thanks for patiently sticking with us while we get this ticket worked on. Assuming there are no more branch conflicts I will go ahead and get this merged and we can mark it as done!

Copy link
Contributor

@jeff-colucci jeff-colucci left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything checks out!

@jeff-colucci jeff-colucci merged commit 50546f6 into newrelic:develop Jan 19, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
content requests related to docs site content from_internal Identifies issues/PRs from Relics (except writers)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants