Skip to content

deduplicate otel dependencies #250841

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
TinaHeiligers merged 9 commits into from
Jan 30, 2026
Merged

deduplicate otel dependencies #250841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
122d8e3
deduplicate otel dependencies
TinaHeiligers Jan 29, 2026
e28c0b2
Changes from yarn openapi:bundle
kibanamachine Jan 29, 2026
c79fc40
Update yarn,lock after adding OpenTelemetry resolutions
TinaHeiligers Jan 29, 2026
a82d0a3
Update OpenTelemetry modules
elastic-renovate-prod[bot] Jan 24, 2026
1363adf
Changes from node scripts/yarn_deduplicate.js && yarn kbn bootstrap &…
kibanamachine Jan 24, 2026
b809629
configures nested protobufjs dependency
TinaHeiligers Jan 29, 2026
68996d2
chore: deduplicate yarn.lock
TinaHeiligers Jan 29, 2026
cb5747a
Merge branch 'main' into deduplicate_otel_modules
TinaHeiligers Jan 29, 2026
9b5829c
update prometheus scraped metrics test
TinaHeiligers Jan 30, 2026
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
25 changes: 14 additions & 11 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@
"**/@hello-pangea/dnd": "18.0.1",
"**/@langchain/core": "0.3.80",
"**/@langchain/google-common": "0.2.18",
"**/@opentelemetry/api": "1.9.0",
"**/@opentelemetry/resources": "2.2.0",
"**/@opentelemetry/sdk-metrics": "2.2.0",
"**/@types/node": "22.19.1",
"**/@types/prop-types": "15.7.5",
"**/@typescript-eslint/utils": "8.46.3",
Expand Down Expand Up @@ -1214,19 +1217,19 @@
"@openfeature/server-sdk": "1.20.1",
"@openfeature/web-sdk": "1.7.2",
"@opentelemetry/api": "1.9.0",
"@opentelemetry/context-async-hooks": "2.2.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.208.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.208.0",
"@opentelemetry/exporter-metrics-otlp-proto": "0.208.0",
"@opentelemetry/exporter-prometheus": "0.208.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.208.0",
"@opentelemetry/exporter-trace-otlp-http": "0.208.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.208.0",
"@opentelemetry/instrumentation": "0.208.0",
"@opentelemetry/context-async-hooks": "2.3.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.209.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.209.0",
"@opentelemetry/exporter-metrics-otlp-proto": "0.209.0",
"@opentelemetry/exporter-prometheus": "0.209.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.209.0",
"@opentelemetry/exporter-trace-otlp-http": "0.209.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.209.0",
"@opentelemetry/instrumentation": "0.209.0",
"@opentelemetry/instrumentation-hapi": "0.57.0",
"@opentelemetry/instrumentation-http": "0.208.0",
"@opentelemetry/instrumentation-http": "0.209.0",
"@opentelemetry/instrumentation-undici": "0.19.0",
"@opentelemetry/otlp-exporter-base": "0.208.0",
"@opentelemetry/otlp-exporter-base": "0.209.0",
"@opentelemetry/semantic-conventions": "1.38.0",
"@reduxjs/toolkit": "1.9.7",
"@slack/webhook": "7.0.6",
Expand Down
44 changes: 43 additions & 1 deletion packages/kbn-yarn-install-scripts/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,48 @@
"required": false,
"reason": "Prints version scheme warning - not needed"
},
{
"path": "@opentelemetry/exporter-metrics-otlp-grpc/node_modules/protobufjs",
"lifecycle": "postinstall",
"required": false,
"reason": "Nested protobufjs dependency - prints version scheme warning, not needed"
},
{
"path": "@opentelemetry/exporter-metrics-otlp-http/node_modules/protobufjs",
"lifecycle": "postinstall",
"required": false,
"reason": "Nested protobufjs dependency - prints version scheme warning, not needed"
},
{
"path": "@opentelemetry/exporter-metrics-otlp-proto/node_modules/protobufjs",
"lifecycle": "postinstall",
"required": false,
"reason": "Nested protobufjs dependency - prints version scheme warning, not needed"
},
{
"path": "@opentelemetry/exporter-trace-otlp-grpc/node_modules/protobufjs",
"lifecycle": "postinstall",
"required": false,
"reason": "Nested protobufjs dependency - prints version scheme warning, not needed"
},
{
"path": "@opentelemetry/exporter-trace-otlp-http/node_modules/protobufjs",
"lifecycle": "postinstall",
"required": false,
"reason": "Nested protobufjs dependency - prints version scheme warning, not needed"
},
{
"path": "@opentelemetry/exporter-trace-otlp-proto/node_modules/protobufjs",
"lifecycle": "postinstall",
"required": false,
"reason": "Nested protobufjs dependency - prints version scheme warning, not needed"
},
{
"path": "@opentelemetry/otlp-exporter-base/node_modules/protobufjs",
"lifecycle": "postinstall",
"required": false,
"reason": "Nested protobufjs dependency - prints version scheme warning, not needed"
},
{
"path": "puppeteer",
"lifecycle": "postinstall",
Expand All @@ -109,4 +151,4 @@
"reason": "Builds from source if npm_config_build_from_source=true. Prebuilds are sufficient."
}
]
}
}
7 changes: 5 additions & 2 deletions x-pack/platform/test/api_integration/apis/monitoring_collection/prometheus.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,16 @@ export default function ({ getService }: FtrProviderContext) {
const cleanResponseText = response.text.replace(/\s+/g, ' ');

// 1. Match the headers with the resource attributes
// Check for required attributes (service_name and service_version) but allow any additional attributes in any order
// Using non-greedy quantifiers (.*?) to prevent ReDoS vulnerabilities from catastrophic backtracking
expect(cleanResponseText).to.match(
/^# HELP target_info Target metadata # TYPE target_info gauge target_info{((service_name|service_version|service_instance_id)=".+?",{0,1})+} 1/
/^# HELP target_info Target metadata # TYPE target_info gauge target_info{.*?service_name=".+?".*?service_version=".+?".*?} 1/
);

// 2. Match the specific known counter reported in src/platform/test/common/plugins/otel_metrics/server/monitoring/metrics.ts
// Allow optional labels (e.g., {otel_scope_name="dummyMetric"}) before the value
expect(cleanResponseText).to.match(
/# HELP request_count_total Counts total number of requests # TYPE request_count_total counter request_count_total [0-9]/
/# HELP request_count_total Counts total number of requests # TYPE request_count_total counter request_count_total(\{[^}]+\})? [0-9]/
);
});
});
Expand Down
Loading
Loading