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

Fix OTEL Services integration #1770

Merged
merged 2 commits into from
Apr 30, 2024
Merged

Fix OTEL Services integration #1770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf047e1
Improve error message for invalid integration in unit tests
Swiddis Apr 30, 2024
2572465
Fix otel integration to pass validation tests
Swiddis Apr 30, 2024
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
0 ...mp-network-metrics-dashboard-1.0.0.ndjson → ...mp_network_metrics_dashboard-1.0.0.ndjson
View file
Open in desktop
File renamed without changes.
0 ...ts/otel-apm-network-services-1.0.0.ndjson → ...ts/otel_apm_network_services-1.0.0.ndjson
View file
Open in desktop
File renamed without changes.
0 ...tel-ingestion-rate-dashboard-1.0.0.ndjson → ...tel_ingestion_rate_dashboard-1.0.0.ndjson
View file
Open in desktop
File renamed without changes.
0 ...sets/otel-services-dashboard-1.0.0.ndjson → ...sets/otel_services_dashboard-1.0.0.ndjson
View file
Open in desktop
File renamed without changes.
0 ...tel-single-service-dashboard-1.0.0.ndjson → ...tel_single_service_dashboard-1.0.0.ndjson
View file
Open in desktop
File renamed without changes.
92 changes: 6 additions & 86 deletions server/adaptors/integrations/__data__/repository/otel-services/data/traces-samples.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,7 @@
},
"db.instance": "ffs",
"db.name": "ffs",
"db.statement": ""
"SELECT f0."
id
", f0."
description
", f0."
enabled
", f0."
name
", f0."
inserted_at
", f0."
updated_at
" FROM "
featureflags
" AS f0"
"",
"db.statement": "SELECT f0.\"id\", f0.\"description\", f0.\"enabled\", f0.\"name\", f0.\"inserted_at\", f0.\"updated_at\" FROM \"featureflags\" AS f0",
"db.type": "sql",
"db.url": "ecto://ffs_postgres",
"decode_time_microseconds": 216,
Expand Down Expand Up @@ -193,23 +177,7 @@
},
"db.instance": "ffs",
"db.name": "ffs",
"db.statement": ""
"SELECT f0."
id
", f0."
description
", f0."
enabled
", f0."
name
", f0."
inserted_at
", f0."
updated_at
" FROM "
featureflags
" AS f0"
"",
"db.statement": "SELECT f0.\"id\", f0.\"description\", f0.\"enabled\", f0.\"name\", f0.\"inserted_at\", f0.\"updated_at\" FROM \"featureflags\" AS f0",
"db.type": "sql",
"db.url": "ecto://ffs_postgres",
"decode_time_microseconds": 24,
Expand Down Expand Up @@ -252,7 +220,7 @@
"@timestamp": "0001-01-01T00:00:00Z",
"traceId": "e3335d43c7790064a14318ef59602e56",
"traceState": ""
}
},
{
"attributes": {
"data_stream": {
Expand Down Expand Up @@ -320,23 +288,7 @@
},
"db.instance": "ffs",
"db.name": "ffs",
"db.statement": ""
"SELECT f0."
id
", f0."
description
", f0."
enabled
", f0."
name
", f0."
inserted_at
", f0."
updated_at
" FROM "
featureflags
" AS f0"
"",
"db.statement": "SELECT f0.\"id\", f0.\"description\", f0.\"enabled\", f0.\"name\", f0.\"inserted_at\", f0.\"updated_at\" FROM \"featureflags\" AS f0",
"db.type": "sql",
"db.url": "ecto://ffs_postgres",
"decode_time_microseconds": 11,
Expand Down Expand Up @@ -447,23 +399,7 @@
},
"db.instance": "ffs",
"db.name": "ffs",
"db.statement": ""
"SELECT f0."
id
", f0."
description
", f0."
enabled
", f0."
name
", f0."
inserted_at
", f0."
updated_at
" FROM "
featureflags
" AS f0"
"",
"db.statement": "SELECT f0.\"id\", f0.\"description\", f0.\"enabled\", f0.\"name\", f0.\"inserted_at\", f0.\"updated_at\" FROM \"featureflags\" AS f0",
"db.type": "sql",
"db.url": "ecto://ffs_postgres",
"decode_time_microseconds": 104,
Expand Down Expand Up @@ -574,23 +510,7 @@
},
"db.instance": "ffs",
"db.name": "ffs",
"db.statement": ""
"SELECT f0."
id
", f0."
description
", f0."
enabled
", f0."
name
", f0."
inserted_at
", f0."
updated_at
" FROM "
featureflags
" AS f0"
"",
"db.statement": "SELECT f0.\"id\", f0.\"description\", f0.\"enabled\", f0.\"name\", f0.\"inserted_at\", f0.\"updated_at\" FROM \"featureflags\" AS f0",
"db.type": "sql",
"db.url": "ecto://ffs_postgres",
"decode_time_microseconds": 10,
Expand Down
12 changes: 6 additions & 6 deletions server/adaptors/integrations/__data__/repository/otel-services/otel-services-1.0.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "Otel Services Demo App with OpenSearch Observability",
"license": "Apache-2.0",
"type": "traces",
"labels": ["log", "traces", "metrics", "Flint S3"],
"labels": ["log", "traces", "metrics"],
"author": "OpenSearch",
"sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/otel-services/info",
"workflows": [
Expand Down Expand Up @@ -70,35 +70,35 @@
],
"assets": [
{
"name": "otel-services-dashboard",
"name": "otel_services_dashboard",
"version": "1.0.0",
"extension": "ndjson",
"type": "savedObjectBundle",
"workflows": ["dashboards"]
},
{
"name": "otel-single-service-dashboard",
"name": "otel_single_service_dashboard",
"version": "1.0.0",
"extension": "ndjson",
"type": "savedObjectBundle",
"workflows": ["dashboards"]
},
{
"name": "otel-ingestion-rate-dashboard",
"name": "otel_ingestion_rate_dashboard",
"version": "1.0.0",
"extension": "ndjson",
"type": "savedObjectBundle",
"workflows": ["dashboards"]
},
{
"name": "otel-amp-network-metrics-dashboard",
"name": "otel_amp_network_metrics_dashboard",
"version": "1.0.0",
"extension": "ndjson",
"type": "savedObjectBundle",
"workflows": ["dashboards"]
},
{
"name": "otel-apm-network-services",
"name": "otel_apm_network_services",
"version": "1.0.0",
"extension": "ndjson",
"type": "savedObjectBundle",
Expand Down
1 change: 1 addition & 0 deletions server/adaptors/integrations/__test__/json_repository.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const fetchSerializedIntegrations = async (): Promise<Result<SerializedIntegrati
describe('The Local Serialized Catalog', () => {
it('Should serialize without errors', async () => {
const serialized = await fetchSerializedIntegrations();
expect(serialized.error).not.toBeDefined();
expect(serialized.ok).toBe(true);
});

Expand Down
10 changes: 7 additions & 3 deletions server/adaptors/integrations/repository/__test__/integration_reader.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ describe('Integration', () => {

const result = await integration.getConfig(TEST_INTEGRATION_CONFIG.version);

expect(result.error?.message).toBe('Unable to parse file as JSON or NDJson');
expect(result.error?.message).toBe(
"Unable to parse file 'sample-2.0.0.json' as JSON or NDJson"
);
});

it('should return an error if the integration config does not exist', async () => {
Expand Down Expand Up @@ -134,7 +136,9 @@ describe('Integration', () => {

const result = await integration.getAssets(TEST_INTEGRATION_CONFIG.version);

expect(result.error?.message).toBe('Unable to parse file as JSON or NDJson');
expect(result.error?.message).toBe(
"Unable to parse file 'sample-1.0.1.ndjson' as JSON or NDJson"
);
});
});

Expand Down Expand Up @@ -262,7 +266,7 @@ describe('Integration', () => {

const result = await integration.getSampleData();

expect(result.error?.message).toBe('Unable to parse file as JSON or NDJson');
expect(result.error?.message).toBe("Unable to parse file 'sample.json' as JSON or NDJson");
});
});
});
2 changes: 1 addition & 1 deletion server/adaptors/integrations/repository/fs_data_adaptor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export class FileSystemDataAdaptor implements CatalogDataAdaptor {
}
return {
ok: false,
error: new Error('Unable to parse file as JSON or NDJson', { cause: err }),
error: new Error(`Unable to parse file '${filename}' as JSON or NDJson`, { cause: err }),
};
}
}
Expand Down
Loading