Skip to content

Commit a2c533d

Browse files
upgrade to latest dependencies (#410)
bumping knative.dev/eventing-kafka-broker de6a2fa...bd08c0c: > bd08c0c fix: raise memory limits for strimzi operator (# 4549) bumping knative.dev/pkg 72b164e...a624c75: > a624c75 create a knative semconv package to simplify otel dep bumps (# 3269) Signed-off-by: Knative Automation <[email protected]>
1 parent 503481b commit a2c533d

File tree

6 files changed

+116
-10
lines changed

6 files changed

+116
-10
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ require (
1313
k8s.io/apimachinery v0.33.5
1414
k8s.io/client-go v0.33.5
1515
knative.dev/client/pkg v0.0.0-20251007022612-79bd2e100065
16-
knative.dev/eventing-kafka-broker v0.46.1-0.20250930122203-de6a2fa1a297
16+
knative.dev/eventing-kafka-broker v0.46.1-0.20251007150512-bd08c0cfffeb
1717
knative.dev/hack v0.0.0-20250902153942-1499de21e119
18-
knative.dev/pkg v0.0.0-20251007132912-72b164e68f86
18+
knative.dev/pkg v0.0.0-20251007184713-a624c759bede
1919
)
2020

2121
require (

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -751,14 +751,14 @@ knative.dev/client/pkg v0.0.0-20251007022612-79bd2e100065 h1:myUyFpRzAVaME1LKz47
751751
knative.dev/client/pkg v0.0.0-20251007022612-79bd2e100065/go.mod h1:U6Kx0zEHzOCfS/khJeP2H1MYUX/OWPKGVrOITGeeS/E=
752752
knative.dev/eventing v0.46.1-0.20251002211605-5828b491e837 h1:YPS9wXY/roM6DZBp75rLqKZ9hDcsgijlj/hjIESpQZw=
753753
knative.dev/eventing v0.46.1-0.20251002211605-5828b491e837/go.mod h1:HRusNPXiJsv2USQLE9i0gPm/cnUZo0jVTlkVdBTcfC8=
754-
knative.dev/eventing-kafka-broker v0.46.1-0.20250930122203-de6a2fa1a297 h1:YvwD1rOh2t4U7ZJsvi85eYBn6ntIRVg0Kt3RdkWuKsY=
755-
knative.dev/eventing-kafka-broker v0.46.1-0.20250930122203-de6a2fa1a297/go.mod h1:B/JHSrzVgnZ2wAmY+YXJXepUXC7KwHL2wfS++GLrWbw=
754+
knative.dev/eventing-kafka-broker v0.46.1-0.20251007150512-bd08c0cfffeb h1:WZsZXVHO3mKw5uAap1Ua7K4XTBfqwMtjK08p92qvM18=
755+
knative.dev/eventing-kafka-broker v0.46.1-0.20251007150512-bd08c0cfffeb/go.mod h1:B/JHSrzVgnZ2wAmY+YXJXepUXC7KwHL2wfS++GLrWbw=
756756
knative.dev/hack v0.0.0-20250902153942-1499de21e119 h1:NbQvjnFK1tL489LN0qAybWy0E17Jpziwcv/XIHwfp6M=
757757
knative.dev/hack v0.0.0-20250902153942-1499de21e119/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
758758
knative.dev/networking v0.0.0-20250916015400-8cc248b445a0 h1:OG6rRbmXMDh369o/puixTc8dv9YihZr964S9rt6EURo=
759759
knative.dev/networking v0.0.0-20250916015400-8cc248b445a0/go.mod h1:+8oRX8GjCm7AQLycKScw9dwxy/kKnG7ESQPAqRirGeI=
760-
knative.dev/pkg v0.0.0-20251007132912-72b164e68f86 h1:ez6Q3QIqKs9r4fKkEGlwsOAqxvhP9OlEAyy5ObMpePM=
761-
knative.dev/pkg v0.0.0-20251007132912-72b164e68f86/go.mod h1:pNETfvzYq5MmPTi+XGGIjjgvQSYvu4pxxLF1muKunhs=
760+
knative.dev/pkg v0.0.0-20251007184713-a624c759bede h1:ADQEXMQlfbjBjicJdou8R5WjPHm0/5FyyV58RQ9eYPU=
761+
knative.dev/pkg v0.0.0-20251007184713-a624c759bede/go.mod h1:pNETfvzYq5MmPTi+XGGIjjgvQSYvu4pxxLF1muKunhs=
762762
knative.dev/serving v0.46.1-0.20251007000510-4ce8c6e900ec h1:Z6oGWwlgo08tCZxEHtdBYO+PmkqDaoIJiTw1KbA7Yzc=
763763
knative.dev/serving v0.46.1-0.20251007000510-4ce8c6e900ec/go.mod h1:lQk+jslR4hAA6dtUBQpRWrOX0EfkdUduR3/hZmMWNdA=
764764
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

vendor/knative.dev/pkg/observability/metrics/k8s/tools.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ import (
2323
"strings"
2424
"time"
2525

26+
"knative.dev/pkg/observability/semconv"
27+
"knative.dev/pkg/observability/semconv/httpconv"
28+
2629
"go.opentelemetry.io/otel"
2730
"go.opentelemetry.io/otel/attribute"
2831
"go.opentelemetry.io/otel/metric"
29-
semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
30-
"go.opentelemetry.io/otel/semconv/v1.37.0/httpconv"
3132
"k8s.io/client-go/tools/metrics"
3233
)
3334

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/*
2+
Copyright 2022 The Knative Authors
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package httpconv
18+
19+
import (
20+
"go.opentelemetry.io/otel/metric"
21+
"go.opentelemetry.io/otel/semconv/v1.37.0/httpconv"
22+
)
23+
24+
type (
25+
ClientRequestDuration = httpconv.ClientRequestDuration
26+
RequestMethodAttr = httpconv.RequestMethodAttr
27+
)
28+
29+
func NewClientRequestDuration(
30+
m metric.Meter,
31+
opt ...metric.Float64HistogramOption,
32+
) (httpconv.ClientRequestDuration, error) {
33+
return httpconv.NewClientRequestDuration(m, opt...)
34+
}
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
/*
2+
Copyright 2022 The Knative Authors
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package semconv
18+
19+
import (
20+
"go.opentelemetry.io/otel/attribute"
21+
semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
22+
)
23+
24+
const (
25+
SchemaURL = semconv.SchemaURL
26+
27+
ServiceNameKey = semconv.ServiceNameKey
28+
29+
ServerAddressKey = semconv.ServerAddressKey
30+
ServerPortKey = semconv.ServerPortKey
31+
32+
HTTPRequestMethodKey = semconv.HTTPRequestMethodKey
33+
HTTPResponseStatusCodeKey = semconv.HTTPResponseStatusCodeKey
34+
35+
URLSchemeKey = semconv.URLSchemeKey
36+
URLTemplateKey = semconv.URLTemplateKey
37+
38+
K8SNamespaceNameKey = semconv.K8SNamespaceNameKey
39+
K8SPodNameKey = semconv.K8SPodNameKey
40+
K8SContainerNameKey = semconv.K8SContainerNameKey
41+
)
42+
43+
func K8SContainerName(val string) attribute.KeyValue {
44+
return semconv.ContainerName(val)
45+
}
46+
47+
func K8SPodName(val string) attribute.KeyValue {
48+
return semconv.K8SPodName(val)
49+
}
50+
51+
func K8SNamespaceName(val string) attribute.KeyValue {
52+
return semconv.K8SNamespaceName(val)
53+
}
54+
55+
func ServiceVersion(val string) attribute.KeyValue {
56+
return semconv.ServiceVersion(val)
57+
}
58+
59+
func ServiceName(val string) attribute.KeyValue {
60+
return semconv.ServiceName(val)
61+
}
62+
63+
func ServiceInstanceID(val string) attribute.KeyValue {
64+
return semconv.ServiceInstanceID(val)
65+
}
66+
67+
func HTTPResponseStatusCode(val int) attribute.KeyValue {
68+
return semconv.HTTPResponseStatusCode(val)
69+
}

vendor/modules.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1
916916
knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake
917917
knative.dev/eventing/pkg/crossnamespace
918918
knative.dev/eventing/pkg/eventingtls
919-
# knative.dev/eventing-kafka-broker v0.46.1-0.20250930122203-de6a2fa1a297
919+
# knative.dev/eventing-kafka-broker v0.46.1-0.20251007150512-bd08c0cfffeb
920920
## explicit; go 1.24.0
921921
knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings
922922
knative.dev/eventing-kafka-broker/control-plane/pkg/apis/bindings/v1
@@ -950,7 +950,7 @@ knative.dev/networking/pkg/http/proxy
950950
knative.dev/networking/pkg/http/stats
951951
knative.dev/networking/pkg/ingress
952952
knative.dev/networking/pkg/k8s
953-
# knative.dev/pkg v0.0.0-20251007132912-72b164e68f86
953+
# knative.dev/pkg v0.0.0-20251007184713-a624c759bede
954954
## explicit; go 1.24.0
955955
knative.dev/pkg/apis
956956
knative.dev/pkg/apis/duck
@@ -981,6 +981,8 @@ knative.dev/pkg/network
981981
knative.dev/pkg/observability/attributekey
982982
knative.dev/pkg/observability/metrics/k8s
983983
knative.dev/pkg/observability/runtime
984+
knative.dev/pkg/observability/semconv
985+
knative.dev/pkg/observability/semconv/httpconv
984986
knative.dev/pkg/ptr
985987
knative.dev/pkg/reconciler
986988
knative.dev/pkg/resolver

0 commit comments

Comments
 (0)