Skip to content

Commit

Permalink
[chore] update examples to use debugexporter (open-telemetry#26715)
Browse files Browse the repository at this point in the history
This updates the code examples to use the debug exporter instead of the
logging exporter. This change will need to be merged after the v0.86.0
release.

---------

Signed-off-by: Alex Boten <[email protected]>
  • Loading branch information
Alex Boten committed Sep 26, 2023
1 parent 207b6c1 commit 4982f49
Show file tree
Hide file tree
Showing 36 changed files with 97 additions and 80 deletions.
1 change: 1 addition & 0 deletions cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,7 @@ require (
go.opentelemetry.io/collector/confmap v0.86.0 // indirect
go.opentelemetry.io/collector/connector v0.86.0 // indirect
go.opentelemetry.io/collector/consumer v0.86.0 // indirect
go.opentelemetry.io/collector/exporter/debugexporter v0.86.0 // indirect
go.opentelemetry.io/collector/exporter/loggingexporter v0.86.0 // indirect
go.opentelemetry.io/collector/exporter/otlpexporter v0.86.0 // indirect
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.86.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions cmd/configschema/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions cmd/otelcontribcol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ extensions:
import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.86.0
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.86.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.86.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.86.0
Expand Down
2 changes: 2 additions & 0 deletions cmd/otelcontribcol/components.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions cmd/otelcontribcol/exporters_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"context"
"errors"
"path/filepath"
"runtime"
"testing"

"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -105,8 +104,10 @@ func TestDefaultExporters(t *testing.T) {
},
},
{
exporter: "logging",
skipLifecycle: runtime.GOOS == "darwin", // TODO: investigate why this fails on darwin.
exporter: "debug",
},
{
exporter: "logging",
},
{
exporter: "opencensus",
Expand Down
1 change: 1 addition & 0 deletions cmd/otelcontribcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ require (
go.opentelemetry.io/collector/connector/forwardconnector v0.86.0
go.opentelemetry.io/collector/consumer v0.86.0
go.opentelemetry.io/collector/exporter v0.86.0
go.opentelemetry.io/collector/exporter/debugexporter v0.86.0
go.opentelemetry.io/collector/exporter/loggingexporter v0.86.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.86.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.86.0
Expand Down
2 changes: 2 additions & 0 deletions cmd/otelcontribcol/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions cmd/oteltestbedcol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ extensions:
import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.86.0
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.86.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.86.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.86.0
Expand Down
2 changes: 2 additions & 0 deletions cmd/oteltestbedcol/components.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions cmd/oteltestbedcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ require (
go.opentelemetry.io/collector/component v0.86.0
go.opentelemetry.io/collector/connector v0.86.0
go.opentelemetry.io/collector/exporter v0.86.0
go.opentelemetry.io/collector/exporter/debugexporter v0.86.0
go.opentelemetry.io/collector/exporter/loggingexporter v0.86.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.86.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.86.0
Expand Down
2 changes: 2 additions & 0 deletions cmd/oteltestbedcol/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions cmd/telemetrygen/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ receivers:
processors:

exporters:
logging:
debug:

service:
pipelines:
Expand All @@ -47,7 +47,7 @@ service:
- otlp
processors: []
exporters:
- logging
- debug
```

Once the OpenTelemetry Collector instance is up and running, run `telemetrygen` for your desired telemetry:
Expand Down
8 changes: 4 additions & 4 deletions confmap/provider/s3provider/testdata/otel-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ processors:
check_interval: 5s

exporters:
logging:
loglevel: debug
debug:
verbosity: detailed

service:
pipelines:
traces:
receivers: [otlp]
processors: [memory_limiter, batch]
exporters: [logging]
exporters: [debug]
metrics:
receivers: [otlp]
processors: [memory_limiter, batch]
exporters: [logging]
exporters: [debug]

extensions: [memory_ballast, zpages]
6 changes: 3 additions & 3 deletions examples/demo/otel-collector-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ exporters:
const_labels:
label1: value1

logging:
debug:

zipkin:
endpoint: "http:https://zipkin-all-in-one:9411/api/v2/spans"
Expand All @@ -36,8 +36,8 @@ service:
traces:
receivers: [otlp]
processors: [batch]
exporters: [logging, zipkin, otlp]
exporters: [debug, zipkin, otlp]
metrics:
receivers: [otlp]
processors: [batch]
exporters: [logging, prometheus]
exporters: [debug, prometheus]
6 changes: 3 additions & 3 deletions examples/kubernetes/otel-collector-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ receivers:
from: attributes.uid
to: resource["k8s.pod.uid"]
exporters:
logging:
loglevel: debug
debug:
verbosity: detailed
service:
pipelines:
logs:
receivers: [filelog]
exporters: [logging]
exporters: [debug]
6 changes: 3 additions & 3 deletions examples/kubernetes/otel-collector.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,14 @@ data:
- from: connection
exporters:
logging:
loglevel: debug
debug:
verbosity: detailed
service:
pipelines:
logs:
receivers: [filelog]
processors: [k8sattributes]
exporters: [logging]
exporters: [debug]
---
apiVersion: apps/v1
Expand Down
6 changes: 3 additions & 3 deletions examples/nomad/otel-collector.nomad
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ processors:
check_interval: 5s
exporters:
logging:
logLevel: debug
debug:
verbosity: detailed
service:
pipelines:
traces:
receivers: [otlp]
exporters: [logging]
exporters: [debug]
EOH

Expand Down
4 changes: 2 additions & 2 deletions exporter/fileexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ spec:
processors:
exporters:
logging:
debug:
file:
path: /data/metrics.json
Expand All @@ -134,7 +134,7 @@ spec:
metrics:
receivers: [otlp]
processors: []
exporters: [logging,file]
exporters: [debug,file]
volumes:
- name: file
emptyDir: {}
Expand Down
2 changes: 0 additions & 2 deletions exporter/instanaexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ receivers:
processors:
batch:
exporters:
logging:
loglevel: debug
instana:
endpoint: ${env:INSTANA_ENDPOINT_URL}
agent_key: ${env:INSTANA_AGENT_KEY}
Expand Down
20 changes: 9 additions & 11 deletions exporter/loadbalancingexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ receivers:
processors:

exporters:
logging:
loadbalancing:
routing_key: "service"
protocol:
Expand Down Expand Up @@ -122,7 +121,6 @@ receivers:
processors:

exporters:
logging:
loadbalancing:
routing_key: "service"
protocol:
Expand Down Expand Up @@ -181,7 +179,7 @@ receivers:
processors:

exporters:
logging:
debug:
loadbalancing:
protocol:
otlp:
Expand Down Expand Up @@ -210,28 +208,28 @@ service:
- otlp/backend-1
processors: []
exporters:
- logging
- debug

traces/backend-2:
receivers:
- otlp/backend-2
processors: []
exporters:
- logging
- debug

traces/backend-3:
receivers:
- otlp/backend-3
processors: []
exporters:
- logging
- debug

traces/backend-4:
receivers:
- otlp/backend-4
processors: []
exporters:
- logging
- debug

logs/loadbalancer:
receivers:
Expand All @@ -244,25 +242,25 @@ service:
- otlp/backend-1
processors: []
exporters:
- logging
- debug
logs/backend-2:
receivers:
- otlp/backend-2
processors: []
exporters:
- logging
- debug
logs/backend-3:
receivers:
- otlp/backend-3
processors: []
exporters:
- logging
- debug
logs/backend-4:
receivers:
- otlp/backend-4
processors: []
exporters:
- logging
- debug
```

## Metrics
Expand Down
4 changes: 2 additions & 2 deletions exporter/loadbalancingexporter/example/k8s-resolver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ spec:
processors:
exporters:
logging:
debug:
service:
pipelines:
Expand All @@ -110,7 +110,7 @@ spec:
- otlp
processors: []
exporters:
- logging
- debug
EOF
```

Expand Down
6 changes: 3 additions & 3 deletions exporter/loadbalancingexporter/example/otel-agent-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ processors:
batch:

exporters:
logging:
loglevel: debug
debug:
verbosity: detailed
loadbalancing:
protocol:
otlp:
Expand All @@ -32,4 +32,4 @@ service:
logs:
receivers: [fluentforward]
processors: [batch]
exporters: [loadbalancing, logging]
exporters: [loadbalancing, debug]
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ processors:
batch:

exporters:
logging:
loglevel: debug
debug:
verbosity: detailed

extensions:
health_check:
Expand All @@ -21,4 +21,4 @@ service:
logs:
receivers: [otlp]
processors: [batch]
exporters: [logging]
exporters: [debug]
Loading

0 comments on commit 4982f49

Please sign in to comment.