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.

Sign up for GitHub

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

Jump to bottom

[python]attempt to enable telemetry tests for python [INPLAT-36] #3284

Merged
merged 19 commits into from
Oct 30, 2024
Merged

[python]attempt to enable telemetry tests for python [INPLAT-36] #3284

merged 19 commits into from
Oct 30, 2024

Conversation

emmettbutler
Copy link
Contributor

@emmettbutler emmettbutler commented Oct 22, 2024 •
edited
Loading

Adds smoke tests for auto-injection telemetry from dd-trace-py. Currently skipped as bug due to DataDog/dd-trace-py#11101

Reviewer checklist

  • If PR title starts with [<language>], double-check that only <language> is impacted by the change
  • No system-tests internal is modified. Otherwise, I have the approval from R&P team
  • CI is green, or failing jobs are not related to this change (and you are 100% sure about this statement)
  • A docker base image is modified?
    • the relevant build-XXX-image label is present
  • A scenario is added (or removed)?

@emmettbutler emmettbutler requested a review from a team as a code owner October 22, 2024 14:19
cbeauchesne
cbeauchesne reviewed Oct 22, 2024
View reviewed changes
Copy link
Collaborator

@cbeauchesne cbeauchesne left a comment

Choose a reason for hiding this comment

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

I think you need to define python weblogs in utils/docker_ssi/docker_ssi_definitions.py

cc @robertomonteromiguel

@robertomonteromiguel
Copy link
Collaborator

Yes, I think we can set this PR as draft, because we need to add the python scripts, docker files....
@iamluc is looking that too

@robertomonteromiguel robertomonteromiguel marked this pull request as draft October 22, 2024 16:25
@emmettbutler
Copy link
Contributor Author

@robertomonteromiguel let me know if this looks right to you. I believe I've got it all working with the exception of the tests actually passing, since there's a known issue with Python wherein it doesn't send SSI telemetry (iirc).

@emmettbutler emmettbutler changed the title attempt to enable telemetry tests for python attempt to enable telemetry tests for python [INPLAT-36] Oct 24, 2024
@iamluc iamluc mentioned this pull request Oct 25, 2024
Merged
7 tasks
@emmettbutler emmettbutler marked this pull request as ready for review October 25, 2024 15:34
robertomonteromiguel
robertomonteromiguel requested changes Oct 28, 2024
View reviewed changes
Copy link
Collaborator

@robertomonteromiguel robertomonteromiguel left a comment

Choose a reason for hiding this comment

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

There is still one error on CI

tests/docker_ssi/test_docker_ssi.py
@@ -32,6 +31,7 @@ def setup_install_supported_runtime(self):
@bug(
condition="centos-7" in context.weblog_variant and context.library == "java", reason="APMON-1490",
)
@bug(condition=context.library == "python", reason="INPLAT-11")
Copy link
Collaborator

Choose a reason for hiding this comment

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

We are pointing to a jira task. We should point to a jira issue. If there is not issue, we can use the missing_feature decorator instead of bug decorator.
Also thinking about splitting this test method: test_for_traces and test_for_telemetry. What do you think?

utils/_context/_scenarios/docker_ssi.py
@@ -322,7 +322,9 @@ def build_weblog_image(self, ssi_installer_docker_tag):
buildargs={"DD_LANG": self._library, "BASE_IMAGE": ssi_installer_docker_tag},
)
self.print_docker_build_logs(self.ssi_all_docker_tag, build_logs)
logger.stdout(f"[tag:{weblog_docker_tag}] Building weblog app on base image [{self.ssi_all_docker_tag}].")
logger.stdout(
f"0000[tag:{weblog_docker_tag}] Building weblog app on base image [{self.ssi_all_docker_tag}]."
Copy link
Collaborator

Choose a reason for hiding this comment

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

remove 0000

utils/_context/_scenarios/docker_ssi.py
@@ -332,16 +334,17 @@ def build_weblog_image(self, ssi_installer_docker_tag):
nocache=self._force_build or self.should_push_base_images,
buildargs={"BASE_IMAGE": self.ssi_all_docker_tag},
)
logger.info("Weblog build done 000000000!")
Copy link
Collaborator

Choose a reason for hiding this comment

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

remove this trace

utils/docker_ssi/docker_ssi_definitions.py Outdated
@@ -117,5 +146,15 @@ def get_version_id(version):
WEBSPHERE_APP = WeblogDescriptor("websphere-app", "java", [SupportedImages().WEBSPHERE_AMD64])
JBOSS_APP = WeblogDescriptor("jboss-app", "java", [SupportedImages().JBOSS_AMD64])

UBUNTU22_PY_APP = WeblogDescriptor(
Copy link
Collaborator

Choose a reason for hiding this comment

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

we should change this name from "UBUNTU22_PY_APP " to "PY_APP "

@robertomonteromiguel robertomonteromiguel changed the title attempt to enable telemetry tests for python [INPLAT-36] [python]attempt to enable telemetry tests for python [INPLAT-36] Oct 30, 2024
@robertomonteromiguel robertomonteromiguel merged commit e4329c2 into main Oct 30, 2024
74 of 86 checks passed
@robertomonteromiguel robertomonteromiguel deleted the emmett.butler/telemetry-py branch October 30, 2024 10:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@robertomonteromiguel robertomonteromiguel robertomonteromiguel requested changes

@cbeauchesne cbeauchesne Awaiting requested review from cbeauchesne

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@emmettbutler @robertomonteromiguel @cbeauchesne