Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Configure OTEL Collector to observe Internal Telemetry #5752

Merged
merged 38 commits into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
35c9f22
Test configuration changes
Wise-Wizard Jul 16, 2024
64fbda6
Merge branch 'main' into OTEL_Config/Telemetry
Wise-Wizard Jul 16, 2024
9fa70b5
Check if tracer is configured properly
Wise-Wizard Jul 16, 2024
3b20fb9
Revert changes
Wise-Wizard Jul 16, 2024
29d0096
Removed Comments
Wise-Wizard Jul 16, 2024
153ae08
Made changes to configuration
Wise-Wizard Jul 17, 2024
f1bbcbf
Merge branch 'main' into OTEL_Config/Telemetry
Wise-Wizard Jul 17, 2024
325f86a
Fix Test
Wise-Wizard Jul 17, 2024
b4aa97a
Revert Changes
Wise-Wizard Jul 17, 2024
81b356b
Merge branch 'main' into OTEL_Config/Telemetry
Wise-Wizard Jul 17, 2024
6f13e50
Removed unneccessary config
Wise-Wizard Jul 17, 2024
24f5a02
Added endpoint
Wise-Wizard Jul 17, 2024
4d65a4b
Added Debugging to Test
Wise-Wizard Jul 17, 2024
a024fff
Made change in Endpoint
Wise-Wizard Jul 17, 2024
ce37882
Merge branch 'main' into OTEL_Config/Telemetry
Wise-Wizard Jul 17, 2024
bc15455
fix
yurishkuro Jul 17, 2024
dfb9633
Temp Fix
Wise-Wizard Jul 17, 2024
a71c17b
Fix Test
Wise-Wizard Jul 17, 2024
128cbcb
Update cmd/jaeger/internal/all-in-one.yaml
Wise-Wizard Jul 17, 2024
9eecdd6
Add resource attr
Wise-Wizard Jul 17, 2024
b2f18ee
Merge branch 'OTEL_Config/Telemetry' of https://github.com/Wise-Wizar…
Wise-Wizard Jul 17, 2024
eb87c18
Ran make fmt
Wise-Wizard Jul 17, 2024
4a76314
Merge branch 'main' into OTEL_Config/Telemetry
Wise-Wizard Jul 19, 2024
885c057
Merge branch 'main' into OTEL_Config/Telemetry
Wise-Wizard Jul 21, 2024
eedb4c5
Reverted Changes
Wise-Wizard Jul 21, 2024
495577a
Merge branch 'main' into OTEL_Config/Telemetry
Wise-Wizard Jul 22, 2024
f410b06
Enable Query Metrics for V2
Wise-Wizard Jul 23, 2024
ae542e5
Merge branch 'main' into OTEL_Config/Telemetry
Wise-Wizard Jul 23, 2024
74f234b
Add Issue link
Wise-Wizard Jul 23, 2024
e186026
Added tmp folder to compare metrics in JSON Format
Wise-Wizard Jul 24, 2024
1ffdd72
Added differences
Wise-Wizard Jul 24, 2024
0f797f6
Sorted Lists
Wise-Wizard Jul 24, 2024
2056e10
Added labels per metric
Wise-Wizard Jul 24, 2024
f734071
Deleted JSON
Wise-Wizard Jul 24, 2024
ee81032
Merge branch 'main' into OTEL_Config/Telemetry
Wise-Wizard Jul 25, 2024
0493b6c
Added script to compare JSON
Wise-Wizard Jul 25, 2024
aeb7646
Fix Test
Wise-Wizard Jul 25, 2024
9a3536d
Add Script
Wise-Wizard Jul 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion cmd/jaeger/internal/all-in-one.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,19 @@ service:
receivers: [otlp, jaeger, zipkin]
processors: [batch]
exporters: [jaeger_storage_exporter]

telemetry:
Wise-Wizard marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is just one of many config files, we need to make similar changes to all of them, and to validate that the unique metrics produced by each binary/config are the same as in v1.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, that can be taken as the next step.

metrics:
level: detailed
traces:
Wise-Wizard marked this conversation as resolved.
Show resolved Hide resolved
processors:
- batch:
schedule_delay: 1000
exporter:
otlp:
endpoint: http://localhost:4318/v1/traces
protocol: http/protobuf
headers:
Authorization: "Basic ..."
Wise-Wizard marked this conversation as resolved.
Show resolved Hide resolved
extensions:
jaeger_query:
trace_storage: some_storage
Expand Down
13 changes: 6 additions & 7 deletions cmd/jaeger/internal/extension/jaegerquery/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage"
queryApp "github.com/jaegertracing/jaeger/cmd/query/app"
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
"github.com/jaegertracing/jaeger/pkg/jtracer"
"github.com/jaegertracing/jaeger/pkg/telemetery"
"github.com/jaegertracing/jaeger/pkg/tenancy"
"github.com/jaegertracing/jaeger/plugin/metrics/disabled"
Expand Down Expand Up @@ -73,14 +72,14 @@ func (s *server) Start(_ context.Context, host component.Host) error {
// TODO OTel-collector does not initialize the tracer currently
// https://github.com/open-telemetry/opentelemetry-collector/issues/7532
//nolint
Wise-Wizard marked this conversation as resolved.
Show resolved Hide resolved
tracerProvider, err := jtracer.New("jaeger")
if err != nil {
return fmt.Errorf("could not initialize a tracer: %w", err)
}
s.closeTracer = tracerProvider.Close
// tracerProvider, err := jtracer.New("jaeger")
// if err != nil {
// return fmt.Errorf("could not initialize a tracer: %w", err)
// }
// s.closeTracer = tracerProvider.Close
telset := telemetery.Setting{
Logger: s.telset.Logger,
TracerProvider: tracerProvider.OTEL,
TracerProvider: s.telset.TracerProvider,
ReportStatus: s.telset.ReportStatus,
}

Expand Down
Loading