Skip to content

Update opentelemetry-operations-collector submodule to v0.148.0 #2229

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
rafaelwestphal merged 41 commits into from
Mar 31, 2026
Merged

Update opentelemetry-operations-collector submodule to v0.148.0 #2229

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
4fdab72
Update opentelemetry-operations-collector submodule to v0.147.0
rafaelwestphal Mar 9, 2026
2991ff7
Bump Go versions in CI config and integration tests to 1.25
rafaelwestphal Mar 9, 2026
a46a1e0
Bump Go version in Docker templates to 1.25.0
rafaelwestphal Mar 9, 2026
c8e7cac
Revert Go version bump in integration tests
rafaelwestphal Mar 9, 2026
64d1362
Merge branch 'master' into update-otelopscol-version
rafaelwestphal Mar 9, 2026
13fedd5
[confgenerator ] Set `block_on_overflow` and exporter batching in Ote…
franciscovalentecastro Mar 9, 2026
8e75584
Merge branch 'master' into update-otelopscol-version
rafaelwestphal Mar 10, 2026
f2787a6
Merge branch 'master' into update-otelopscol-version
rafaelwestphal Mar 10, 2026
9e3b36f
Fix transformation tests stacktrace golden file shift by forcing GOTO…
rafaelwestphal Mar 11, 2026
a23490a
Refactor setting GOTOOLCHAIN=local via templates
rafaelwestphal Mar 11, 2026
24a980c
Remove redundant GOTOOLCHAIN=local from pr_presubmit.yaml
rafaelwestphal Mar 11, 2026
e1a3503
Cleanup trailing blank lines in pr_presubmit.yaml
rafaelwestphal Mar 11, 2026
fb32cf6
Merge branch 'master' into update-otelopscol-version
rafaelwestphal Mar 11, 2026
8f04920
Update self-metric change
rafaelwestphal Mar 12, 2026
4e74d03
Fixing golde
rafaelwestphal Mar 12, 2026
75006ce
Removing troolchain hack
rafaelwestphal Mar 12, 2026
ccefe8a
Removing rogue new line
rafaelwestphal Mar 12, 2026
333c429
Fixing status code values
rafaelwestphal Mar 12, 2026
2c378ef
Fix lint
rafaelwestphal Mar 12, 2026
feffed7
Merge branch 'master' into update-otelopscol-version
rafaelwestphal Mar 12, 2026
0da4745
Fixing golden value
rafaelwestphal Mar 12, 2026
2da1c82
Fix golden
rafaelwestphal Mar 13, 2026
e828c87
Merge branch 'master' into update-otelopscol-version
rafaelwestphal Mar 13, 2026
6126d85
Using submodulo to test fix
rafaelwestphal Mar 17, 2026
c2330a1
Test using local go bin version
rafaelwestphal Mar 20, 2026
c1d7f29
Merge branch 'master' into update-otelopscol-version
rafaelwestphal Mar 20, 2026
74c1b3f
Fixng loggin requets_count metric
rafaelwestphal Mar 20, 2026
bda3e60
Updating transofmration test goldfen
rafaelwestphal Mar 20, 2026
16d614e
Fixing compilatipon wprolbm
rafaelwestphal Mar 20, 2026
46a8101
Fixing windows dockerfile
rafaelwestphal Mar 23, 2026
0af35c6
Fixing sefl-metric test
rafaelwestphal Mar 24, 2026
d36ba8d
Merge branch 'master' into update-otelopscol-version
rafaelwestphal Mar 24, 2026
980e771
Fixing self-metric dots to underscore
rafaelwestphal Mar 25, 2026
d4155e4
Merge branch 'master' into update-otelopscol-version
rafaelwestphal Mar 25, 2026
9de796f
Fixing point count metric name
rafaelwestphal Mar 25, 2026
edccf7c
Merge branch 'master' into update-otelopscol-version
rafaelwestphal Mar 25, 2026
0dfc725
Merge branch 'master' into update-otelopscol-version
rafaelwestphal Mar 26, 2026
733b3db
Pointing operations-collector to master commit
rafaelwestphal Mar 26, 2026
47baefe
Fixing bug with self-metric
rafaelwestphal Mar 30, 2026
6d78ca9
Merge branch 'master' into update-otelopscol-version
rafaelwestphal Mar 31, 2026
ddae4ae
Fixing windows event log issue
rafaelwestphal Mar 31, 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
2 changes: 1 addition & 1 deletion .github/workflows/pr_presubmit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

- uses: actions/setup-go@v3
with:
go-version: 1.24.x
go-version: 1.25.x
cache: true

- id: files
Expand Down
13 changes: 12 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ARG CMAKE_VERSION=3.25.2
ARG OPENJDK_MAJOR_VERSION=17
ARG OPENJDK_FULL_VERSION=17.0.8
ARG OPENJDK_VERSION_SUFFIX=7
ARG GO_VERSION=1.24.3
ARG GO_VERSION=1.25.0

# Manually prepare a recent enough version of CMake.
# This should be used on platforms where the default package manager
Expand Down Expand Up @@ -176,6 +176,7 @@ COPY --from=centos8-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agen
COPY --from=centos8-build /google-cloud-ops-agent*.rpm /
COPY --from=centos8-build /google-cloud-ops-agent-plugin*.tar.gz /


Comment thread
rafaelwestphal marked this conversation as resolved.
Outdated
# ======================================
# Build Ops Agent for rockylinux-9
# ======================================
Expand Down Expand Up @@ -281,6 +282,7 @@ COPY --from=rockylinux9-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-
COPY --from=rockylinux9-build /google-cloud-ops-agent*.rpm /
COPY --from=rockylinux9-build /google-cloud-ops-agent-plugin*.tar.gz /


# ======================================
# Build Ops Agent for rockylinux-10
# ======================================
Expand Down Expand Up @@ -388,6 +390,7 @@ COPY --from=rockylinux10-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops
COPY --from=rockylinux10-build /google-cloud-ops-agent*.rpm /
COPY --from=rockylinux10-build /google-cloud-ops-agent-plugin*.tar.gz /


# ======================================
# Build Ops Agent for debian-bookworm
# ======================================
Expand Down Expand Up @@ -488,6 +491,7 @@ COPY --from=bookworm-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-age
COPY --from=bookworm-build /google-cloud-ops-agent*.deb /
COPY --from=bookworm-build /google-cloud-ops-agent-plugin*.tar.gz /


# ======================================
# Build Ops Agent for debian-bullseye
# ======================================
Expand Down Expand Up @@ -591,6 +595,7 @@ COPY --from=bullseye-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-age
COPY --from=bullseye-build /google-cloud-ops-agent*.deb /
COPY --from=bullseye-build /google-cloud-ops-agent-plugin*.tar.gz /


# ======================================
# Build Ops Agent for debian-trixie
# ======================================
Expand Down Expand Up @@ -693,6 +698,7 @@ COPY --from=trixie-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent
COPY --from=trixie-build /google-cloud-ops-agent*.deb /
COPY --from=trixie-build /google-cloud-ops-agent-plugin*.tar.gz /


# ======================================
# Build Ops Agent for sles-12
# ======================================
Expand Down Expand Up @@ -816,6 +822,7 @@ COPY --from=sles12-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent
COPY --from=sles12-build /google-cloud-ops-agent*.rpm /
COPY --from=sles12-build /google-cloud-ops-agent-plugin*.tar.gz /


# ======================================
# Build Ops Agent for sles-15
# ======================================
Expand Down Expand Up @@ -921,6 +928,7 @@ COPY --from=sles15-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent
COPY --from=sles15-build /google-cloud-ops-agent*.rpm /
COPY --from=sles15-build /google-cloud-ops-agent-plugin*.tar.gz /


# ======================================
# Build Ops Agent for ubuntu-jammy
# ======================================
Expand Down Expand Up @@ -1021,6 +1029,7 @@ COPY --from=jammy-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent-
COPY --from=jammy-build /google-cloud-ops-agent*.deb /
COPY --from=jammy-build /google-cloud-ops-agent-plugin*.tar.gz /


# ======================================
# Build Ops Agent for ubuntu-noble
# ======================================
Expand Down Expand Up @@ -1121,6 +1130,7 @@ COPY --from=noble-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-agent-
COPY --from=noble-build /google-cloud-ops-agent*.deb /
COPY --from=noble-build /google-cloud-ops-agent-plugin*.tar.gz /


# ======================================
# Build Ops Agent for ubuntu-questing
# ======================================
Expand Down Expand Up @@ -1221,6 +1231,7 @@ COPY --from=questing-build /tmp/google-cloud-ops-agent.tgz /google-cloud-ops-age
COPY --from=questing-build /google-cloud-ops-agent*.deb /
COPY --from=questing-build /google-cloud-ops-agent-plugin*.tar.gz /


FROM scratch
COPY --from=centos8 /* /
COPY --from=rockylinux9 /* /
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.windows
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,10 @@ RUN Copy-Item -Path C:\Windows\System32\msvcp140.dll -Destination /work/out/bin/
#
# Install Golang
#
ADD https://go.dev/dl/go1.24.11.windows-amd64.msi /local/go1.24.11.windows-amd64.msi
ADD https://go.dev/dl/go1.25.0.windows-amd64.msi /local/go1.25.0.windows-amd64.msi

RUN Start-Process msiexec.exe `
-ArgumentList '/i C:\local\go1.24.11.windows-amd64.msi ', '/quiet ', `
-ArgumentList '/i C:\local\go1.25.0.windows-amd64.msi ', '/quiet ', `
'/norestart ', 'ALLUSERS=1,INSTALLDIR=C:\Go' -NoNewWindow -Wait;

#
Expand Down
11 changes: 5 additions & 6 deletions confgenerator/agentmetrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,11 @@ func (r AgentSelfMetrics) OtelPipelineProcessors(ctx context.Context) []otel.Com
expOtlpExporter := experimentsFromContext(ctx)["otlp_exporter"]
var extraTransforms []map[string]interface{}
if expOtlpExporter {
durationMetric = "rpc.client.duration"
durationMetric = "rpc.client.call.duration"
filteredMetrics = []string{
"otelcol_exporter_sent_metric_points",
"otelcol_exporter_send_failed_metric_points",
"rpc.client.duration_count",
"rpc.client.call.duration_count",
}
extraTransforms = []map[string]interface{}{
otel.UpdateMetric("otelcol_exporter_sent_metric_points",
Expand All @@ -197,15 +197,14 @@ func (r AgentSelfMetrics) OtelPipelineProcessors(ctx context.Context) []otel.Com
// b/468059325: Factor in partial success after upstream bug is fixed.
pointCountMetric = otel.CombineMetrics("otelcol_exporter_sent_metric_points|otelcol_exporter_send_failed_metric_points", "agent/monitoring/point_count",
otel.AggregateLabels("sum", "status"))
apiRequestCount = otel.RenameMetric("rpc.client.duration_count", "agent/api_request_count",
otel.RenameLabelValues("rpc.grpc.status_code", grpcToStringStatus),
otel.RenameLabel("rpc.grpc.status_code", "state"),
apiRequestCount = otel.RenameMetric("rpc.client.call.duration_count", "agent/api_request_count",
otel.RenameLabel("rpc.response.status_code", "state"),
// delete all other labels, retaining only state
otel.AggregateLabels("sum", "state"))

metricFilter = otel.MetricsOTTLFilter([]string{}, []string{
// Filter out histogram datapoints where the rpc.service is not related to monitoring.
`metric.name == "rpc.client.duration_count" and (not IsMatch(datapoint.attributes["rpc.service"], "opentelemetry.proto.collector.metrics.v1.MetricsService"))`,
`metric.name == "rpc.client.call.duration_count" and (not IsMatch(datapoint.attributes["rpc.method"], "opentelemetry.proto.collector.metrics.v1.MetricsService/Export"))`,
})
}

Expand Down
47 changes: 5 additions & 42 deletions ...ator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux-gpu/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ processors:
filter/otel_1:
metrics:
datapoint:
- metric.name == "rpc.client.duration_count" and (not IsMatch(datapoint.attributes["rpc.service"], "opentelemetry.proto.collector.metrics.v1.MetricsService"))
- metric.name == "rpc.client.call.duration_count" and (not IsMatch(datapoint.attributes["rpc.method"], "opentelemetry.proto.collector.metrics.v1.MetricsService/Export"))
filter/otel_2:
metrics:
include:
Expand All @@ -96,7 +96,7 @@ processors:
- otelcol_process_memory_rss
- otelcol_exporter_sent_metric_points
- otelcol_exporter_send_failed_metric_points
- rpc.client.duration_count
- rpc.client.call.duration_count
groupbyattrs/otlp_2:
keys:
- namespace
Expand Down Expand Up @@ -582,48 +582,11 @@ processors:
aggregation_type: sum
label_set: []
- action: update
include: rpc.client.duration_count
include: rpc.client.call.duration_count
new_name: agent/api_request_count
operations:
- action: update_label
label: rpc.grpc.status_code
value_actions:
- new_value: OK
value: "0"
- new_value: CANCELLED
value: "1"
- new_value: ABORTED
value: "10"
- new_value: OUT_OF_RANGE
value: "11"
- new_value: UNIMPLEMENTED
value: "12"
- new_value: INTERNAL
value: "13"
- new_value: UNAVAILABLE
value: "14"
- new_value: DATA_LOSS
value: "15"
- new_value: UNAUTHENTICATED
value: "16"
- new_value: UNKNOWN
value: "2"
- new_value: INVALID_ARGUMENT
value: "3"
- new_value: DEADLINE_EXCEEDED
value: "4"
- new_value: NOT_FOUND
value: "5"
- new_value: ALREADY_EXISTS
value: "6"
- new_value: PERMISSION_DENIED
value: "7"
- new_value: RESOURCE_EXHAUSTED
value: "8"
- new_value: FAILED_PRECONDITION
value: "9"
- action: update_label
label: rpc.grpc.status_code
label: rpc.response.status_code
new_label: state
- action: aggregate_labels
aggregation_type: sum
Expand Down Expand Up @@ -803,7 +766,7 @@ processors:
metric_statements:
- context: metric
statements:
- extract_count_metric(true) where name == "rpc.client.duration"
- extract_count_metric(true) where name == "rpc.client.call.duration"
transform/otlp_0:
error_mode: ignore
log_statements:
Expand Down
47 changes: 5 additions & 42 deletions ...enerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ processors:
filter/otel_1:
metrics:
datapoint:
- metric.name == "rpc.client.duration_count" and (not IsMatch(datapoint.attributes["rpc.service"], "opentelemetry.proto.collector.metrics.v1.MetricsService"))
- metric.name == "rpc.client.call.duration_count" and (not IsMatch(datapoint.attributes["rpc.method"], "opentelemetry.proto.collector.metrics.v1.MetricsService/Export"))
filter/otel_2:
metrics:
include:
Expand All @@ -91,7 +91,7 @@ processors:
- otelcol_process_memory_rss
- otelcol_exporter_sent_metric_points
- otelcol_exporter_send_failed_metric_points
- rpc.client.duration_count
- rpc.client.call.duration_count
groupbyattrs/otlp_2:
keys:
- namespace
Expand Down Expand Up @@ -553,48 +553,11 @@ processors:
aggregation_type: sum
label_set: []
- action: update
include: rpc.client.duration_count
include: rpc.client.call.duration_count
new_name: agent/api_request_count
operations:
- action: update_label
label: rpc.grpc.status_code
value_actions:
- new_value: OK
value: "0"
- new_value: CANCELLED
value: "1"
- new_value: ABORTED
value: "10"
- new_value: OUT_OF_RANGE
value: "11"
- new_value: UNIMPLEMENTED
value: "12"
- new_value: INTERNAL
value: "13"
- new_value: UNAVAILABLE
value: "14"
- new_value: DATA_LOSS
value: "15"
- new_value: UNAUTHENTICATED
value: "16"
- new_value: UNKNOWN
value: "2"
- new_value: INVALID_ARGUMENT
value: "3"
- new_value: DEADLINE_EXCEEDED
value: "4"
- new_value: NOT_FOUND
value: "5"
- new_value: ALREADY_EXISTS
value: "6"
- new_value: PERMISSION_DENIED
value: "7"
- new_value: RESOURCE_EXHAUSTED
value: "8"
- new_value: FAILED_PRECONDITION
value: "9"
- action: update_label
label: rpc.grpc.status_code
label: rpc.response.status_code
new_label: state
- action: aggregate_labels
aggregation_type: sum
Expand Down Expand Up @@ -759,7 +722,7 @@ processors:
metric_statements:
- context: metric
statements:
- extract_count_metric(true) where name == "rpc.client.duration"
- extract_count_metric(true) where name == "rpc.client.call.duration"
transform/otlp_0:
error_mode: ignore
log_statements:
Expand Down
47 changes: 5 additions & 42 deletions ...r/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/windows-2012/otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ processors:
filter/otel_1:
metrics:
datapoint:
- metric.name == "rpc.client.duration_count" and (not IsMatch(datapoint.attributes["rpc.service"], "opentelemetry.proto.collector.metrics.v1.MetricsService"))
- metric.name == "rpc.client.call.duration_count" and (not IsMatch(datapoint.attributes["rpc.method"], "opentelemetry.proto.collector.metrics.v1.MetricsService/Export"))
filter/otel_2:
metrics:
include:
Expand All @@ -106,7 +106,7 @@ processors:
- otelcol_process_memory_rss
- otelcol_exporter_sent_metric_points
- otelcol_exporter_send_failed_metric_points
- rpc.client.duration_count
- rpc.client.call.duration_count
groupbyattrs/otlp_2:
keys:
- namespace
Expand Down Expand Up @@ -618,48 +618,11 @@ processors:
aggregation_type: sum
label_set: []
- action: update
include: rpc.client.duration_count
include: rpc.client.call.duration_count
new_name: agent/api_request_count
operations:
- action: update_label
label: rpc.grpc.status_code
value_actions:
- new_value: OK
value: "0"
- new_value: CANCELLED
value: "1"
- new_value: ABORTED
value: "10"
- new_value: OUT_OF_RANGE
value: "11"
- new_value: UNIMPLEMENTED
value: "12"
- new_value: INTERNAL
value: "13"
- new_value: UNAVAILABLE
value: "14"
- new_value: DATA_LOSS
value: "15"
- new_value: UNAUTHENTICATED
value: "16"
- new_value: UNKNOWN
value: "2"
- new_value: INVALID_ARGUMENT
value: "3"
- new_value: DEADLINE_EXCEEDED
value: "4"
- new_value: NOT_FOUND
value: "5"
- new_value: ALREADY_EXISTS
value: "6"
- new_value: PERMISSION_DENIED
value: "7"
- new_value: RESOURCE_EXHAUSTED
value: "8"
- new_value: FAILED_PRECONDITION
value: "9"
- action: update_label
label: rpc.grpc.status_code
label: rpc.response.status_code
new_label: state
- action: aggregate_labels
aggregation_type: sum
Expand Down Expand Up @@ -867,7 +830,7 @@ processors:
metric_statements:
- context: metric
statements:
- extract_count_metric(true) where name == "rpc.client.duration"
- extract_count_metric(true) where name == "rpc.client.call.duration"
transform/otlp_0:
error_mode: ignore
log_statements:
Expand Down
Loading
Loading