Skip to content

Commit e01076c

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1912 from mboersma/bump-otel
Update opentelemetry-go to v1.2.0
2 parents a20197f + f2ff27e commit e01076c

16 files changed

Lines changed: 208 additions & 67 deletions

File tree

‎go.mod‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ require (
2525
github.com/prometheus/client_golang v1.11.0
2626
github.com/spf13/pflag v1.0.5
2727
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0
28-
go.opentelemetry.io/otel v1.1.0
29-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.1.0
30-
go.opentelemetry.io/otel/exporters/prometheus v0.24.0
31-
go.opentelemetry.io/otel/metric v0.24.0
32-
go.opentelemetry.io/otel/sdk v1.1.0
33-
go.opentelemetry.io/otel/sdk/export/metric v0.24.0
34-
go.opentelemetry.io/otel/sdk/metric v0.24.0
35-
go.opentelemetry.io/otel/trace v1.1.0
28+
go.opentelemetry.io/otel v1.2.0
29+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.2.0
30+
go.opentelemetry.io/otel/exporters/prometheus v0.25.0
31+
go.opentelemetry.io/otel/metric v0.25.0
32+
go.opentelemetry.io/otel/sdk v1.2.0
33+
go.opentelemetry.io/otel/sdk/export/metric v0.25.0
34+
go.opentelemetry.io/otel/sdk/metric v0.25.0
35+
go.opentelemetry.io/otel/trace v1.2.0
3636
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
3737
golang.org/x/mod v0.5.1
3838
k8s.io/api v0.22.2

‎go.sum‎

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,9 @@ github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl
153153
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
154154
github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
155155
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
156-
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
157156
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
157+
github.com/benbjohnson/clock v1.2.0 h1:9Re3G2TWxkE06LdMWMpcY6KV81GLXMGiYpPYUPkFAws=
158+
github.com/benbjohnson/clock v1.2.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
158159
github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
159160
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
160161
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
@@ -196,8 +197,11 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
196197
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
197198
github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
198199
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
200+
github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
199201
github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
200202
github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
203+
github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
204+
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
201205
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
202206
github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo=
203207
github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA=
@@ -991,39 +995,40 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0 h1:FIbb8m2
991995
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.25.0/go.mod h1:NyB05cd+yPX6W5SiRNuJ90w7PV2+g2cgRbsPL7MvpME=
992996
go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo=
993997
go.opentelemetry.io/otel v1.0.1/go.mod h1:OPEOD4jIT2SlZPMmwT6FqZz2C0ZNdQqiWcoK6M0SNFU=
994-
go.opentelemetry.io/otel v1.1.0 h1:8p0uMLcyyIx0KHNTgO8o3CW8A1aA+dJZJW6PvnMz0Wc=
995-
go.opentelemetry.io/otel v1.1.0/go.mod h1:7cww0OW51jQ8IaZChIEdqLwgh+44+7uiTdWsAL0wQpA=
998+
go.opentelemetry.io/otel v1.2.0 h1:YOQDvxO1FayUcT9MIhJhgMyNO1WqoduiyvQHzGN0kUQ=
999+
go.opentelemetry.io/otel v1.2.0/go.mod h1:aT17Fk0Z1Nor9e0uisf98LrntPGMnk4frBO9+dkf69I=
9961000
go.opentelemetry.io/otel/exporters/otlp v0.20.0 h1:PTNgq9MRmQqqJY0REVbZFvwkYOA85vbdQU/nVfxDyqg=
9971001
go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM=
998-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.1.0 h1:PxBRMkrJnY4HRgToPzoLrTdQDHQf9MeFg5oGzTqtzco=
999-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.1.0/go.mod h1:/E4iniSqAEvqbq6KM5qThKZR2sd42kDvD+SrYt00vRw=
1000-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.1.0 h1:4UC7muAl2UqSoTV0RqgmpTz/cRLH6R9cHt9BvVcq5Bo=
1001-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.1.0/go.mod h1:Gyc0evUosTBVNRqTFGuu0xqebkEWLkLwv42qggTCwro=
1002-
go.opentelemetry.io/otel/exporters/prometheus v0.24.0 h1:lfVirQkD4jPMh7m6i9sHDHweYZyWA0NDU6NszkbtFSE=
1003-
go.opentelemetry.io/otel/exporters/prometheus v0.24.0/go.mod h1:jfc9W1hVK0w9zrsE+C2ELje/M+K67cGinzeg8qQ8oog=
1004-
go.opentelemetry.io/otel/internal/metric v0.24.0 h1:O5lFy6kAl0LMWBjzy3k//M8VjEaTDWL9DPJuqZmWIAA=
1002+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.2.0 h1:xzbcGykysUh776gzD1LUPsNNHKWN0kQWDnJhn1ddUuk=
1003+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.2.0/go.mod h1:14T5gr+Y6s2AgHPqBMgnGwp04csUjQmYXFWPeiBoq5s=
1004+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.2.0 h1:VsgsSCDwOSuO8eMVh63Cd4nACMqgjpmAeJSIvVNneD0=
1005+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.2.0/go.mod h1:9mLBBnPRf3sf+ASVH2p9xREXVBvwib02FxcKnavtExg=
1006+
go.opentelemetry.io/otel/exporters/prometheus v0.25.0 h1:8f9PiHQ2yqRRWktEJ/u2cIPLD8yUagIuNOaFpSsCefI=
1007+
go.opentelemetry.io/otel/exporters/prometheus v0.25.0/go.mod h1:TmEyKmTplB/cdILsJBqD9/JDK9ssGXWjsrpmMHodFLw=
10051008
go.opentelemetry.io/otel/internal/metric v0.24.0/go.mod h1:PSkQG+KuApZjBpC6ea6082ZrWUUy/w132tJ/LOU3TXk=
1009+
go.opentelemetry.io/otel/internal/metric v0.25.0 h1:w/7RXe16WdPylaIXDgcYM6t/q0K5lXgSdZOEbIEyliE=
1010+
go.opentelemetry.io/otel/internal/metric v0.25.0/go.mod h1:Nhuw26QSX7d6n4duoqAFi5KOQR4AuzyMcl5eXOgwxtc=
10061011
go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU=
1007-
go.opentelemetry.io/otel/metric v0.24.0 h1:Rg4UYHS6JKR1Sw1TxnI13z7q/0p/XAbgIqUTagvLJuU=
10081012
go.opentelemetry.io/otel/metric v0.24.0/go.mod h1:tpMFnCD9t+BEGiWY2bWF5+AwjuAdM0lSowQ4SBA3/K4=
1013+
go.opentelemetry.io/otel/metric v0.25.0 h1:7cXOnCADUsR3+EOqxPaSKwhEuNu0gz/56dRN1hpIdKw=
1014+
go.opentelemetry.io/otel/metric v0.25.0/go.mod h1:E884FSpQfnJOMMUaq+05IWlJ4rjZpk2s/F1Ju+TEEm8=
10091015
go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw=
10101016
go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc=
1011-
go.opentelemetry.io/otel/sdk v1.0.1/go.mod h1:HrdXne+BiwsOHYYkBE5ysIcv2bvdZstxzmCQhxTcZkI=
1012-
go.opentelemetry.io/otel/sdk v1.1.0 h1:j/1PngUJIDOddkCILQYTevrTIbWd494djgGkSsMit+U=
1013-
go.opentelemetry.io/otel/sdk v1.1.0/go.mod h1:3aQvM6uLm6C4wJpHtT8Od3vNzeZ34Pqc6bps8MywWzo=
1017+
go.opentelemetry.io/otel/sdk v1.2.0 h1:wKN260u4DesJYhyjxDa7LRFkuhH7ncEVKU37LWcyNIo=
1018+
go.opentelemetry.io/otel/sdk v1.2.0/go.mod h1:jNN8QtpvbsKhgaC6V5lHiejMoKD+V8uadoSafgHPx1U=
10141019
go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE=
1015-
go.opentelemetry.io/otel/sdk/export/metric v0.24.0 h1:innKi8LQebwPI+WEuEKEWMjhWC5mXQG1/WpSm5mffSY=
1016-
go.opentelemetry.io/otel/sdk/export/metric v0.24.0/go.mod h1:chmxXGVNcpCih5XyniVkL4VUyaEroUbOdvjVlQ8M29Y=
1020+
go.opentelemetry.io/otel/sdk/export/metric v0.25.0 h1:6UjAFmVB5Fza3K5qUJpYWGrk8QMPIqlSnya5FI46VBY=
1021+
go.opentelemetry.io/otel/sdk/export/metric v0.25.0/go.mod h1:Ej7NOa+WpN49EIcr1HMUYRvxXXCCnQCg2+ovdt2z8Pk=
10171022
go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE=
1018-
go.opentelemetry.io/otel/sdk/metric v0.24.0 h1:LLHrZikGdEHoHihwIPvfFRJX+T+NdrU2zgEqf7tQ7Oo=
1019-
go.opentelemetry.io/otel/sdk/metric v0.24.0/go.mod h1:KDgJgYzsIowuIDbPM9sLDZY9JJ6gqIDWCx92iWV8ejk=
1023+
go.opentelemetry.io/otel/sdk/metric v0.25.0 h1:J+Ta+4IAA5W9AdWhGQLfciEpavBqqSkBzTDeYvJLFNU=
1024+
go.opentelemetry.io/otel/sdk/metric v0.25.0/go.mod h1:G4xzj4LvC6xDDSsVXpvRVclQCbofGGg4ZU2VKKtDRfg=
10201025
go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw=
10211026
go.opentelemetry.io/otel/trace v1.0.1/go.mod h1:5g4i4fKLaX2BQpSBsxw8YYcgKpMMSW3x7ZTuYBr3sUk=
1022-
go.opentelemetry.io/otel/trace v1.1.0 h1:N25T9qCL0+7IpOT8RrRy0WYlL7y6U0WiUJzXcVdXY/o=
1023-
go.opentelemetry.io/otel/trace v1.1.0/go.mod h1:i47XtdcBQiktu5IsrPqOHe8w+sBmnLwwHt8wiUsWGTI=
1027+
go.opentelemetry.io/otel/trace v1.2.0 h1:Ys3iqbqZhcf28hHzrm5WAquMkDHNZTUkw7KHbuNjej0=
1028+
go.opentelemetry.io/otel/trace v1.2.0/go.mod h1:N5FLswTubnxKxOJHM7XZC074qpeEdLy3CgAVsdMucK0=
10241029
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
1025-
go.opentelemetry.io/proto/otlp v0.9.0 h1:C0g6TWmQYvjKRnljRULLWUVJGy8Uvu0NEL/5frY2/t4=
1026-
go.opentelemetry.io/proto/otlp v0.9.0/go.mod h1:1vKfU9rv61e9EVGthD1zNvUbiwPcimSsOPU9brfSHJg=
1030+
go.opentelemetry.io/proto/otlp v0.10.0 h1:n7brgtEbDvXEgGyKKo8SobKT1e9FewlDtXzkVP5djoE=
1031+
go.opentelemetry.io/proto/otlp v0.10.0/go.mod h1:zG20xCK0szZ1xdokeSOwEcmlXu+x9kkdRe6N1DhKcfU=
10271032
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 h1:+FNtrFTmVw0YZGpBGX56XDee331t6JAXeK2bcyhLOOc=
10281033
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o=
10291034
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -1506,8 +1511,9 @@ google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQ
15061511
google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
15071512
google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
15081513
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
1509-
google.golang.org/grpc v1.41.0 h1:f+PlOh7QV4iIJkPrx5NQ7qaNGFQ3OTse67yaDHfju4E=
15101514
google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
1515+
google.golang.org/grpc v1.42.0 h1:XT2/MFpuPFsEX2fWh3YQtHkZ+WYZFQRfaUgLZYj/p6A=
1516+
google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
15111517
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
15121518
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
15131519
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=

‎hack/observability/opentelemetry/chart/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
2-
appVersion: 0.22.0
2+
appVersion: 0.37.1
33
description: OpenTelemetry Collector Helm chart for Kubernetes
44
home: https://opentelemetry.io/
55
icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
@@ -13,4 +13,4 @@ sources:
1313
- https://github.com/open-telemetry/opentelemetry-collector
1414
- https://github.com/open-telemetry/opentelemetry-collector-contrib
1515
type: application
16-
version: 0.5.11
16+
version: 0.8.1

‎hack/observability/opentelemetry/chart/templates/_config.tpl‎

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ limit_mib: {{ include "opentelemetry-collector.getMemLimitMib" .Values.resources
1010

1111
# By default spike_limit_mib is set to 25% of ".Values.resources.limits.memory"
1212
spike_limit_mib: {{ include "opentelemetry-collector.getMemSpikeLimitMib" .Values.resources.limits.memory }}
13-
14-
# By default ballast_size_mib is set to 40% of ".Values.resources.limits.memory"
15-
ballast_size_mib: {{ include "opentelemetry-collector.getMemBallastSizeMib" .Values.resources.limits.memory }}
1613
{{- end }}
1714

1815
{{/*
@@ -26,13 +23,26 @@ Merge user supplied top-level (not particular to standalone or agent) config int
2623
{{- .Values.config | toYaml }}
2724
{{- end }}
2825

26+
{{/*
27+
Merge user supplied top-level (not particular to standalone or agent) config into memory ballast config.
28+
*/}}
29+
{{- define "opentelemetry-collector.ballastConfig" -}}
30+
{{- $memoryBallastConfig := get .Values.config.extensions "memory_ballast" }}
31+
{{- if or (not $memoryBallastConfig) (not $memoryBallastConfig.size_mib) }}
32+
{{- $_ := set $memoryBallastConfig "size_mib" (include "opentelemetry-collector.getMemBallastSizeMib" .Values.resources.limits.memory) }}
33+
{{- end }}
34+
{{- .Values.config | toYaml }}
35+
{{- end }}
36+
37+
2938
{{/*
3039
Build config file for agent OpenTelemetry Collector
3140
*/}}
3241
{{- define "opentelemetry-collector.agentCollectorConfig" -}}
3342
{{- $values := deepCopy .Values.agentCollector | mustMergeOverwrite (deepCopy .Values) }}
3443
{{- $data := dict "Values" $values | mustMergeOverwrite (deepCopy .) }}
3544
{{- $config := include "opentelemetry-collector.baseConfig" $data | fromYaml }}
45+
{{- $config := include "opentelemetry-collector.ballastConfig" $data | fromYaml | mustMergeOverwrite $config }}
3646
{{- $config := include "opentelemetry-collector.agent.containerLogsConfig" $data | fromYaml | mustMergeOverwrite $config }}
3747
{{- $config := include "opentelemetry-collector.agentConfigOverride" $data | fromYaml | mustMergeOverwrite $config }}
3848
{{- .Values.agentCollector.configOverride | mustMergeOverwrite $config | toYaml }}
@@ -111,7 +121,8 @@ Default config override for agent collector deamonset
111121
exporters:
112122
otlp:
113123
endpoint: {{ include "opentelemetry-collector.fullname" . }}:4317
114-
insecure: true
124+
tls:
125+
insecure: true
115126
{{- end }}
116127

117128
{{- if .Values.standaloneCollector.enabled }}
@@ -174,11 +185,11 @@ receivers:
174185
# Extract metadata from file path
175186
- type: regex_parser
176187
id: extract_metadata_from_filepath
177-
regex: '^.*\/(?P<namespace>[^_]+)_(?P<pod_name>[^_]+)_(?P<uid>[a-f0-9\-]{36})\/(?P<container_name>[^\._]+)\/(?P<run_id>\d+)\.log$'
178-
parse_from: $$attributes.file_path
188+
regex: '^.*\/(?P<namespace>[^_]+)_(?P<pod_name>[^_]+)_(?P<uid>[a-f0-9\-]+)\/(?P<container_name>[^\._]+)\/(?P<run_id>\d+)\.log$'
189+
parse_from: $$attributes["file.path"]
179190
# Move out attributes to Attributes
180191
- type: metadata
181-
labels:
192+
attributes:
182193
stream: 'EXPR($.stream)'
183194
k8s.container.name: 'EXPR($.container_name)'
184195
k8s.namespace.name: 'EXPR($.namespace)'
@@ -200,3 +211,19 @@ service:
200211
- otlp
201212
{{- end }}
202213
{{- end }}
214+
215+
{{/* Build the list of port for standalone service */}}
216+
{{- define "opentelemetry-collector.standalonePortsConfig" -}}
217+
{{- $ports := deepCopy .Values.ports }}
218+
{{- if .Values.standaloneCollector.ports }}
219+
{{- $ports = deepCopy .Values.standaloneCollector.ports | mustMergeOverwrite (deepCopy .Values.ports) }}
220+
{{- end }}
221+
{{- range $key, $port := $ports }}
222+
{{- if $port.enabled }}
223+
- name: {{ $key }}
224+
port: {{ $port.servicePort }}
225+
targetPort: {{ $key }}
226+
protocol: {{ $port.protocol }}
227+
{{- end }}
228+
{{- end }}
229+
{{- end }}

‎hack/observability/opentelemetry/chart/templates/_helpers.tpl‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,25 @@ Create the name of the service account to use
6161
{{- end }}
6262
{{- end }}
6363

64+
65+
{{/*
66+
Create the name of the clusterRole to use
67+
*/}}
68+
{{- define "opentelemetry-collector.clusterRoleName" -}}
69+
{{- if .Values.clusterRole.create }}
70+
{{- default (include "opentelemetry-collector.fullname" .) .Values.clusterRole.name }}
71+
{{- else }}
72+
{{- default "default" .Values.clusterRole.name }}
73+
{{- end }}
74+
{{- end }}
75+
76+
{{/*
77+
Create the name of the clusterRoleBinding to use
78+
*/}}
79+
{{- define "opentelemetry-collector.clusterRoleBindingName" -}}
80+
{{- if .Values.clusterRole.create }}
81+
{{- default (include "opentelemetry-collector.fullname" .) .Values.clusterRole.clusterRoleBinding.name }}
82+
{{- else }}
83+
{{- default "default" .Values.clusterRole.clusterRoleBinding.name }}
84+
{{- end }}
85+
{{- end }}

‎hack/observability/opentelemetry/chart/templates/_pod.tpl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ containers:
1212
- /{{ .Values.command.name }}
1313
- --config=/conf/relay.yaml
1414
- --metrics-addr=0.0.0.0:8888
15-
- --mem-ballast-size-mib={{ template "opentelemetry-collector.getMemBallastSizeMib" .Values.resources.limits.memory }}
1615
{{- range .Values.command.extraArgs }}
1716
- {{ . }}
1817
{{- end }}

‎hack/observability/opentelemetry/chart/templates/clusterrole.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{{- if .Values.clusterRole.create -}}
2+
apiVersion: rbac.authorization.k8s.io/v1
3+
kind: ClusterRole
4+
metadata:
5+
name: {{ include "opentelemetry-collector.clusterRoleName" . }}
6+
labels:
7+
{{- include "opentelemetry-collector.labels" . | nindent 4 }}
8+
{{- with .Values.clusterRole.annotations }}
9+
annotations:
10+
{{- toYaml . | nindent 4 }}
11+
{{- end }}
12+
rules: {{ toYaml .Values.clusterRole.rules | nindent 2 -}}
13+
{{- end }}

‎hack/observability/opentelemetry/chart/templates/clusterrolebinding.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{{- if .Values.clusterRole.create -}}
2+
apiVersion: rbac.authorization.k8s.io/v1
3+
kind: ClusterRoleBinding
4+
metadata:
5+
name: {{ include "opentelemetry-collector.clusterRoleBindingName" . }}
6+
labels:
7+
{{- include "opentelemetry-collector.labels" . | nindent 4 }}
8+
{{- with .Values.clusterRole.clusterRoleBinding.annotations }}
9+
annotations:
10+
{{- toYaml . | nindent 4 }}
11+
{{- end }}
12+
roleRef:
13+
apiGroup: rbac.authorization.k8s.io
14+
kind: ClusterRole
15+
name: {{ include "opentelemetry-collector.clusterRoleName" . }}
16+
subjects:
17+
- kind: ServiceAccount
18+
name: {{ include "opentelemetry-collector.serviceAccountName" . }}
19+
namespace: {{ .Release.Namespace }}
20+
{{- end }}

‎hack/observability/opentelemetry/chart/templates/daemonset.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ spec:
2020
labels:
2121
{{- include "opentelemetry-collector.selectorLabels" . | nindent 8 }}
2222
component: agent-collector
23+
{{- with .Values.agentCollector.podLabels }}
24+
{{- toYaml . | nindent 8 }}
25+
{{- end }}
2326
spec:
2427
{{- $podValues := deepCopy .Values.agentCollector | mustMergeOverwrite (deepCopy .Values) }}
2528
{{- $podData := dict "Values" $podValues "configmapSuffix" "-agent" "isAgent" true }}

‎hack/observability/opentelemetry/chart/templates/deployment.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ spec:
2727
labels:
2828
{{- include "opentelemetry-collector.selectorLabels" . | nindent 8 }}
2929
component: standalone-collector
30+
{{- with .Values.standaloneCollector.podLabels }}
31+
{{- toYaml . | nindent 8 }}
32+
{{- end }}
3033
spec:
3134
{{- $podValues := deepCopy .Values.standaloneCollector | mustMergeOverwrite (deepCopy .Values) }}
3235
{{- $podData := dict "Values" $podValues "configmapSuffix" "" "isAgent" false }}

0 commit comments

Comments
 (0)