Skip to content

Commit 8009f76

Browse files
tiffanny29631tiffanny29631
committed
temp: first big change
Using otlp Configured deployment for new ports and component Refactor metric composing and recording tryout: initialize fight and error counter metrics upon start tryout: use asyncint64 for error and fight metric fix: metirc name in test prometheus metrics fix: metric name in otelcollectortest fix: update tsetyaml deployment pipeline config
1 parent b1659c7 commit 8009f76

File tree

233 files changed

+26470
-10610
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

233 files changed

+26470
-10610
lines changed

‎cmd/hydration-controller/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,13 @@ func main() {
8585
}
8686

8787
// Register the OC Agent exporter
88-
oce, err := kmetrics.RegisterOCAgentExporter(reconcilermanager.HydrationController)
88+
oce, err := kmetrics.RegisterOTelExporter(reconcilermanager.HydrationController)
8989
if err != nil {
9090
klog.Fatalf("Failed to register the OC Agent exporter: %v", err)
9191
}
9292

9393
defer func() {
94-
if err := oce.Stop(); err != nil {
94+
if err := oce.Shutdown(context.Background()); err != nil {
9595
klog.Fatalf("Unable to stop the OC Agent exporter: %v", err)
9696
}
9797
}()

‎cmd/reconciler-manager/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,14 +188,14 @@ func main() {
188188
}
189189

190190
// Register the OC Agent exporter
191-
oce, err := metrics.RegisterOCAgentExporter(reconcilermanager.ManagerName)
191+
oce, err := metrics.RegisterOTelExporter(reconcilermanager.ManagerName)
192192
if err != nil {
193193
setupLog.Error(err, "failed to register the OC Agent exporter")
194194
os.Exit(1)
195195
}
196196

197197
defer func() {
198-
if err := oce.Stop(); err != nil {
198+
if err := oce.Shutdown(context.Background()); err != nil {
199199
setupLog.Error(err, "failed to stop the OC Agent exporter")
200200
}
201201
}()
@@ -206,7 +206,7 @@ func main() {
206206
if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
207207
setupLog.Error(err, "problem running manager")
208208
// os.Exit(1) does not run deferred functions so explicitly stopping the OC Agent exporter.
209-
if err := oce.Stop(); err != nil {
209+
if err := oce.Shutdown(context.Background()); err != nil {
210210
setupLog.Error(err, "failed to stop the OC Agent exporter")
211211
}
212212
os.Exit(1)

‎cmd/reconciler/main.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package main
1616

1717
import (
18+
"context"
1819
"flag"
1920
"fmt"
2021
"os"
@@ -146,13 +147,13 @@ func main() {
146147
}
147148

148149
// Register the OC Agent exporter
149-
oce, err := ocmetrics.RegisterOCAgentExporter(reconcilermanager.Reconciler)
150+
oce, err := ocmetrics.RegisterOTelExporter(reconcilermanager.Reconciler)
150151
if err != nil {
151152
klog.Fatalf("Failed to register the OC Agent exporter: %v", err)
152153
}
153154

154155
defer func() {
155-
if err := oce.Stop(); err != nil {
156+
if err := oce.Shutdown(context.Background()); err != nil {
156157
klog.Fatalf("Unable to stop the OC Agent exporter: %v", err)
157158
}
158159
}()

‎e2e/nomostest/prometheus_metrics.go‎

Lines changed: 47 additions & 47 deletions
Large diffs are not rendered by default.

‎e2e/testcases/otel_collector_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ func TestOtelCollectorGCMLabelAggregation(t *testing.T) {
308308
nt.T.Fatal(err)
309309
}
310310
// retry for 2 minutes until metric is accessible from GCM
311-
nt.Must(validateMetricTypes(ctx, nt, client, startTime, metricsWithCommitLabel, metricDoesNotHaveLabel(metrics.KeyCommit.Name())))
311+
nt.Must(validateMetricTypes(ctx, nt, client, startTime, metricsWithCommitLabel, metricDoesNotHaveLabel(string(metrics.KeyCommit))))
312312
}
313313

314314
func setupMetricsServiceAccount(nt *nomostest.NT) {

‎e2e/testdata/otel-collector/otel-cm-full-gcm.yaml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@ apiVersion: v1
1616
data:
1717
otel-collector-config.yaml: |-
1818
receivers:
19-
opencensus:
20-
endpoint: 0.0.0.0:55678
19+
otlp:
20+
protocols:
21+
grpc:
22+
endpoint: 0.0.0.0:4317
23+
http:
24+
endpoint: 0.0.0.0:4318
2125
exporters:
2226
prometheus:
2327
endpoint: 0.0.0.0:8675
@@ -309,15 +313,15 @@ data:
309313
extensions: [health_check]
310314
pipelines:
311315
metrics/cloudmonitoring:
312-
receivers: [opencensus]
316+
receivers: [otlp]
313317
processors: [batch, filter/cloudmonitoring, metricstransform/cloudmonitoring, resourcedetection]
314318
exporters: [googlecloud]
315319
metrics/prometheus:
316-
receivers: [opencensus]
320+
receivers: [otlp]
317321
processors: [batch]
318322
exporters: [prometheus]
319323
metrics/kubernetes:
320-
receivers: [opencensus]
324+
receivers: [otlp]
321325
processors: [batch, filter/kubernetes, metricstransform/kubernetes, resourcedetection]
322326
exporters: [googlecloud/kubernetes]
323327
kind: ConfigMap

‎e2e/testdata/otel-collector/otel-cm-kustomize-rejected-labels.yaml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@ apiVersion: v1
2020
data:
2121
otel-collector-config.yaml: |-
2222
receivers:
23-
opencensus:
24-
endpoint: 0.0.0.0:55678
23+
otlp:
24+
protocols:
25+
grpc:
26+
endpoint: 0.0.0.0:4317
27+
http:
28+
endpoint: 0.0.0.0:4318
2529
exporters:
2630
prometheus:
2731
endpoint: 0.0.0.0:8675
@@ -264,15 +268,15 @@ data:
264268
extensions: [health_check]
265269
pipelines:
266270
metrics/cloudmonitoring:
267-
receivers: [opencensus]
271+
receivers: [otlp]
268272
processors: [batch, filter/cloudmonitoring, metricstransform/cloudmonitoring, resourcedetection]
269273
exporters: [googlecloud]
270274
metrics/prometheus:
271-
receivers: [opencensus]
275+
receivers: [otlp]
272276
processors: [batch]
273277
exporters: [prometheus]
274278
metrics/kubernetes:
275-
receivers: [opencensus]
279+
receivers: [otlp]
276280
processors: [batch, filter/kubernetes, metricstransform/kubernetes, resourcedetection]
277281
exporters: [googlecloud/kubernetes]
278282
kind: ConfigMap

‎e2e/testdata/otel-collector/otel-cm-monarch-rejected-labels.yaml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@ apiVersion: v1
2020
data:
2121
otel-collector-config.yaml: |-
2222
receivers:
23-
opencensus:
24-
endpoint: 0.0.0.0:55678
23+
otlp:
24+
protocols:
25+
grpc:
26+
endpoint: 0.0.0.0:4317
27+
http:
28+
endpoint: 0.0.0.0:4318
2529
exporters:
2630
prometheus:
2731
endpoint: 0.0.0.0:8675
@@ -173,15 +177,15 @@ data:
173177
extensions: [health_check]
174178
pipelines:
175179
metrics/cloudmonitoring:
176-
receivers: [opencensus]
180+
receivers: [otlp]
177181
processors: [batch, filter/cloudmonitoring, resourcedetection]
178182
exporters: [googlecloud]
179183
metrics/prometheus:
180-
receivers: [opencensus]
184+
receivers: [otlp]
181185
processors: [batch]
182186
exporters: [prometheus]
183187
metrics/kubernetes:
184-
receivers: [opencensus]
188+
receivers: [otlp]
185189
processors: [batch, filter/kubernetes, metricstransform/kubernetes, resourcedetection]
186190
exporters: [googlecloud/kubernetes]
187191
kind: ConfigMap

‎go.mod‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ require (
88
cloud.google.com/go/logging v1.13.0
99
cloud.google.com/go/monitoring v1.24.2
1010
cloud.google.com/go/trace v1.11.6
11-
contrib.go.opencensus.io/exporter/ocagent v0.7.0
1211
github.com/GoogleContainerTools/kpt-functions-catalog/functions/go/set-namespace v0.4.1-0.20220713210718-d955e7d3a800
1312
github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20220706221933-7181f451a663
1413
github.com/Masterminds/semver v1.5.0
@@ -34,6 +33,11 @@ require (
3433
github.com/spyzhov/ajson v0.9.6
3534
github.com/stretchr/testify v1.11.1
3635
go.opencensus.io v0.24.0
36+
go.opentelemetry.io/otel v1.38.0
37+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0
38+
go.opentelemetry.io/otel/metric v1.38.0
39+
go.opentelemetry.io/otel/sdk v1.38.0
40+
go.opentelemetry.io/otel/sdk/metric v1.38.0
3741
go.uber.org/multierr v1.11.0
3842
go.uber.org/zap v1.27.0
3943
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
@@ -76,7 +80,7 @@ require (
7680
github.com/beorn7/perks v1.0.1 // indirect
7781
github.com/blang/semver/v4 v4.0.0 // indirect
7882
github.com/bmatcuk/doublestar/v4 v4.0.2 // indirect
79-
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
83+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
8084
github.com/cespare/xxhash/v2 v2.3.0 // indirect
8185
github.com/chai2010/gettext-go v1.0.2 // indirect
8286
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
@@ -108,7 +112,7 @@ require (
108112
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
109113
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
110114
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
111-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
115+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
112116
github.com/inconshreveable/mousetrap v1.1.0 // indirect
113117
github.com/jonboulle/clockwork v0.5.0 // indirect
114118
github.com/josharian/intern v1.0.0 // indirect
@@ -148,9 +152,8 @@ require (
148152
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
149153
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
150154
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
151-
go.opentelemetry.io/otel v1.37.0 // indirect
152-
go.opentelemetry.io/otel/metric v1.37.0 // indirect
153-
go.opentelemetry.io/otel/trace v1.37.0 // indirect
155+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
156+
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
154157
go.uber.org/atomic v1.11.0 // indirect
155158
go.yaml.in/yaml/v2 v2.4.2 // indirect
156159
go.yaml.in/yaml/v3 v3.0.4 // indirect
@@ -166,8 +169,8 @@ require (
166169
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
167170
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
168171
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
169-
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
170-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect
172+
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
173+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
171174
google.golang.org/grpc v1.75.0 // indirect
172175
google.golang.org/protobuf v1.36.8 // indirect
173176
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect

0 commit comments

Comments
 (0)