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.
103 lines
3.8 KiB
Python
103 lines
3.8 KiB
Python
import docker
|
|
import docker.errors
|
|
import pytest
|
|
from sqlalchemy import create_engine, sql
|
|
from testcontainers.core.container import Network
|
|
from testcontainers.postgres import PostgresContainer
|
|
|
|
from fixtures import reuse, types
|
|
from fixtures.logger import setup_logger
|
|
|
|
logger = setup_logger(__name__)
|
|
|
|
|
|
@pytest.fixture(name="postgres", scope="package")
|
|
def postgres(network: Network, request: pytest.FixtureRequest, pytestconfig: pytest.Config) -> types.TestContainerSQL:
|
|
"""
|
|
Package-scoped fixture for PostgreSQL TestContainer.
|
|
"""
|
|
|
|
def create() -> types.TestContainerSQL:
|
|
version = request.config.getoption("--postgres-version")
|
|
|
|
container = PostgresContainer(
|
|
image=f"postgres:{version}",
|
|
port=5432,
|
|
username="o11y",
|
|
password="password",
|
|
dbname="o11y",
|
|
driver="psycopg2",
|
|
)
|
|
container.with_network(network)
|
|
container.start()
|
|
|
|
engine = create_engine(f"postgresql+psycopg2://{container.username}:{container.password}@{container.get_container_host_ip()}:{container.get_exposed_port(5432)}/{container.dbname}")
|
|
|
|
with engine.connect() as conn:
|
|
result = conn.execute(sql.text("SELECT 1"))
|
|
assert result.fetchone()[0] == 1
|
|
|
|
return types.TestContainerSQL(
|
|
container=types.TestContainerDocker(
|
|
id=container.get_wrapped_container().id,
|
|
host_configs={
|
|
"5432": types.TestContainerUrlConfig(
|
|
"postgresql",
|
|
container.get_container_host_ip(),
|
|
container.get_exposed_port(5432),
|
|
)
|
|
},
|
|
container_configs={"5432": types.TestContainerUrlConfig("postgresql", container.get_wrapped_container().name, 5432)},
|
|
),
|
|
conn=engine,
|
|
env={
|
|
"O11Y_SQLSTORE_PROVIDER": "postgres",
|
|
"O11Y_SQLSTORE_POSTGRES_DSN": f"postgresql://{container.username}:{container.password}@{container.get_wrapped_container().name}:{5432}/{container.dbname}",
|
|
"O11Y_SQLSTORE_POSTGRES_DBNAME": container.dbname,
|
|
"O11Y_SQLSTORE_POSTGRES_USER": container.username,
|
|
"O11Y_SQLSTORE_POSTGRES_PASSWORD": container.password,
|
|
},
|
|
)
|
|
|
|
def delete(container: types.TestContainerSQL):
|
|
client = docker.from_env()
|
|
try:
|
|
client.containers.get(container_id=container.container.id).stop()
|
|
client.containers.get(container_id=container.container.id).remove(v=True)
|
|
except docker.errors.NotFound:
|
|
logger.info(
|
|
"Skipping removal of Postgres, Postgres(%s) not found. Maybe it was manually removed?",
|
|
{"id": container.container.id},
|
|
)
|
|
|
|
def restore(cache: dict) -> types.TestContainerSQL:
|
|
container = types.TestContainerDocker.from_cache(cache["container"])
|
|
host_config = container.host_configs["5432"]
|
|
env = cache["env"]
|
|
|
|
engine = create_engine(f"postgresql+psycopg2://{env['O11Y_SQLSTORE_POSTGRES_USER']}:{env['O11Y_SQLSTORE_POSTGRES_PASSWORD']}@{host_config.address}:{host_config.port}/{env['O11Y_SQLSTORE_POSTGRES_DBNAME']}")
|
|
|
|
with engine.connect() as conn:
|
|
result = conn.execute(sql.text("SELECT 1"))
|
|
assert result.fetchone()[0] == 1
|
|
|
|
return types.TestContainerSQL(
|
|
container=container,
|
|
conn=engine,
|
|
env=env,
|
|
)
|
|
|
|
return reuse.wrap(
|
|
request,
|
|
pytestconfig,
|
|
"postgres",
|
|
lambda: types.TestContainerSQL(
|
|
container=types.TestContainerDocker(id="", host_configs={}, container_configs={}),
|
|
conn=None,
|
|
env={},
|
|
),
|
|
create,
|
|
delete,
|
|
restore,
|
|
)
|