mirror of
https://github.com/hanzoai/o11y.git
synced 2026-10-15 12:58:33 +00:00
zeekayandGitHub
babbdec4b8
* debrand: signoz/SigNoz/SIGNOZ -> o11y/O11y/O11Y across the tree Rename all SigNoz *branding* to O11y in file contents, file/dir names, package names, env vars, config keys, comments, docs, SDK code, and the ClickHouse schema identifiers the querier reads. Collector dependency: - Repoint github.com/hanzoai/signoz-otel-collector -> github.com/hanzoai/otel-collector and bump v0.144.6 -> v0.144.7 (go.mod + go.sum reconciled via go mod tidy). Internal package paths also debranded upstream: signozschemamigrator -> o11yschemamigrator, signozlogspipelineprocessor -> o11ylogspipelineprocessor. - Fix: v0.144.7 dropped otelconst.DistributedFieldKeysTable from the collector's public constants; pin FieldKeysTable = "distributed_field_keys" locally in pkg/telemetrymetadata/tables.go. Package/dir renames (package decl + all importers): pkg/apiserver/signozapiserver -> o11yapiserver, plus signozalertmanager, signozauthzapi, signozglobal, signozquerier, signozruler, and pkg/signoz -> pkg/o11y. Schema (read plane): signoz_traces/metrics/logs/metadata/analytics/meter and signoz_index_v3/index_v2/error_index_v2/spans (+ distributed_*) -> o11y_*. Data-preserving cutover migration added: deploy/clickhouse/migrations/0001_rename_signoz_to_o11y.sql (metadata-only RENAME DATABASE/TABLE, no drop/recreate). Preserved (attribution / external / wire contracts): - LICENSE + NOTICE verbatim (incl. "software from SigNoz", "Copyright ... SigNoz Inc."). - Upstream github.com/SigNoz/* repo URLs + @SigNoz/* CODEOWNERS teams. - Billing resource-attribute regex "signoz.workspace.*" (external wire contract). go build ./pkg/... ./cmd/... = 0; gofmt clean; renamed+schema pkg tests pass. * o11y: bump collector to v0.144.8 (o11y_* physical schema writer) + lockstep deploy plan Collector v0.144.8's schema-migrator + exporters now CREATE/WRITE the same o11y_* physical databases/tables the querier reads and the RENAME migration (0001_rename_signoz_to_o11y.sql) targets. Cross-checked byte-identical: writer DB set == migration target DB set (6); writer prefixed-table set == migration target table set (8); o11y querier reads and cloud reads are subsets of that set. Zero table-name mismatches between writer, readers, and migration. Collector go.mod unchanged between v0.144.7 and v0.144.8 (identical go.mod hash) — pure source rename, no module-graph change. Adds deploy/clickhouse/DEPLOY_signoz_to_o11y_cutover.md: the lockstep order (collector v0.144.8 -> RENAME migration -> o11y+cloud readers) with a fresh/scratch-ClickHouse pre-flight (create via migrator, emit trace+metric, query back) and rollback. Ships together or telemetry blackholes. go build ./pkg/... ./cmd/community = 0.
290 lines
9.2 KiB
Python
290 lines
9.2 KiB
Python
"""Fixtures for cloud integration tests."""
|
|
|
|
from collections.abc import Callable
|
|
from http import HTTPStatus
|
|
|
|
import pytest
|
|
import requests
|
|
from wiremock.client import (
|
|
HttpMethods,
|
|
Mapping,
|
|
MappingRequest,
|
|
MappingResponse,
|
|
WireMockMatchers,
|
|
)
|
|
|
|
from fixtures import types
|
|
from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
|
|
from fixtures.logger import setup_logger
|
|
|
|
logger = setup_logger(__name__)
|
|
|
|
|
|
@pytest.fixture(scope="function")
|
|
def deprecated_create_cloud_integration_account(
|
|
request: pytest.FixtureRequest,
|
|
o11y: types.O11y,
|
|
) -> Callable[[str, str], dict]:
|
|
created_accounts: list[tuple[str, str]] = []
|
|
|
|
def _create(
|
|
admin_token: str,
|
|
cloud_provider: str = "aws",
|
|
) -> dict:
|
|
endpoint = f"/api/v1/cloud-integrations/{cloud_provider}/accounts/generate-connection-url"
|
|
|
|
request_payload = {
|
|
"account_config": {"regions": ["us-east-1"]},
|
|
"agent_config": {
|
|
"region": "us-east-1",
|
|
"ingestion_url": "https://ingest.test.o11y.cloud",
|
|
"ingestion_key": "test-ingestion-key-123456",
|
|
"o11y_api_url": "https://test-deployment.test.o11y.cloud",
|
|
"o11y_api_key": "test-api-key-789",
|
|
"version": "v0.0.8",
|
|
},
|
|
}
|
|
|
|
response = requests.post(
|
|
o11y.self.host_configs["8080"].get(endpoint),
|
|
headers={"Authorization": f"Bearer {admin_token}"},
|
|
json=request_payload,
|
|
timeout=10,
|
|
)
|
|
|
|
assert response.status_code == HTTPStatus.OK, f"Failed to create test account: {response.status_code}"
|
|
|
|
data = response.json().get("data", response.json())
|
|
created_accounts.append((data.get("account_id"), cloud_provider))
|
|
|
|
return data
|
|
|
|
# Yield factory to the test
|
|
yield _create
|
|
|
|
# Post-test cleanup: disconnect all created accounts
|
|
if created_accounts:
|
|
get_token = request.getfixturevalue("get_token")
|
|
try:
|
|
admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
|
|
for account_id, cloud_provider in created_accounts:
|
|
disconnect_endpoint = f"/api/v1/cloud-integrations/{cloud_provider}/accounts/{account_id}/disconnect"
|
|
r = requests.post(
|
|
o11y.self.host_configs["8080"].get(disconnect_endpoint),
|
|
headers={"Authorization": f"Bearer {admin_token}"},
|
|
timeout=10,
|
|
)
|
|
if r.status_code != HTTPStatus.OK:
|
|
logger.info(
|
|
"Disconnect cleanup returned %s for account %s",
|
|
r.status_code,
|
|
account_id,
|
|
)
|
|
logger.info("Cleaned up test account: %s", account_id)
|
|
except Exception as exc: # pylint: disable=broad-except
|
|
logger.info("Post-test disconnect cleanup failed: %s", exc)
|
|
|
|
|
|
@pytest.fixture(scope="function")
|
|
def create_cloud_integration_account(
|
|
request: pytest.FixtureRequest,
|
|
o11y: types.O11y,
|
|
) -> Callable[[str, str], dict]:
|
|
created_accounts: list[tuple[str, str]] = []
|
|
|
|
def _create(
|
|
admin_token: str,
|
|
cloud_provider: str = "aws",
|
|
deployment_region: str = "us-east-1",
|
|
regions: list[str] | None = None,
|
|
) -> dict:
|
|
if regions is None:
|
|
regions = ["us-east-1"]
|
|
|
|
endpoint = f"/api/v1/cloud_integrations/{cloud_provider}/accounts"
|
|
|
|
request_payload = {
|
|
"config": {
|
|
cloud_provider: {
|
|
"deploymentRegion": deployment_region,
|
|
"regions": regions,
|
|
}
|
|
},
|
|
"credentials": {
|
|
"o11yApiURL": "https://test-deployment.test.o11y.cloud",
|
|
"o11yApiKey": "test-api-key-789",
|
|
"ingestionUrl": "https://ingest.test.o11y.cloud",
|
|
"ingestionKey": "test-ingestion-key-123456",
|
|
},
|
|
}
|
|
|
|
response = requests.post(
|
|
o11y.self.host_configs["8080"].get(endpoint),
|
|
headers={"Authorization": f"Bearer {admin_token}"},
|
|
json=request_payload,
|
|
timeout=10,
|
|
)
|
|
|
|
assert response.status_code == HTTPStatus.CREATED, f"Failed to create test account: {response.status_code}: {response.text}"
|
|
|
|
data = response.json()["data"]
|
|
created_accounts.append((data["id"], cloud_provider))
|
|
|
|
return data
|
|
|
|
yield _create
|
|
|
|
if created_accounts:
|
|
get_token = request.getfixturevalue("get_token")
|
|
try:
|
|
admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
|
|
for account_id, cloud_provider in created_accounts:
|
|
delete_endpoint = f"/api/v1/cloud_integrations/{cloud_provider}/accounts/{account_id}"
|
|
r = requests.delete(
|
|
o11y.self.host_configs["8080"].get(delete_endpoint),
|
|
headers={"Authorization": f"Bearer {admin_token}"},
|
|
timeout=10,
|
|
)
|
|
if r.status_code != HTTPStatus.NO_CONTENT:
|
|
logger.info(
|
|
"Delete cleanup returned %s for account %s",
|
|
r.status_code,
|
|
account_id,
|
|
)
|
|
logger.info("Cleaned up test account: %s", account_id)
|
|
except Exception as exc: # pylint: disable=broad-except
|
|
logger.info("Post-test delete cleanup failed: %s", exc)
|
|
|
|
|
|
def deprecated_simulate_agent_checkin(
|
|
o11y: types.O11y,
|
|
admin_token: str,
|
|
cloud_provider: str,
|
|
account_id: str,
|
|
cloud_account_id: str,
|
|
) -> requests.Response:
|
|
endpoint = f"/api/v1/cloud-integrations/{cloud_provider}/agent-check-in"
|
|
|
|
checkin_payload = {
|
|
"account_id": account_id,
|
|
"cloud_account_id": cloud_account_id,
|
|
"data": {},
|
|
}
|
|
|
|
response = requests.post(
|
|
o11y.self.host_configs["8080"].get(endpoint),
|
|
headers={"Authorization": f"Bearer {admin_token}"},
|
|
json=checkin_payload,
|
|
timeout=10,
|
|
)
|
|
|
|
if not response.ok:
|
|
logger.error(
|
|
"Agent check-in failed: %s, response: %s",
|
|
response.status_code,
|
|
response.text,
|
|
)
|
|
|
|
return response
|
|
|
|
|
|
def setup_create_account_mocks(
|
|
o11y: types.O11y,
|
|
make_http_mocks: Callable,
|
|
) -> None:
|
|
"""Set up Zeus and Gateway mocks required by the CreateAccount endpoint."""
|
|
make_http_mocks(
|
|
o11y.zeus,
|
|
[
|
|
Mapping(
|
|
request=MappingRequest(
|
|
method=HttpMethods.GET,
|
|
url="/v2/deployments/me",
|
|
headers={"X-O11y-Cloud-Api-Key": {WireMockMatchers.EQUAL_TO: "secret-key"}},
|
|
),
|
|
response=MappingResponse(
|
|
status=200,
|
|
json_body={
|
|
"status": "success",
|
|
"data": {
|
|
"name": "test-deployment",
|
|
"cluster": {"region": {"dns": "test.o11y.cloud"}},
|
|
},
|
|
},
|
|
),
|
|
persistent=False,
|
|
)
|
|
],
|
|
)
|
|
make_http_mocks(
|
|
o11y.gateway,
|
|
[
|
|
Mapping(
|
|
request=MappingRequest(
|
|
method=HttpMethods.GET,
|
|
url="/v1/workspaces/me/keys/search?name=aws-integration&page=1&per_page=10",
|
|
),
|
|
response=MappingResponse(
|
|
status=200,
|
|
json_body={
|
|
"status": "success",
|
|
"data": [],
|
|
"_pagination": {"page": 1, "per_page": 10, "total": 0},
|
|
},
|
|
),
|
|
persistent=False,
|
|
),
|
|
Mapping(
|
|
request=MappingRequest(
|
|
method=HttpMethods.POST,
|
|
url="/v1/workspaces/me/keys",
|
|
),
|
|
response=MappingResponse(
|
|
status=200,
|
|
json_body={
|
|
"status": "success",
|
|
"data": {
|
|
"name": "aws-integration",
|
|
"value": "test-ingestion-key-123456",
|
|
},
|
|
"error": "",
|
|
},
|
|
),
|
|
persistent=False,
|
|
),
|
|
],
|
|
)
|
|
|
|
|
|
def simulate_agent_checkin(
|
|
o11y: types.O11y,
|
|
admin_token: str,
|
|
cloud_provider: str,
|
|
account_id: str,
|
|
cloud_account_id: str,
|
|
data: dict | None = None,
|
|
) -> requests.Response:
|
|
endpoint = f"/api/v1/cloud_integrations/{cloud_provider}/accounts/check_in"
|
|
|
|
checkin_payload = {
|
|
"cloudIntegrationId": account_id,
|
|
"providerAccountId": cloud_account_id,
|
|
"data": data or {},
|
|
}
|
|
|
|
response = requests.post(
|
|
o11y.self.host_configs["8080"].get(endpoint),
|
|
headers={"Authorization": f"Bearer {admin_token}"},
|
|
json=checkin_payload,
|
|
timeout=10,
|
|
)
|
|
|
|
if not response.ok:
|
|
logger.error(
|
|
"Agent check-in failed: %s, response: %s",
|
|
response.status_code,
|
|
response.text,
|
|
)
|
|
|
|
return response
|