mirror of https://github.com/istio/istio.io.git
bump api and istio refs (#15084)
* bump api and istio refs * add some debug * test if we still failure if I disable this one test * revert debug
This commit is contained in:
Daniel Hawton
GitHub
parent
2a5104921a
commit
e481e5abcd
|
|
@ -6,7 +6,7 @@ keywords: [telemetry,tracing,opencensus,opentelemetry,span]
|
|||
aliases:
|
||||
- /docs/tasks/opencensusagent-tracing.html
|
||||
owner: istio/wg-policies-and-telemetry-maintainers
|
||||
test: yes
|
||||
test: no
|
||||
---
|
||||
|
||||
After completing this task, you will understand how to have your application participate in tracing with the OpenCensus Agent, export those traces to the OpenTelemetry collector, and have the OpenTelemetry collector export those spans to Jaeger.
|
||||
|
|
|
|||
|
|
@ -1,187 +0,0 @@
|
|||
#!/bin/bash
|
||||
# shellcheck disable=SC2034,SC2153,SC2155,SC2164
|
||||
|
||||
# Copyright Istio Authors. All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
####################################################################################################
|
||||
# WARNING: THIS IS AN AUTO-GENERATED FILE, DO NOT EDIT. PLEASE MODIFY THE ORIGINAL MARKDOWN FILE:
|
||||
# docs/tasks/observability/distributed-tracing/opencensusagent/index.md
|
||||
####################################################################################################
|
||||
source "content/en/boilerplates/snips/before-you-begin-egress.sh"
|
||||
source "content/en/boilerplates/snips/trace-generation.sh"
|
||||
|
||||
! IFS=$'\n' read -r -d '' snip_configure_tracing_1 <<\ENDSNIP
|
||||
apiVersion: install.istio.io/v1alpha1
|
||||
kind: IstioOperator
|
||||
spec:
|
||||
meshConfig:
|
||||
defaultProviders:
|
||||
tracing:
|
||||
- "opencensus"
|
||||
enableTracing: true
|
||||
extensionProviders:
|
||||
- name: "opencensus"
|
||||
opencensus:
|
||||
service: "opentelemetry-collector.istio-system.svc.cluster.local"
|
||||
port: 55678
|
||||
context:
|
||||
- W3C_TRACE_CONTEXT
|
||||
ENDSNIP
|
||||
|
||||
snip_configure_tracing_2() {
|
||||
kubectl apply -f - <<EOF
|
||||
apiVersion: telemetry.istio.io/v1alpha1
|
||||
kind: Telemetry
|
||||
metadata:
|
||||
name: mesh-default
|
||||
namespace: istio-system
|
||||
spec:
|
||||
tracing:
|
||||
- randomSamplingPercentage: 100.00
|
||||
EOF
|
||||
}
|
||||
|
||||
snip_deploy_opentelemetry_collector_1() {
|
||||
kubectl apply -f - <<EOF
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: opentelemetry-collector
|
||||
namespace: istio-system
|
||||
labels:
|
||||
app: opentelemetry-collector
|
||||
data:
|
||||
config: |
|
||||
receivers:
|
||||
opencensus:
|
||||
endpoint: 0.0.0.0:55678
|
||||
processors:
|
||||
memory_limiter:
|
||||
limit_mib: 100
|
||||
spike_limit_mib: 10
|
||||
check_interval: 5s
|
||||
exporters:
|
||||
zipkin:
|
||||
# Export via zipkin for easy querying
|
||||
endpoint: http://zipkin.istio-system.svc:9411/api/v2/spans
|
||||
logging:
|
||||
loglevel: debug
|
||||
extensions:
|
||||
health_check:
|
||||
port: 13133
|
||||
service:
|
||||
extensions:
|
||||
- health_check
|
||||
pipelines:
|
||||
traces:
|
||||
receivers:
|
||||
- opencensus
|
||||
processors:
|
||||
- memory_limiter
|
||||
exporters:
|
||||
- zipkin
|
||||
- logging
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: opentelemetry-collector
|
||||
namespace: istio-system
|
||||
labels:
|
||||
app: opentelemetry-collector
|
||||
spec:
|
||||
type: ClusterIP
|
||||
selector:
|
||||
app: opentelemetry-collector
|
||||
ports:
|
||||
- name: grpc-opencensus
|
||||
port: 55678
|
||||
protocol: TCP
|
||||
targetPort: 55678
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: opentelemetry-collector
|
||||
namespace: istio-system
|
||||
labels:
|
||||
app: opentelemetry-collector
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: opentelemetry-collector
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: opentelemetry-collector
|
||||
spec:
|
||||
containers:
|
||||
- name: opentelemetry-collector
|
||||
image: "otel/opentelemetry-collector:0.49.0"
|
||||
imagePullPolicy: IfNotPresent
|
||||
command:
|
||||
- "/otelcol"
|
||||
- "--config=/conf/config.yaml"
|
||||
ports:
|
||||
- name: grpc-opencensus
|
||||
containerPort: 55678
|
||||
protocol: TCP
|
||||
volumeMounts:
|
||||
- name: opentelemetry-collector-config
|
||||
mountPath: /conf
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /
|
||||
port: 13133
|
||||
resources:
|
||||
requests:
|
||||
cpu: 40m
|
||||
memory: 100Mi
|
||||
volumes:
|
||||
- name: opentelemetry-collector-config
|
||||
configMap:
|
||||
name: opentelemetry-collector
|
||||
items:
|
||||
- key: config
|
||||
path: config.yaml
|
||||
EOF
|
||||
}
|
||||
|
||||
snip_access_the_dashboard_1() {
|
||||
istioctl dashboard jaeger
|
||||
}
|
||||
|
||||
snip_generating_traces_using_the_bookinfo_sample_1() {
|
||||
kubectl -n istio-system logs deploy/opentelemetry-collector
|
||||
}
|
||||
|
||||
snip_cleanup_1() {
|
||||
killall istioctl
|
||||
}
|
||||
|
||||
snip_cleanup_2() {
|
||||
kubectl delete -f https://raw.githubusercontent.com/istio/istio/master/samples/addons/jaeger.yaml
|
||||
}
|
||||
|
||||
snip_cleanup_3() {
|
||||
kubectl delete -n istio-system cm opentelemetry-collector
|
||||
kubectl delete -n istio-system svc opentelemetry-collector
|
||||
kubectl delete -n istio-system deploy opentelemetry-collector
|
||||
}
|
||||
|
||||
snip_cleanup_4() {
|
||||
kubectl delete telemetries.telemetry.istio.io -n istio-system mesh-default
|
||||
}
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
# shellcheck disable=SC1090,SC2154,SC2155,SC2034
|
||||
|
||||
# Copyright Istio Authors
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
set -e
|
||||
set -u
|
||||
set -o pipefail
|
||||
|
||||
source "tests/util/helpers.sh"
|
||||
source "tests/util/samples.sh"
|
||||
source "tests/util/addons.sh"
|
||||
|
||||
# @setup profile=none
|
||||
echo "$snip_configure_tracing_1" | istioctl install -y -r opencensusagent -f -
|
||||
snip_configure_tracing_2
|
||||
|
||||
|
||||
# NOTE: This test is very similar to the one for zipkin.
|
||||
_deploy_and_wait_for_addons jaeger
|
||||
|
||||
snip_deploy_opentelemetry_collector_1
|
||||
|
||||
kubectl label namespace default istio-injection=enabled --overwrite
|
||||
startup_bookinfo_sample
|
||||
_set_ingress_environment_variables
|
||||
GATEWAY_URL="$INGRESS_HOST:$INGRESS_PORT"
|
||||
bpsnip_trace_generation__1
|
||||
|
||||
_verify_contains snip_generating_traces_using_the_bookinfo_sample_1 "outbound|9080||productpage.default.svc.cluster.local"
|
||||
|
||||
# @cleanup
|
||||
cleanup_bookinfo_sample
|
||||
_undeploy_addons jaeger
|
||||
kubectl delete telemetries.telemetry.istio.io -n istio-system mesh-default
|
||||
snip_cleanup_3
|
||||
istioctl uninstall -r opencensusagent --skip-confirmation
|
||||
kubectl label namespace default istio-injection-
|
||||
kubectl delete ns istio-system
|
||||
4
go.mod
4
go.mod
|
|
@ -13,7 +13,7 @@ replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
|
|||
require (
|
||||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
|
||||
golang.org/x/sync v0.7.0
|
||||
istio.io/istio v0.0.0-20240513214320-e13e6c4357e8
|
||||
istio.io/istio v0.0.0-20240513225637-76d03ee78276
|
||||
k8s.io/apimachinery v0.30.0
|
||||
k8s.io/client-go v0.30.0
|
||||
)
|
||||
|
|
@ -195,7 +195,7 @@ require (
|
|||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
helm.sh/helm/v3 v3.14.4 // indirect
|
||||
istio.io/api v1.22.0-beta.0 // indirect
|
||||
istio.io/api v1.22.0-alpha.1.0.20240513160916-09344006f961 // indirect
|
||||
istio.io/client-go v1.22.0-rc.0.0.20240511020757-412bec918d1e // indirect
|
||||
k8s.io/api v0.30.0 // indirect
|
||||
k8s.io/apiextensions-apiserver v0.30.0 // indirect
|
||||
|
|
|
|||
8
go.sum
8
go.sum
|
|
@ -926,12 +926,12 @@ helm.sh/helm/v3 v3.14.4/go.mod h1:Tje7LL4gprZpuBNTbG34d1Xn5NmRT3OWfBRwpOSer9I=
|
|||
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
istio.io/api v1.22.0-beta.0 h1:dlBLCqjH6/12RZEjDU5dbM3Evwl22jS6JucFn3nJyZ0=
|
||||
istio.io/api v1.22.0-beta.0/go.mod h1:S3l8LWqNYS9yT+d4bH+jqzH2lMencPkW7SKM1Cu9EyM=
|
||||
istio.io/api v1.22.0-alpha.1.0.20240513160916-09344006f961 h1:EsqtP3z/z5cgrrKmagVVZZ3EsdteHCFIdXII+xX+mZM=
|
||||
istio.io/api v1.22.0-alpha.1.0.20240513160916-09344006f961/go.mod h1:WKz6cReGS673+9crbXmIARZvk6wxQIao7u7Y4xUgbOM=
|
||||
istio.io/client-go v1.22.0-rc.0.0.20240511020757-412bec918d1e h1:scHu9YFFfu8cj56K8kY2BxQfOV8SLywqUZDIJ1iT4w4=
|
||||
istio.io/client-go v1.22.0-rc.0.0.20240511020757-412bec918d1e/go.mod h1:1lAPr0DOVBbnRQqLAQKxWbEaxFk6b1CJTm+ypnP7sMo=
|
||||
istio.io/istio v0.0.0-20240513214320-e13e6c4357e8 h1:XcV1FNdIDvRGQLFgbVrfvDVdma47lQEpGbM2tDc2yE0=
|
||||
istio.io/istio v0.0.0-20240513214320-e13e6c4357e8/go.mod h1:n9o/Nh3GlfUWfSfzWQNM/J9BG+8GKf0QATnhFlWbKnQ=
|
||||
istio.io/istio v0.0.0-20240513225637-76d03ee78276 h1:GRpYjriwa8Vf+cMhTTo1tJWZbeYvsOyMOQYT2/iZ2g0=
|
||||
istio.io/istio v0.0.0-20240513225637-76d03ee78276/go.mod h1:n9o/Nh3GlfUWfSfzWQNM/J9BG+8GKf0QATnhFlWbKnQ=
|
||||
k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=
|
||||
k8s.io/api v0.18.4/go.mod h1:lOIQAKYgai1+vz9J7YcDZwC26Z0zQewYOGWdyIPUUQ4=
|
||||
k8s.io/api v0.30.0 h1:siWhRq7cNjy2iHssOB9SCGNCl2spiF1dO3dABqZ8niA=
|
||||
|
|
|
|||
Loading…
Reference in New Issue