Skip to content

Commit 5a3b92e

Browse files
committed
Fix integration tests
The tests are failing in main after upgrade of the core dependency to 0.99 where the rpc/grpc metrics are not exported in the default (normal) telemetry level anymore. This change remove those metrics from the list of expected metrics by the integration tests
1 parent 460148c commit 5a3b92e

File tree

3 files changed

+44
-3424
lines changed

3 files changed

+44
-3424
lines changed

tests/receivers/lightprometheus/testdata/resource_metrics/internal.yaml

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,6 @@ resource_metrics:
44
service.name: myjob
55
scope_metrics:
66
- metrics:
7-
- name: otelcol_http_client_request_size
8-
description: Measures the size of HTTP request messages.
9-
type: DoubleMonotonicCumulativeSum
10-
attributes:
11-
http_method: GET
12-
http_status_code: <ANY>
13-
net_peer_name: <ANY>
14-
net_peer_port: <ANY>
15-
service_instance_id: <ANY>
16-
service_name: otelcol
17-
service_version: <VERSION_FROM_BUILD>
18-
- name: otelcol_http_client_response_size
19-
description: Measures the size of HTTP response messages.
20-
type: DoubleMonotonicCumulativeSum
21-
attributes:
22-
rpc_grpc_status_code: "0"
23-
rpc_method: Export
24-
rpc_service: opentelemetry.proto.collector.metrics.v1.MetricsService
25-
rpc_system: grpc
26-
service_instance_id: <ANY>
27-
service_name: otelcol
28-
service_version: <VERSION_FROM_BUILD>
29-
- name: otelcol_http_client_duration
30-
description: Measures the duration of outbound HTTP requests.
31-
type: Histogram
32-
attributes:
33-
receiver: lightprometheus/myjob
34-
service_instance_id: <ANY>
35-
service_name: otelcol
36-
service_version: <VERSION_FROM_BUILD>
377
- name: otelcol_process_runtime_total_sys_memory_bytes
388
description: Total bytes of memory obtained from the OS (see 'go doc runtime.MemStats.Sys')
399
type: DoubleGauge
@@ -142,59 +112,6 @@ resource_metrics:
142112
service_instance_id: <ANY>
143113
service_name: otelcol
144114
service_version: <VERSION_FROM_BUILD>
145-
- attributes:
146-
rpc_grpc_status_code: "0"
147-
rpc_method: <ANY>
148-
rpc_service: opentelemetry.proto.collector.metrics.v1.MetricsService
149-
rpc_system: grpc
150-
service_instance_id: <ANY>
151-
service_name: otelcol
152-
service_version: <VERSION_FROM_BUILD>
153-
description: Measures the duration of inbound RPC.
154-
name: otelcol_rpc_client_duration
155-
type: Histogram
156-
- attributes:
157-
rpc_method: <ANY>
158-
rpc_service: opentelemetry.proto.collector.metrics.v1.MetricsService
159-
rpc_system: grpc
160-
service_instance_id: <ANY>
161-
service_name: otelcol
162-
service_version: <VERSION_FROM_BUILD>
163-
description: Measures size of RPC request messages (uncompressed).
164-
name: otelcol_rpc_client_request_size
165-
type: Histogram
166-
- attributes:
167-
rpc_grpc_status_code: "0"
168-
rpc_method: <ANY>
169-
rpc_service: opentelemetry.proto.collector.metrics.v1.MetricsService
170-
rpc_system: grpc
171-
service_instance_id: <ANY>
172-
service_name: otelcol
173-
service_version: <VERSION_FROM_BUILD>
174-
description: Measures the number of messages received per RPC. Should be 1 for all non-streaming RPCs.
175-
name: otelcol_rpc_client_requests_per_rpc
176-
type: Histogram
177-
- attributes:
178-
rpc_method: <ANY>
179-
rpc_service: opentelemetry.proto.collector.metrics.v1.MetricsService
180-
rpc_system: grpc
181-
service_instance_id: <ANY>
182-
service_name: otelcol
183-
service_version: <VERSION_FROM_BUILD>
184-
description: Measures size of RPC response messages (uncompressed).
185-
name: otelcol_rpc_client_response_size
186-
type: Histogram
187-
- attributes:
188-
rpc_grpc_status_code: "0"
189-
rpc_method: <ANY>
190-
rpc_service: opentelemetry.proto.collector.metrics.v1.MetricsService
191-
rpc_system: grpc
192-
service_instance_id: <ANY>
193-
service_name: otelcol
194-
service_version: <VERSION_FROM_BUILD>
195-
description: Measures the number of messages received per RPC. Should be 1 for all non-streaming RPCs.
196-
name: otelcol_rpc_client_responses_per_rpc
197-
type: Histogram
198115
- attributes:
199116
service_instance_id: <ANY>
200117
service_name: otelcol

tests/receivers/smartagent/prometheus-exporter/prometheus_exporter_test.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,6 @@ func TestPrometheusExporterProvidesOTelInternalMetrics(t *testing.T) {
4141
"otelcol_process_runtime_total_sys_memory_bytes",
4242
"otelcol_process_uptime",
4343
"otelcol_receiver_accepted_metric_points",
44-
"otelcol_rpc_client_duration",
45-
"otelcol_rpc_client_duration_bucket",
46-
"otelcol_rpc_client_duration_count",
47-
"otelcol_rpc_client_request_size",
48-
"otelcol_rpc_client_request_size_bucket",
49-
"otelcol_rpc_client_request_size_count",
50-
"otelcol_rpc_client_requests_per_rpc",
51-
"otelcol_rpc_client_requests_per_rpc_bucket",
52-
"otelcol_rpc_client_requests_per_rpc_count",
53-
"otelcol_rpc_client_response_size",
54-
"otelcol_rpc_client_response_size_bucket",
55-
"otelcol_rpc_client_response_size_count",
56-
"otelcol_rpc_client_responses_per_rpc",
57-
"otelcol_rpc_client_responses_per_rpc_bucket",
58-
"otelcol_rpc_client_responses_per_rpc_count",
5944
))
6045
}
6146

0 commit comments

Comments
 (0)