diff --git a/src/assets/__tests__/__snapshots__/assets.snapshot.test.ts.snap b/src/assets/__tests__/__snapshots__/assets.snapshot.test.ts.snap index b935e4f72..f17655a39 100644 --- a/src/assets/__tests__/__snapshots__/assets.snapshot.test.ts.snap +++ b/src/assets/__tests__/__snapshots__/assets.snapshot.test.ts.snap @@ -2518,8 +2518,7 @@ dependencies = [ "fastapi >= 0.115.12", "google-adk >= 1.16.0, < 2.0.0", "google-genai >= 1.0.0, < 2.0.0", - "opentelemetry-distro", - "opentelemetry-exporter-otlp", + "aws-opentelemetry-distro >= 0.17.0", "uvicorn >= 0.34.3", ] @@ -4196,8 +4195,7 @@ description = "AgentCore Runtime Application using Google ADK" readme = "README.md" requires-python = ">=3.10" dependencies = [ - "opentelemetry-distro", - "opentelemetry-exporter-otlp", + "aws-opentelemetry-distro >= 0.17.0", "google-adk >= 1.35.0, < 2.0.0", "google-genai >= 1.0.0, < 2.0.0", "bedrock-agentcore >= 1.0.3", diff --git a/src/assets/__tests__/googleadk-observability.test.ts b/src/assets/__tests__/googleadk-observability.test.ts new file mode 100644 index 000000000..c1f45a7ae --- /dev/null +++ b/src/assets/__tests__/googleadk-observability.test.ts @@ -0,0 +1,23 @@ +import * as fs from 'fs'; +import * as path from 'path'; +import { describe, expect, it } from 'vitest'; + +const ASSETS_DIR = path.resolve(__dirname, '..', 'python'); +const EXPECTED_DEPENDENCIES = [ + ['http', '"aws-opentelemetry-distro >= 0.17.0"'], + ['agui', '"aws-opentelemetry-distro >= 0.17.0"'], + ['a2a', '"aws-opentelemetry-distro"'], +] as const; + +describe('Google ADK observability dependencies', () => { + it.each(EXPECTED_DEPENDENCIES)('%s uses the AWS OpenTelemetry distro', (protocol, expectedDependency) => { + const pyproject = fs.readFileSync( + path.join(ASSETS_DIR, protocol, 'googleadk', 'base', 'pyproject.toml'), + 'utf-8' + ); + + expect(pyproject).toContain(expectedDependency); + expect(pyproject).not.toMatch(/^\s*"opentelemetry-distro",?$/m); + expect(pyproject).not.toMatch(/^\s*"opentelemetry-exporter-otlp",?$/m); + }); +}); diff --git a/src/assets/python/agui/googleadk/base/pyproject.toml b/src/assets/python/agui/googleadk/base/pyproject.toml index 7195670e1..472b8d72b 100644 --- a/src/assets/python/agui/googleadk/base/pyproject.toml +++ b/src/assets/python/agui/googleadk/base/pyproject.toml @@ -15,8 +15,7 @@ dependencies = [ "fastapi >= 0.115.12", "google-adk >= 1.16.0, < 2.0.0", "google-genai >= 1.0.0, < 2.0.0", - "opentelemetry-distro", - "opentelemetry-exporter-otlp", + "aws-opentelemetry-distro >= 0.17.0", "uvicorn >= 0.34.3", ] diff --git a/src/assets/python/http/googleadk/base/pyproject.toml b/src/assets/python/http/googleadk/base/pyproject.toml index b37575da0..57305ddf1 100644 --- a/src/assets/python/http/googleadk/base/pyproject.toml +++ b/src/assets/python/http/googleadk/base/pyproject.toml @@ -9,8 +9,7 @@ description = "AgentCore Runtime Application using Google ADK" readme = "README.md" requires-python = ">=3.10" dependencies = [ - "opentelemetry-distro", - "opentelemetry-exporter-otlp", + "aws-opentelemetry-distro >= 0.17.0", "google-adk >= 1.35.0, < 2.0.0", "google-genai >= 1.0.0, < 2.0.0", "bedrock-agentcore >= 1.0.3",