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.

Sign up for GitHub

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

Jump to bottom

Update Configs for OTLP support #346

Merged
merged 13 commits into from
Jan 10, 2023
Merged

Update Configs for OTLP support #346

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7859196
Initial Commit
renaz6 Nov 9, 2022
d75eaf9
Merge branch 'main' into renaz6/updateCandlelight
renaz6 Nov 9, 2022
ddaf47f
Update Config for Otel Collector
renaz6 Nov 18, 2022
70d67cd
Update go.mod
renaz6 Nov 18, 2022
7f89e92
Document the config file
renaz6 Nov 30, 2022
9cf24ed
Refined configurations for tracing
renaz6 Dec 5, 2022
b9a98dd
Update tr1d1um.yaml
renaz6 Dec 5, 2022
931ddb0
Update Changelog
renaz6 Dec 5, 2022
290a8da
Update tr1d1um.yaml
renaz6 Dec 6, 2022
3d19788
Merge branch 'main' into renaz6/updateCandlelight
denopink Dec 6, 2022
45a97be
Update modules with new candlelight release
renaz6 Dec 8, 2022
9ae0895
Merge branch 'renaz6/updateCandlelight' of https://github.com/xmidt-o…
renaz6 Dec 8, 2022
ea4e303
Merge branch 'main' into renaz6/updateCandlelight
denopink Jan 10, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]
- Updated tracing configuration documentation in tr1d1um.yaml to reflect changes in Candlelight [#346](https://github.com/xmidt-org/tr1d1um/pull/346)

## [v0.7.12]
- [`/api/v2/device/` 500 EOF Error #328](https://github.com/xmidt-org/tr1d1um/issues/328)
Expand Down
32 changes: 22 additions & 10 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ require (
github.com/stretchr/testify v1.8.1
github.com/xmidt-org/ancla v0.3.10
github.com/xmidt-org/arrange v0.3.0
github.com/xmidt-org/bascule v0.11.2
github.com/xmidt-org/candlelight v0.0.12
github.com/xmidt-org/bascule v0.11.0
github.com/xmidt-org/candlelight v0.0.13
github.com/xmidt-org/clortho v0.0.4
github.com/xmidt-org/httpaux v0.3.2
github.com/xmidt-org/sallust v0.2.0
github.com/xmidt-org/touchstone v0.1.2
github.com/xmidt-org/webpa-common/v2 v2.0.7
github.com/xmidt-org/wrp-go/v3 v3.1.4
go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.37.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.37.0
go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.36.4
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4
go.uber.org/fx v1.18.2
go.uber.org/zap v1.24.0
go.uber.org/zap v1.23.0
)

require (
Expand All @@ -33,6 +33,7 @@ require (
github.com/VividCortex/gohistogram v1.0.0 // indirect
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
Expand All @@ -46,6 +47,7 @@ require (
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c // indirect
github.com/jtacoma/uritemplates v1.0.0 // indirect
Expand All @@ -72,26 +74,36 @@ require (
github.com/stretchr/objx v0.5.0 // indirect
github.com/subosito/gotenv v1.4.1 // indirect
github.com/ugorji/go/codec v1.2.7 // indirect
github.com/xmidt-org/argus v0.9.4 // indirect
github.com/xmidt-org/argus v0.9.1 // indirect
github.com/xmidt-org/chronon v0.1.1 // indirect
github.com/xmidt-org/themis v0.4.11 // indirect
github.com/xmidt-org/themis v0.4.8 // indirect
github.com/xmidt-org/webpa-common v1.11.9 // indirect
go.opentelemetry.io/otel v1.11.2 // indirect
go.opentelemetry.io/otel v1.11.1 // indirect
go.opentelemetry.io/otel/exporters/jaeger v1.11.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.11.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.11.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.11.1 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.11.1 // indirect
go.opentelemetry.io/otel/exporters/zipkin v1.11.1 // indirect
go.opentelemetry.io/otel/metric v0.34.0 // indirect
go.opentelemetry.io/otel/metric v0.33.0 // indirect
go.opentelemetry.io/otel/sdk v1.11.1 // indirect
go.opentelemetry.io/otel/trace v1.11.2 // indirect
go.opentelemetry.io/otel/trace v1.11.1 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/dig v1.15.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/crypto v0.2.0 // indirect
golang.org/x/net v0.2.0 // indirect
golang.org/x/sys v0.2.0 // indirect
golang.org/x/text v0.4.0 // indirect
google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e // indirect
google.golang.org/grpc v1.50.1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace github.com/xmidt-org/candlelight => /Users/szamar882/Documents/GoDev/src/github.com/xmidt-org/candlelight
Loading