Deleted deprecated dependency for OTEL

Makefile

@@ -51,16 +51,16 @@ TEMP_DIR := $(eval TEMP_DIR := $(shell mktemp -d))$(TEMP_DIR)
 
 OPERATOR_SDK_VERSION := $(eval OPERATOR_SDK_VERSION := $(shell cat versions/OPERATOR_SDK_VERSION))$(OPERATOR_SDK_VERSION)
 
-KIND_VERSION            ?= v0.15.0
-HELM_VERSION            ?= v3.9.4
+KIND_VERSION            ?= v0.16.0
+HELM_VERSION            ?= v3.10.0
 HELM_DOCS_VERSION       ?= 1.11.0
-YQ_VERSION              ?= v4.27.3
+YQ_VERSION              ?= v4.27.5
 VALDCLI_VERSION         ?= v1.5.6
-TELEPRESENCE_VERSION    ?= 2.7.2
-KUBELINTER_VERSION      ?= 0.4.0
+TELEPRESENCE_VERSION    ?= 2.7.6
+KUBELINTER_VERSION      ?= 0.5.0
 GOLANGCILINT_VERSION    ?= v1.49.0
 REVIEWDOG_VERSION       ?= v0.14.1
-PROTOBUF_VERSION        ?= 21.5
+PROTOBUF_VERSION        ?= 21.7
 JAEGER_OPERATOR_VERSION ?= 2.30.0
 
 SWAP_DEPLOYMENT_TYPE ?= deployment

charts/vald-helm-operator/crds/valdrelease.yaml

@@ -343,12 +343,6 @@ spec:
                         prometheus:
                           type: object
                           properties:
-                            collect_interval:
-                              type: string
-                            collect_timeout:
-                              type: string
-                            enable_in_memory_mode:
-                              type: boolean
                             enabled:
                               type: boolean
                             endpoint:
@@ -1337,12 +1331,6 @@ spec:
                             prometheus:
                               type: object
                               properties:
-                                collect_interval:
-                                  type: string
-                                collect_timeout:
-                                  type: string
-                                enable_in_memory_mode:
-                                  type: boolean
                                 enabled:
                                   type: boolean
                                 endpoint:
@@ -2255,12 +2243,6 @@ spec:
                         prometheus:
                           type: object
                           properties:
-                            collect_interval:
-                              type: string
-                            collect_timeout:
-                              type: string
-                            enable_in_memory_mode:
-                              type: boolean
                             enabled:
                               type: boolean
                             endpoint:
@@ -3152,12 +3134,6 @@ spec:
                         prometheus:
                           type: object
                           properties:
-                            collect_interval:
-                              type: string
-                            collect_timeout:
-                              type: string
-                            enable_in_memory_mode:
-                              type: boolean
                             enabled:
                               type: boolean
                             endpoint:
@@ -4594,12 +4570,6 @@ spec:
                             prometheus:
                               type: object
                               properties:
-                                collect_interval:
-                                  type: string
-                                collect_timeout:
-                                  type: string
-                                enable_in_memory_mode:
-                                  type: boolean
                                 enabled:
                                   type: boolean
                                 endpoint:
@@ -5831,12 +5801,6 @@ spec:
                             prometheus:
                               type: object
                               properties:
-                                collect_interval:
-                                  type: string
-                                collect_timeout:
-                                  type: string
-                                enable_in_memory_mode:
-                                  type: boolean
                                 enabled:
                                   type: boolean
                                 endpoint:
@@ -7054,12 +7018,6 @@ spec:
                             prometheus:
                               type: object
                               properties:
-                                collect_interval:
-                                  type: string
-                                collect_timeout:
-                                  type: string
-                                enable_in_memory_mode:
-                                  type: boolean
                                 enabled:
                                   type: boolean
                                 endpoint:

charts/vald/README.md

@@ -58,7 +58,7 @@ Configuration
 | agent.affinity.podAntiAffinity.requiredDuringSchedulingIgnoredDuringExecution | list | `[]` | pod anti-affinity required scheduling terms |
 | agent.annotations | object | `{}` | deployment annotations |
 | agent.enabled | bool | `true` | agent enabled |
-| agent.env | list | `[]` | environment variables |
+| agent.env | list | `[{"name":"MY_POD_NAMESPACE","valueFrom":{"fieldRef":{"fieldPath":"metadata.namespace"}}}]` | environment variables |
 | agent.externalTrafficPolicy | string | `""` | external traffic policy (can be specified when service type is LoadBalancer or NodePort) : Cluster or Local |
 | agent.hpa.enabled | bool | `false` | HPA enabled |
 | agent.hpa.targetCPUUtilizationPercentage | int | `80` | HPA CPU utilization percentage |
@@ -205,7 +205,7 @@ Configuration
 | agent.sidecar.config.restore_backoff_enabled | bool | `false` | restore backoff enabled |
 | agent.sidecar.config.watch_enabled | bool | `true` | auto backup triggered by file changes is enabled |
 | agent.sidecar.enabled | bool | `false` | sidecar enabled |
-| agent.sidecar.env | list | `[{"name":"MY_POD_NAME","valueFrom":{"fieldRef":{"fieldPath":"metadata.name"}}},{"name":"AWS_ACCESS_KEY","valueFrom":{"secretKeyRef":{"key":"access-key","name":"aws-secret"}}},{"name":"AWS_SECRET_ACCESS_KEY","valueFrom":{"secretKeyRef":{"key":"secret-access-key","name":"aws-secret"}}}]` | environment variables |
+| agent.sidecar.env | list | `[{"name":"MY_POD_NAME","valueFrom":{"fieldRef":{"fieldPath":"metadata.name"}}},{"name":"MY_POD_NAMESPACE","valueFrom":{"fieldRef":{"fieldPath":"metadata.namespace"}}},{"name":"AWS_ACCESS_KEY","valueFrom":{"secretKeyRef":{"key":"access-key","name":"aws-secret"}}},{"name":"AWS_SECRET_ACCESS_KEY","valueFrom":{"secretKeyRef":{"key":"secret-access-key","name":"aws-secret"}}}]` | environment variables |
 | agent.sidecar.image.pullPolicy | string | `"Always"` | image pull policy |
 | agent.sidecar.image.repository | string | `"vdaas/vald-agent-sidecar"` | image repository |
 | agent.sidecar.image.tag | string | `""` | image tag (overrides defaults.image.tag) |
@@ -259,6 +259,7 @@ Configuration
 | defaults.grpc.client.dial_option.initial_connection_window_size | int | `0` | gRPC client dial option initial connection window size |
 | defaults.grpc.client.dial_option.initial_window_size | int | `0` | gRPC client dial option initial window size |
 | defaults.grpc.client.dial_option.insecure | bool | `true` | gRPC client dial option insecure enabled |
+| defaults.grpc.client.dial_option.interceptors | list | `[]` | gRPC client interceptors |
 | defaults.grpc.client.dial_option.keepalive.permit_without_stream | bool | `true` | gRPC client keep alive permit without stream |
 | defaults.grpc.client.dial_option.keepalive.time | string | `"120s"` | gRPC client keep alive time |
 | defaults.grpc.client.dial_option.keepalive.timeout | string | `"30s"` | gRPC client keep alive timeout |
@@ -297,25 +298,28 @@ Configuration
 | defaults.logging.format | string | `"raw"` | logging format. logging format must be `raw` or `json` |
 | defaults.logging.level | string | `"debug"` | logging level. logging level must be `debug`, `info`, `warn`, `error` or `fatal`. |
 | defaults.logging.logger | string | `"glg"` | logger name. currently logger must be `glg` or `zap`. |
-| defaults.observability.collector.duration | string | `"5s"` | metrics collect duration. if it is set as 5s, enabled metrics are collected every 5 seconds. |
-| defaults.observability.collector.metrics.enable_cgo | bool | `true` | CGO metrics enabled |
-| defaults.observability.collector.metrics.enable_goroutine | bool | `true` | goroutine metrics enabled |
-| defaults.observability.collector.metrics.enable_memory | bool | `true` | memory metrics enabled |
-| defaults.observability.collector.metrics.enable_version_info | bool | `true` | version info metrics enabled |
-| defaults.observability.collector.metrics.version_info_labels | list | `["vald_version","server_name","git_commit","build_time","go_version","go_os","go_arch","ngt_version"]` | enabled label names of version info |
 | defaults.observability.enabled | bool | `false` | observability features enabled |
 | defaults.observability.jaeger.agent_endpoint | string | `""` | Jaeger agent endpoint |
-| defaults.observability.jaeger.buffer_max_count | int | `65000` | Jaeger buffer max count |
+| defaults.observability.jaeger.agent_max_packet_size | int | `65000` | Jaeger Agent max packet size |
+| defaults.observability.jaeger.agent_reconnect_interval | string | `"30s"` | Jaeger Agent reconnect interval |
+| defaults.observability.jaeger.batch_timeout | string | `"5s"` | Jaeger export batch timeout |
 | defaults.observability.jaeger.collector_endpoint | string | `""` | Jaeger collector endpoint |
 | defaults.observability.jaeger.enabled | bool | `false` | Jaeger exporter enabled |
+| defaults.observability.jaeger.export_timeout | string | `"5s"` | Jaeger export timeout |
+| defaults.observability.jaeger.max_export_batch_size | int | `512` | Jaeger max export batch size |
+| defaults.observability.jaeger.max_queue_size | int | `2048` | Jaeger max queue size |
 | defaults.observability.jaeger.password | string | `""` | Jaeger password |
 | defaults.observability.jaeger.service_name | string | `"vald"` | Jaeger service name |
 | defaults.observability.jaeger.username | string | `""` | Jaeger username |
+| defaults.observability.metrics.enable_cgo | bool | `true` | CGO metrics enabled |
+| defaults.observability.metrics.enable_goroutine | bool | `true` | goroutine metrics enabled |
+| defaults.observability.metrics.enable_memory | bool | `true` | memory metrics enabled |
+| defaults.observability.metrics.enable_version_info | bool | `true` | version info metrics enabled |
+| defaults.observability.metrics.version_info_labels | list | `["vald_version","server_name","git_commit","build_time","go_version","go_os","go_arch","ngt_version"]` | enabled label names of version info |
 | defaults.observability.prometheus.enabled | bool | `false` | Prometheus exporter enabled |
 | defaults.observability.prometheus.endpoint | string | `"/metrics"` | Prometheus exporter endpoint |
-| defaults.observability.prometheus.namespace | string | `"vald"` | prefix of exported metrics name |
+| defaults.observability.prometheus.namespace | string | `"_MY_POD_NAMESPACE_"` | service namespace for metrics |
 | defaults.observability.trace.enabled | bool | `false` | trace enabled |
-| defaults.observability.trace.sampling_rate | float | `1` | trace sampling rate. must be between 0.0 to 1.0. |
 | defaults.server_config.full_shutdown_duration | string | `"600s"` | server full shutdown duration |
 | defaults.server_config.healths.liveness.enabled | bool | `true` | liveness server enabled |
 | defaults.server_config.healths.liveness.host | string | `"0.0.0.0"` | liveness server host |
@@ -598,7 +602,7 @@ Configuration
 | gateway.filter.affinity.podAntiAffinity.requiredDuringSchedulingIgnoredDuringExecution | list | `[]` | pod anti-affinity required scheduling terms |
 | gateway.filter.annotations | object | `{}` | deployment annotations |
 | gateway.filter.enabled | bool | `false` | gateway enabled |
-| gateway.filter.env | list | `[]` | environment variables |
+| gateway.filter.env | list | `[{"name":"MY_POD_NAMESPACE","valueFrom":{"fieldRef":{"fieldPath":"metadata.namespace"}}}]` | environment variables |
 | gateway.filter.externalTrafficPolicy | string | `""` | external traffic policy (can be specified when service type is LoadBalancer or NodePort) : Cluster or Local |
 | gateway.filter.gateway_config.egress_filter | object | `{"client":{},"distance_filters":[],"object_filters":[]}` | gRPC client config for egress filter |
 | gateway.filter.gateway_config.egress_filter.client | object | `{}` | gRPC client config for egress filter (overrides defaults.grpc.client) |

charts/vald/templates/_helpers.tpl

@@ -688,9 +688,7 @@ trace:
 prometheus:
   {{- if .Values.prometheus }}
   enabled: {{ default .default.prometheus.enabled .Values.prometheus.enabled }}
-  collect_interval: {{ default .default.prometheus.collect_interval .Values.prometheus.collect_interval | quote }}
-  collect_timeout: {{ default .default.prometheus.collect_timeout .Values.prometheus.collect_timeout | quote }}
-  enable_in_memory_mode: {{ default .default.prometheus.enable_in_memory_mode .Values.prometheus.enable_in_memory_mode }}
+  endpoint: {{ default .default.prometheus.endpoint .Values.prometheus.endpoint | quote }}
   {{- else }}
   {{- toYaml .default.prometheus | nindent 2 }}
   {{- end }}

charts/vald/values.yaml

@@ -871,15 +871,6 @@ defaults:
       # @schema {"name": "defaults.observability.prometheus.namespace", "type": "string"}
       # defaults.observability.prometheus.namespace -- service namespace for metrics
       namespace: _MY_POD_NAMESPACE_
-      # @schema {"name": "defaults.observability.prometheus.collect_interval", "type": "string"}
-      # defaults.observability.prometheus.collect_interval -- Prometheus collect interval
-      collect_interval: 500ms
-      # @schema {"name": "defaults.observability.prometheus.collect_timeout", "type": "string"}
-      # defaults.observability.prometheus.collect_timeout -- Prometheus collect timeout
-      collect_timeout: 10s
-      # @schema {"name": "defaults.observability.prometheus.enable_in_memory_mode", "type": "boolean"}
-      # defaults.observability.prometheus.enable_in_memory_mode -- Prometheus collect with in memory
-      enable_in_memory_mode: true
     # @schema {"name": "defaults.observability.jaeger", "type": "object"}
     jaeger:
       # @schema {"name": "defaults.observability.jaeger.enabled", "type": "boolean"}

example/client/go.mod

@@ -3,15 +3,15 @@ module github.com/vdaas/vald/example/client
 go 1.18
 
 replace (
-	github.com/envoyproxy/protoc-gen-validate => github.com/envoyproxy/protoc-gen-validate v0.6.7
+	github.com/envoyproxy/protoc-gen-validate => github.com/envoyproxy/protoc-gen-validate v0.6.12
 	github.com/goccy/go-json => github.com/goccy/go-json v0.9.11
 	github.com/golang/protobuf => github.com/golang/protobuf v1.5.2
 	github.com/kpango/glg => github.com/kpango/glg v1.6.13
 	github.com/pkg/sftp => github.com/pkg/sftp v1.13.5
-	golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
-	golang.org/x/net => golang.org/x/net v0.0.0-20220907135653-1e95f45603a7
+	golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be
+	golang.org/x/net => golang.org/x/net v0.0.0-20221002022538-bcab6841153b
 	golang.org/x/text => golang.org/x/text v0.3.7
-	google.golang.org/genproto => google.golang.org/genproto v0.0.0-20220902135211-223410557253
+	google.golang.org/genproto => google.golang.org/genproto v0.0.0-20220930163606-c98284e70a91
 	google.golang.org/grpc => google.golang.org/grpc v1.49.0
 	google.golang.org/protobuf => google.golang.org/protobuf v1.28.1
 	gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0
@@ -23,17 +23,17 @@ require (
 	github.com/kpango/glg v1.6.10
 	github.com/vdaas/vald-client-go v1.5.6
 	gonum.org/v1/hdf5 v0.0.0-20210714002203-8c5d23bc6946
-	google.golang.org/grpc v1.48.0
+	google.golang.org/grpc v1.49.0
 )
 
 require (
 	github.com/envoyproxy/protoc-gen-validate v0.1.0 // indirect
 	github.com/goccy/go-json v0.9.11 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/kpango/fastime v1.1.4 // indirect
-	golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e // indirect
-	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
+	golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect
+	golang.org/x/sys v0.0.0-20220908150016-7ac13a9a928d // indirect
 	golang.org/x/text v0.3.7 // indirect
-	google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90 // indirect
+	google.golang.org/genproto v0.0.0-20220926220553-6981cbe3cfce // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 )