Skip to content

Support Hot Chocolate v14#6180

Closed
tobias-tengler wants to merge 1 commit into
DataDog:masterfrom
tobias-tengler:support-hotchocolate-v14
Closed

Support Hot Chocolate v14#6180
tobias-tengler wants to merge 1 commit into
DataDog:masterfrom
tobias-tengler:support-hotchocolate-v14

Conversation

@tobias-tengler

@tobias-tengler tobias-tengler commented Oct 22, 2024

Copy link
Copy Markdown
Contributor

Hot Chocolate v14 was released last week: NuGet

We attempted to update today, but noticed that the DataDog integration no longer worked.

This PR updates the Tracer auto-instrumentation to support Hot Chocolate v14.

@tobias-tengler
tobias-tengler marked this pull request as ready for review October 22, 2024 20:21
@tobias-tengler
tobias-tengler requested review from a team as code owners October 22, 2024 20:21
@tobias-tengler
tobias-tengler force-pushed the support-hotchocolate-v14 branch from 22729f6 to a65ce0e Compare October 22, 2024 20:22
@vandonr

vandonr commented Oct 23, 2024

Copy link
Copy Markdown
Contributor

Hello, thank you for the contribution ! We're gonna have a look at the code, but just to answer your questions about MacOS development:

the solution won't properly load in any of my IDEs

did you try to open the full sln ? There is an slnf that's dedicated to macs, it's Datadog.Trace.OSX.slnf, that's the one you should use.

I can't run the integration tests on my ARM-based MacBook

ARM-based macbook shouldn't be an issue. We have a little bit of doc here about that, you should use .[/tracer/]build.sh BuildAndRunOsxIntegrationTests. Click the link for an example with useful parameters.

Comment thread tracer/missing-nullability-files.csv Outdated
@tobias-tengler
tobias-tengler force-pushed the support-hotchocolate-v14 branch from 5f9faf5 to 23d55ef Compare October 23, 2024 12:01
@tobias-tengler

Copy link
Copy Markdown
Contributor Author

@vandonr Thanks for the feedback :) I was able to get the tests to run.
From my POV this PR should now be ready for proper review.

@tobias-tengler

Copy link
Copy Markdown
Contributor Author

@vandonr bump :)

@bouwkast

bouwkast commented Nov 4, 2024

Copy link
Copy Markdown
Collaborator

Hi @tobias-tengler

Thanks for the contribution! Overall it looks really good
There are a couple of things to note:

  • We can't merge PRs that are from forks due to some security/CI requirements that we have
  • We also can't allow push access to dd-trace-dotnet outside of Datadog

So, what we can do though is cherry-pick your commits onto one of our own branches and make a PR on your behalf.
I've created a task for someone to pick this up to do that, so we'll follow up with that.

Sorry for these limitations, it is something that we are aware of and are attempting to improve.

@tobias-tengler

Copy link
Copy Markdown
Contributor Author

That's fine for me :) Can I assist in any way? For example by squashing my commits?

@bouwkast

bouwkast commented Nov 5, 2024

Copy link
Copy Markdown
Collaborator

@tobias-tengler Squashing them down would be great thanks!

@tobias-tengler
tobias-tengler force-pushed the support-hotchocolate-v14 branch from 32cc877 to 8236267 Compare November 5, 2024 16:17
Update Hot Chocolate Auto Instrumentation

Bump versions

Manually check in snapshots

Cleanup

Update test

Rename current snapshots to .Pre_14_0_0

Check in new snapshots
@tobias-tengler
tobias-tengler force-pushed the support-hotchocolate-v14 branch from 8236267 to 26f3515 Compare November 5, 2024 16:20
@tobias-tengler

Copy link
Copy Markdown
Contributor Author

@bouwkast Squashed everything into 26f3515 :)

@vandonr

vandonr commented Nov 5, 2024

Copy link
Copy Markdown
Contributor

ok thanks, sorry to have kept you waiting like that, we don't get external contributions very often, we had to sync internally :)
I'll take care of cherry picking your commit on a branch of mine tomorrow !

@tobias-tengler

Copy link
Copy Markdown
Contributor Author

Closed in favor of: #6248

vandonr added a commit that referenced this pull request Dec 3, 2024
## Summary of changes

Hot Chocolate v14 was released recently:
[NuGet](https://www.nuget.org/packages/HotChocolate.AspNetCore/14.0.0)
This new version doesn't work with the existing integration

## Reason for change

## Implementation details

picked up work from an external contributor (@tobias-tengler in #6180)
tried to reduce a bit the amount of diff by reusing more existing code

## Test coverage

integration test runs on new version

## Other details
<!-- Fixes #{issue} -->

<!-- ⚠️ Note: where possible, please obtain 2 approvals prior to
merging. Unless CODEOWNERS specifies otherwise, for external teams it is
typically best to have one review from a team member, and one review
from apm-dotnet. Trivial changes do not require 2 reviews. -->

---------

Co-authored-by: Andrew Lock <[email protected]>
Co-authored-by: Tobias Tengler <[email protected]>
veerbia pushed a commit that referenced this pull request Dec 16, 2024
## Summary of changes

Hot Chocolate v14 was released recently:
[NuGet](https://www.nuget.org/packages/HotChocolate.AspNetCore/14.0.0)
This new version doesn't work with the existing integration

## Reason for change

## Implementation details

picked up work from an external contributor (@tobias-tengler in #6180)
tried to reduce a bit the amount of diff by reusing more existing code

## Test coverage

integration test runs on new version

## Other details
<!-- Fixes #{issue} -->

<!-- ⚠️ Note: where possible, please obtain 2 approvals prior to
merging. Unless CODEOWNERS specifies otherwise, for external teams it is
typically best to have one review from a team member, and one review
from apm-dotnet. Trivial changes do not require 2 reviews. -->

---------

Co-authored-by: Andrew Lock <[email protected]>
Co-authored-by: Tobias Tengler <[email protected]>
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.

3 participants