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

Merging upstream changes #50

Merged
merged 85 commits into from
Apr 2, 2024
Merged

Merging upstream changes #50

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
f25b46f
[ffs] - Allow setting initial feature flag values (#1319)
puckpuck Jan 8, 2024
6a142a7
Update affiliation (#1323)
julianocosta89 Jan 8, 2024
47d9f5d
[cartservice] Bump OTel .NET SDK to 1.7.0 together with other depende…
Kielek Jan 16, 2024
494808a
Re-generate protobuf to fix deprecated go modules (#1321)
tranngoclam Jan 16, 2024
bfc18c7
[loadgenerator and recommendationservice] Update python base image (#…
julianocosta89 Jan 16, 2024
9e624d7
update version numbers (#1331)
austinlparker Jan 16, 2024
ea3fbfd
[grafana] - update grafana to 10.2.3 (#1332)
puckpuck Jan 16, 2024
c5484eb
[currency] - fix rpc.service attribute (#1333)
puckpuck Jan 19, 2024
c1365ed
use GitHub markdown syntax (#1342)
puckpuck Jan 19, 2024
69a28d6
[frontendproxy] enable envoy environment resource detector (#1291)
rlankfo Jan 19, 2024
0051599
[currency] - fix metricreader export and temporality (#1335)
puckpuck Jan 19, 2024
0d9cf78
update to latest helm release (#1341)
puckpuck Jan 20, 2024
9ed7785
[postgres] Define and use image for postgres (#1338)
puckpuck Jan 22, 2024
c9224a9
Update wiki url (#1346)
pankdev Jan 25, 2024
120381a
Fix crashlooping for two services with insufficient privileges on ope…
LouisParkin Jan 29, 2024
022ba90
Add browser traffic in loadgenerator and export traces in frontend (#…
jordibisbal8 Jan 30, 2024
ee7907f
Major version update (version 2.0.0) for OTel Java instrumentation (#…
mviitane Feb 1, 2024
cbea332
Align env variables for OTLP ports (#1353)
mviitane Feb 1, 2024
26b1710
Update dependent services - Collector, Grafana, Jaeger, Prometheus, e…
mviitane Feb 1, 2024
e15affc
[opensearch] - Use opensearch exporter & remove dataprepper (#1356)
puckpuck Feb 2, 2024
b0c1d27
[chore] update Go SDKs, & fix metrics filters and transforms (#1357)
puckpuck Feb 2, 2024
d2eae5f
build(go): upgrade golang:1.21.6 (#1360)
tranngoclam Feb 2, 2024
14bc74a
[chore] update SDKs and remove metric transforms (#1358)
puckpuck Feb 5, 2024
23094bf
always run cleanup job (#1366)
austinlparker Feb 5, 2024
d1575de
[loadgenerator] fix browser traffic enabled flag (#1359)
puckpuck Feb 7, 2024
3a9e507
Bump gradle/wrapper-validation-action from 1.1.0 to 2.0.1 (#1370)
dependabot[bot] Feb 7, 2024
059dfb9
chore(go): update go 1.22 (#1367)
tranngoclam Feb 7, 2024
b8cc894
Bump gradle/wrapper-validation-action from 2.0.1 to 2.1.0 (#1373)
dependabot[bot] Feb 8, 2024
ab6c1a7
[productcatalog] - allow products to be extended (#1363)
puckpuck Feb 9, 2024
1c6b68b
Bump gradle/wrapper-validation-action from 2.1.0 to 2.1.1 (#1376)
dependabot[bot] Feb 13, 2024
1b2214e
build(deps): upgrade go.opentelemetry.io/otel and go.opentelemetry.io…
tranngoclam Feb 14, 2024
2d16971
[chore] fix trace tests (#1377)
puckpuck Feb 14, 2024
e37e626
[cartservice] Bump .NET to 8.0.2 (#1380)
Kielek Feb 14, 2024
371b36f
Add Google Cloud fork to demos list (#1381)
damemi Feb 15, 2024
816ee5a
[currencyservice] Add OTLP logs (#1378)
julianocosta89 Feb 16, 2024
9d77fdf
prep for release (#1379)
austinlparker Feb 16, 2024
a87872e
replace featureflag service with flagd
austinlparker Feb 18, 2024
d533938
remove ff from gha
austinlparker Feb 18, 2024
c30d793
update changelog
austinlparker Feb 18, 2024
4d77b4b
fix sanity checker
austinlparker Feb 19, 2024
b5fb5e2
add python
austinlparker Feb 19, 2024
1ea0441
fix sanity
austinlparker Feb 19, 2024
e8e3553
refactor(checkoutservice): reuse grpc service client (#1387)
tranngoclam Feb 19, 2024
b503f31
Merge branch 'main' into flagd-spike
austinlparker Feb 19, 2024
6eab783
chore: use semantic convention v1.24.0 (#1385)
tranngoclam Feb 19, 2024
59e0528
bump dependencies (#1390)
julianocosta89 Feb 19, 2024
64eb66e
Update trace test sem conv (#1394)
julianocosta89 Feb 20, 2024
6f38f5f
update to 1.8.0 release (#1395)
puckpuck Feb 21, 2024
f9053b7
[chore] make: fix restart, add redeploy targets (#1397)
puckpuck Feb 21, 2024
0d7e94b
[chore] - memory for collector and jaeger (#1396)
puckpuck Feb 21, 2024
1b9b117
[chore]: nightly build and publish (#1398)
puckpuck Feb 21, 2024
6bd2ede
use nightly releases (#1399)
puckpuck Feb 22, 2024
ef31bfd
[chore]: remove integration tests (#1406)
puckpuck Feb 22, 2024
63a1e8a
Merge branch 'main' into flagd-spike
austinlparker Feb 22, 2024
df75996
add flagd provider to python
austinlparker Feb 23, 2024
cf7bac7
chore(checkoutservice): add producer interceptor for tracing (#1400)
tranngoclam Feb 24, 2024
4f7285f
Update src/adservice/build.gradle
austinlparker Feb 25, 2024
16f2428
Merge branch 'main' into flagd-spike
austinlparker Feb 25, 2024
e07f5b2
fix(accountingservice): fix graceful shutdown and log issues (#1401)
tranngoclam Feb 26, 2024
993fc7e
Merge branch 'main' into flagd-spike
austinlparker Feb 26, 2024
9f9f258
cleanup ad service eval
austinlparker Feb 26, 2024
3f6958a
only run nightly for main repo (#1407)
puckpuck Feb 26, 2024
ca56690
fix(productcatalogservice): fix graceful shutdown issues (#1402)
tranngoclam Feb 26, 2024
e6ef65d
Merge branch 'main' into flagd-spike
austinlparker Feb 26, 2024
940dfca
Test: Run integration tests on PR approval (#1414)
austinlparker Feb 26, 2024
b1e26c3
[CartService] - Add Host Detector (#1415)
julianocosta89 Feb 27, 2024
0a1ad08
docs(readme): add Dash0 to the list of forks (#1416)
basti1302 Feb 27, 2024
c462cda
Merge branch 'main' into flagd-spike
austinlparker Feb 27, 2024
71f0e96
[frontend] update sharp to latest to avoid docker build issue on M1 (…
basti1302 Feb 27, 2024
06f020c
[frontend] fix typo in ShippingGateway (#1418)
basti1302 Mar 1, 2024
b7c7891
fix kafka producer spans (#1428)
puckpuck Mar 2, 2024
24c82cf
Merge branch 'main' into flagd-spike
austinlparker Mar 2, 2024
71e428b
chore: upgrade go.opentelemetry.io otel and contrib dependencies (#1408)
tranngoclam Mar 2, 2024
ff19083
fix adservice
austinlparker Mar 4, 2024
52b35bf
Merge branch 'main' into flagd-spike
austinlparker Mar 4, 2024
d70b823
fixup gomod
austinlparker Mar 5, 2024
75533ab
add otel hooks for .net flags
austinlparker Mar 5, 2024
2f8861e
add otel hooks for productcatalog
austinlparker Mar 5, 2024
8430bbf
Remove trailing space
julianocosta89 Mar 6, 2024
87618d3
add stub for python otel hook
austinlparker Mar 6, 2024
c8b8e08
refactor(checkoutservice): use exception.message key from semantic co…
tranngoclam Mar 6, 2024
dc6d2db
remove unneeded key from flags
austinlparker Mar 6, 2024
334fe69
Merge branch 'main' into flagd-spike
austinlparker Mar 6, 2024
45a04f5
Merge branch 'flagd-spike' of github.com:austinlparker/opentelemetry-…
lukekraus45 Mar 28, 2024
d1e675b
removing integration tests
lukekraus45 Apr 1, 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
Prev Previous commit
Next Next commit
Re-generate protobuf to fix deprecated go modules (open-telemetry#1321)
  • Loading branch information
@tranngoclam
tranngoclam authored Jan 16, 2024
commit 494808a918d5d00b71ddb30d78d3d2b6a99d49ef
2 changes: 1 addition & 1 deletion src/accountingservice/genproto/oteldemo/demo.pb.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion src/accountingservice/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ go 1.21

require (
github.com/IBM/sarama v1.42.1
github.com/golang/protobuf v1.5.3
github.com/sirupsen/logrus v1.9.3
go.opentelemetry.io/otel v1.21.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0
Expand All @@ -23,6 +22,7 @@ require (
github.com/eapache/queue v1.1.0 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.17.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand Down
17 changes: 6 additions & 11 deletions src/checkoutservice/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ go 1.19

require (
github.com/IBM/sarama v1.42.1
github.com/golang/protobuf v1.5.3
github.com/google/uuid v1.4.0
github.com/sirupsen/logrus v1.9.3
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0
go.opentelemetry.io/contrib/instrumentation/runtime v0.46.0
go.opentelemetry.io/otel v1.20.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.43.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0
go.opentelemetry.io/otel/sdk v1.20.0
go.opentelemetry.io/otel/sdk/metric v1.20.0
go.opentelemetry.io/otel/trace v1.20.0
google.golang.org/grpc v1.59.0
Expand All @@ -20,7 +21,6 @@ require (
)

require (
cloud.google.com/go/compute v1.23.0 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/eapache/go-resiliency v1.4.0 // indirect
Expand All @@ -29,6 +29,7 @@ require (
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.17.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand All @@ -42,21 +43,15 @@ require (
github.com/klauspost/compress v1.16.7 // indirect
github.com/pierrec/lz4/v4 v4.1.18 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
go.opentelemetry.io/otel/metric v1.20.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/net v0.17.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
)

require (
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
go.opentelemetry.io/otel/sdk v1.20.0
golang.org/x/sys v0.14.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
)

replace github.com/opentelemetry/opentelemetry-demo/src/productcatalogservice => ../productcatalogservice
Loading