mirror of
https://github.com/sourcegraph/sourcegraph.git
synced 2026-02-06 18:51:59 +00:00
7d91894a01
Thread: https://sourcegraph.slack.com/archives/C1JH2BEHZ/p1717797870638299 One problem caused by this upgrade is that the [deprecated `jaegerexporter`](https://github.com/open-telemetry/opentelemetry-specification/pull/2858) no longer builds at all with the last published version, so for the upgrade to go through it must be removed. I've updated local `sg start` to work with this change, but some Release team support is needed for deployment configuration + customer-facing docs changes: https://sourcegraph.slack.com/archives/C1JH2BEHZ/p1718143249191349?thread_ts=1717797870.638299&cid=C1JH2BEHZ, since current guidance asks customers to configure `jaegerexporter`. Part of https://linear.app/sourcegraph/issue/SEC-1680 Closes https://linear.app/sourcegraph/issue/CORE-177 ## Test plan Followed steps shared in https://sourcegraph.slack.com/archives/C04MYFW01NV/p1718136211292469 to run locally, since `sg run jaeger otel-collector` alone is insufficient to get updated images: ```diff diff --git a/wolfi-images/opentelemetry-collector.yaml b/wolfi-images/opentelemetry-collector.yaml index b995a3d531b..76de80d4f84 100644 --- a/wolfi-images/opentelemetry-collector.yaml +++ b/wolfi-images/opentelemetry-collector.yaml @@ -7,7 +7,11 @@ contents: - mailcap ## opentelemetry-collector packages - - opentelemetry-collector@sourcegraph + - opentelemetry-collector@branch + keyring: + - https://packages.sgdev.org/sourcegraph-melange-dev.rsa.pub + repositories: + - '@branch https://packages.sgdev.org/branches/otel-collector-upgrade' paths: - path: /otel-collector ``` plus `sg wolfi lock opentelemetry-collector` will make `sg run otel-collector` use the correct image. **The above diffs SHOULD NOT be committed. The lock should happen post-merge.** Spot-checked some traces locally with: ``` sg run jaeger otel-collector sg start ```   ## Changelog - OpenTelemetry Collector: Upgraded OpenTelemetry Collector to v0.103.0 - OpenTelemetry Collector: The [deprecated `jaegerexporter` has been removed](https://github.com/open-telemetry/opentelemetry-specification/pull/2858). Users of `exporter: { jaeger: ... }` in the OpenTelemetry Collector should use `exporter: { otlp/jaeger: ... }` to send traces directly to Jaeger via its OTLP receiver. - Users of the default Jaeger configurations now need to provide `JAEGER_OTLP_GRPC_PORT` as well as the existing `JAEGER_HOST` configuration. --------- Co-authored-by: Anish Lakhwara <anish+github@lakhwara.com> Co-authored-by: Anish Lakhwara <anish+git@lakhwara.com> |
||
|---|---|---|
| .. | ||
| accesstoken | ||
| api | ||
| background | ||
| batches | ||
| cliutil | ||
| codeintel | ||
| enterpriseportal | ||
| errors | ||
| gitservice | ||
| iterator | ||
| managedservicesplatform | ||
| output | ||
| pointers | ||
| process | ||
| redislock | ||
| servicecatalog | ||
| telemetrygateway | ||
| buf.yaml | ||
| go.mod | ||
| go.sum | ||
| README.md | ||
| tools.go | ||
Sourcegraph lib module
This directory is the root of a separate go module from the primary module rooted at sourcegraph/sourcegraph. This module exists to hold code that we want to reuse outside of the sourcegraph/sourcegraph repo.
Code in this module should not import from sourcegraph/sourcegraph or from other Sourcegraph repositories to avoid complicated dependency relationships. Instead consider moving code from elsewhere into this module.