Skip to content

Conversation

gpachecoNI
Copy link
Collaborator

@gpachecoNI gpachecoNI commented Jun 21, 2023

TODO: Check the above box with an 'x' indicating you've read and followed CONTRIBUTING.md.

What does this Pull Request accomplish?

  • Add service Annotations support to the Measurement Services. The user can add any annotations but our examples will have the following annotations: description, collection, and tags.
  • Adds the new proto for the discovery_service

Why should this Pull Request be merged?

AB#2408662

What testing has been done?

  • Update unit test and include examples with the common annotations and user random annotations. Testing Integer, arrays, and dictionaries being added as an annotation.
  • Add cases to the create_measurment_service to ensure we cover all cases.

Open Issues

  • The generator won't match with these changes, but I am currently working on updating it.

@dixonjoel
Copy link
Collaborator

The discovery_service.proto changes aren't expected to go into ASW until the release branch is made. So we should wait to check these in until Curtis' changes go in, right?
https://dev.azure.com/ni/DevCentral/_git/ASW/pullrequest/507369

@gpachecoNI
Copy link
Collaborator Author

The discovery_service.proto changes aren't expected to go into ASW until the release branch is made. So we should wait to check these in until Curtis' changes go in, right? https://dev.azure.com/ni/DevCentral/_git/ASW/pullrequest/507369

Yes, I am not planning to submit.

@gpachecoNI gpachecoNI changed the title Add Service Annotation Support [Do not submit] Add Service Annotation Support Jun 21, 2023
@gpachecoNI gpachecoNI requested a review from cumitche June 22, 2023 19:58
@bkeryan
Copy link
Collaborator

bkeryan commented Jun 22, 2023

#292 changes the codegen script. You will need to rerun it.

@gpachecoNI gpachecoNI force-pushed the users/gpacheco/AddServiceAnnotationSupport branch from de3714d to c545341 Compare June 23, 2023 15:15
@bkeryan
Copy link
Collaborator

bkeryan commented Jun 26, 2023

FYI, I created a releases/1.1 branch and updated main to version 1.2.0-dev0 in order to unblock these PRs.

@gpachecoNI gpachecoNI requested a review from cumitche June 27, 2023 22:09
@gpachecoNI gpachecoNI changed the title [Do not submit] Add Service Annotation Support Add Service Annotation Support Jun 28, 2023
@gpachecoNI gpachecoNI requested a review from bkeryan June 28, 2023 21:31
@gpachecoNI gpachecoNI requested a review from bkeryan June 28, 2023 22:12
@gpachecoNI gpachecoNI requested a review from bkeryan June 29, 2023 15:36
@bkeryan
Copy link
Collaborator

bkeryan commented Jun 29, 2023

Both Joel and I have approved this, so please merge it. If you don't have access, let us know.

@gpachecoNI gpachecoNI merged commit 8151868 into main Jun 30, 2023
@gpachecoNI gpachecoNI deleted the users/gpacheco/AddServiceAnnotationSupport branch June 30, 2023 14:49
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.

4 participants