Skip to content

Ensure integrations quickstart connection closed #8

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

Merged
dd-mergequeue merged 1 commit into from
Sep 22, 2025
Merged

Ensure integrations quickstart connection closed #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 40 additions & 32 deletions azure/integration_quickstart/src/azure_integration_quickstart/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,17 @@ def report_step(
print("\r", end="")
self.report(step_id, Status.OK, f"{step_id}: {Status.OK}", step_metadata or None)


@contextmanager
def open_datadog_connection():
Copy link
Copy Markdown
Collaborator

@tedkahwaji tedkahwaji Sep 19, 2025

Choose a reason for hiding this comment

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

Any hesitation with switching urllib if it's not a difficult lift?

https://github.com/DataDog/experimental/blob/159641a3648a468fff1c9d71979d57d135e99799/teams/gcp-integrations/onboarding/setup.py#L79-L79

Copy link
Copy Markdown
Collaborator Author

@benjjs benjjs Sep 19, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Some preliminary research suggests that urllib does not support persistent connections, which this currently is. Re-using the connection should allow for lower latency so I'm a bit reluctant to give it up.

I should say though that I'm not deeply knowledgeable on the topic and did not make the original call to implement it this way.

datadog_site = os.environ["DD_SITE"]
datadog_connection = HTTPSConnection(f"api.{datadog_site}")
try:
yield datadog_connection
finally:
datadog_connection.close()


# Main


Expand Down Expand Up @@ -542,43 +553,40 @@ def main():
print(f"Missing required environment variables: {', '.join(missing_environment_vars)}")
sys.exit(1)

datadog_site = os.environ["DD_SITE"]
workflow_id = os.environ["WORKFLOW_ID"]

datadog_connection = HTTPSConnection(f"api.{datadog_site}")
status = StatusReporter(datadog_connection, workflow_id)
with open_datadog_connection() as datadog_connection:
status = StatusReporter(datadog_connection, workflow_id)

# give up after 30 minutes
timer = threading.Timer(30 * 60, time_out, [datadog_connection, status])
timer.daemon = True
timer.start()
# give up after 30 minutes
timer = threading.Timer(30 * 60, time_out, [datadog_connection, status])
timer.daemon = True
timer.start()

try:
with status.report_step("login"):
ensure_login()
except Exception as e:
if "az: command not found" in str(e):
print("You must install and log in to Azure CLI to run this script.")
try:
with status.report_step("login"):
ensure_login()
except Exception as e:
if "az: command not found" in str(e):
print("You must install and log in to Azure CLI to run this script.")
else:
print("You must be logged in to Azure CLI to run this script. Run `az login` and try again.")
sys.exit(1)
else:
print("You must be logged in to Azure CLI to run this script. Run `az login` and try again.")
sys.exit(1)
else:
print("Connected! Leave this window open and go back to the Datadog UI to continue.")

with status.report_step("scopes", "Collecting scopes"):
subscriptions, _ = collect_available_scopes(datadog_connection, workflow_id)
with status.report_step("log_forwarders", "Collecting existing Log Forwarders") as step_metadata:
collect_log_forwarders(subscriptions, step_metadata)
with status.report_step("selections", "Waiting for user selections in the Datadog UI"):
scopes, config = receive_user_selections(datadog_connection, workflow_id)
with status.report_step("app_registration", "Creating app registration in Azure"):
app_registration = create_app_registration_with_permissions(scopes)
with status.report_step("integration_config", "Submitting new configuration to Datadog"):
submit_integration_config(datadog_connection, app_registration, config)
with status.report_step("config_identifier", "Submitting new configuration identifier to Datadog"):
submit_config_identifier(datadog_connection, workflow_id, app_registration)

datadog_connection.close()
print("Connected! Leave this window open and go back to the Datadog UI to continue.")

with status.report_step("scopes", "Collecting scopes"):
subscriptions, _ = collect_available_scopes(datadog_connection, workflow_id)
with status.report_step("log_forwarders", "Collecting existing Log Forwarders") as step_metadata:
collect_log_forwarders(subscriptions, step_metadata)
with status.report_step("selections", "Waiting for user selections in the Datadog UI"):
scopes, config = receive_user_selections(datadog_connection, workflow_id)
with status.report_step("app_registration", "Creating app registration in Azure"):
app_registration = create_app_registration_with_permissions(scopes)
with status.report_step("integration_config", "Submitting new configuration to Datadog"):
submit_integration_config(datadog_connection, app_registration, config)
with status.report_step("config_identifier", "Submitting new configuration identifier to Datadog"):
submit_config_identifier(datadog_connection, workflow_id, app_registration)

print("Script succeeded. You may close this window.")

Expand Down