-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
ci: Test jaeger-v2 as all-in-one in CI #4890
Merged
+148
−30
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
ARG base_image | ||
ARG debug_image | ||
|
||
FROM $base_image AS release | ||
ARG TARGETARCH | ||
ARG USER_UID=10001 | ||
|
||
# Agent zipkin.thrift compact | ||
EXPOSE 5775/udp | ||
|
||
# Agent jaeger.thrift compact | ||
EXPOSE 6831/udp | ||
|
||
# Agent jaeger.thrift binary | ||
EXPOSE 6832/udp | ||
|
||
# Agent config HTTP | ||
EXPOSE 5778 | ||
|
||
# Collector OTLP gRPC | ||
EXPOSE 4317 | ||
|
||
# Collector OTLP HTTP | ||
EXPOSE 4318 | ||
|
||
# Collector HTTP | ||
EXPOSE 14268 | ||
|
||
# Collector gRPC | ||
EXPOSE 14250 | ||
|
||
# Collector Zipkin | ||
EXPOSE 9411 | ||
|
||
# Web HTTP | ||
EXPOSE 16686 | ||
|
||
# Default configuration file for setting sampling strategies | ||
# ENV SAMPLING_STRATEGIES_FILE=/etc/jaeger/sampling_strategies.json | ||
|
||
COPY jaeger-v2-linux-$TARGETARCH /go/bin/jaeger-v2-linux | ||
# COPY sampling_strategies.json /etc/jaeger/ | ||
|
||
VOLUME ["/tmp"] | ||
ENTRYPOINT ["/go/bin/jaeger-v2-linux"] | ||
USER ${USER_UID} | ||
|
||
FROM $debug_image AS debug | ||
ARG TARGETARCH=amd64 | ||
ARG USER_UID=10001 | ||
|
||
# Agent zipkin.thrift compact | ||
EXPOSE 5775/udp | ||
|
||
# Agent jaeger.thrift compact | ||
EXPOSE 6831/udp | ||
|
||
# Agent jaeger.thrift binary | ||
EXPOSE 6832/udp | ||
|
||
# Agent config HTTP | ||
EXPOSE 5778 | ||
|
||
# Collector OTLP gRPC | ||
EXPOSE 4317 | ||
|
||
# Collector OTLP HTTP | ||
EXPOSE 4318 | ||
|
||
# Collector HTTP | ||
EXPOSE 14268 | ||
|
||
# Collector gRPC | ||
EXPOSE 14250 | ||
|
||
# Collector Zipkin | ||
EXPOSE 9411 | ||
|
||
# Web HTTP | ||
EXPOSE 16686 | ||
|
||
# Delve | ||
EXPOSE 12345 | ||
|
||
# Default configuration file for setting sampling strategies | ||
# ENV SAMPLING_STRATEGIES_FILE=/etc/jaeger/sampling_strategies.json | ||
|
||
COPY jaeger-v2-debug-linux-$TARGETARCH /go/bin/jaeger-v2-linux | ||
# COPY sampling_strategies.json /etc/jaeger/ | ||
|
||
VOLUME ["/tmp"] | ||
ENTRYPOINT ["/go/bin/dlv", "exec", "/go/bin/jaeger-v2-linux", "--headless", "--listen=:12345", "--api-version=2", "--accept-multiclient", "--log", "--"] | ||
USER ${USER_UID} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,7 +20,10 @@ import ( | |
"github.com/jaegertracing/jaeger/ports" | ||
) | ||
|
||
var _ extension.Extension = (*server)(nil) | ||
var ( | ||
_ extension.Extension = (*server)(nil) | ||
_ extension.Dependent = (*server)(nil) | ||
) | ||
|
||
type server struct { | ||
config *Config | ||
|
@@ -35,6 +38,11 @@ func newServer(config *Config, otel component.TelemetrySettings) *server { | |
} | ||
} | ||
|
||
// Dependencies implements extension.Dependent to ensure this always starts after jaegerstorage extension. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍🏼 |
||
func (s *server) Dependencies() []component.ID { | ||
return []component.ID{jaegerstorage.ID} | ||
} | ||
|
||
func (s *server) Start(ctx context.Context, host component.Host) error { | ||
f, err := jaegerstorage.GetStorageFactory(s.config.TraceStoragePrimary, host) | ||
if err != nil { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -61,7 +61,7 @@ require ( | |
go.opentelemetry.io/collector/exporter/loggingexporter v0.88.0 | ||
go.opentelemetry.io/collector/exporter/otlpexporter v0.88.0 | ||
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.88.0 | ||
go.opentelemetry.io/collector/extension v0.88.0 | ||
go.opentelemetry.io/collector/extension v0.88.1-0.20231102040825-2e44da36e2c6 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. pinned to main branch for now, it will get updates once OTEL does a new release, which should happen before our next release in Dec |
||
go.opentelemetry.io/collector/extension/ballastextension v0.88.0 | ||
go.opentelemetry.io/collector/extension/zpagesextension v0.88.0 | ||
go.opentelemetry.io/collector/otelcol v0.88.0 | ||
|
@@ -71,7 +71,7 @@ require ( | |
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.88.0 | ||
go.opentelemetry.io/collector/receiver v0.88.0 | ||
go.opentelemetry.io/collector/receiver/otlpreceiver v0.88.0 | ||
go.opentelemetry.io/collector/service v0.88.0 | ||
go.opentelemetry.io/collector/service v0.88.1-0.20231102040825-2e44da36e2c6 | ||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 | ||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 | ||
go.opentelemetry.io/otel v1.19.0 | ||
|
@@ -123,7 +123,7 @@ require ( | |
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect | ||
github.com/golang/snappy v0.0.4 // indirect | ||
github.com/google/flatbuffers v1.12.1 // indirect | ||
github.com/google/uuid v1.3.1 // indirect | ||
github.com/google/uuid v1.4.0 // indirect | ||
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect | ||
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect | ||
github.com/hashicorp/errwrap v1.1.0 // indirect | ||
|
@@ -182,7 +182,7 @@ require ( | |
github.com/russross/blackfriday/v2 v2.1.0 // indirect | ||
github.com/sagikazarmark/locafero v0.3.0 // indirect | ||
github.com/sagikazarmark/slog-shim v0.1.0 // indirect | ||
github.com/shirou/gopsutil/v3 v3.23.9 // indirect | ||
github.com/shirou/gopsutil/v3 v3.23.10 // indirect | ||
github.com/shoenig/go-m1cpu v0.1.6 // indirect | ||
github.com/sourcegraph/conc v0.3.0 // indirect | ||
github.com/spf13/afero v1.10.0 // indirect | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this only added 39s to the total run, I think it's worth keeping in this workflow for now