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

🐛 Wrong opentelemetry-collector config filename #6382

Merged
merged 165 commits into from
Sep 17, 2024
Merged

🐛 Wrong opentelemetry-collector config filename #6382

Changes from all commits
Commits
Show all changes
165 commits
Select commit Hold shift + click to select a range
40f56aa
Add password for redis
mrnicegyu11 Apr 22, 2024
f124306
Merge remote-tracking branch 'upstream/master' into add/redisWithPass…
mrnicegyu11 May 13, 2024
db7ec97
Merge remote-tracking branch 'upstream/master' into add/redisWithPass…
mrnicegyu11 Jul 9, 2024
2adba93
Merge branch 'master' into 2024/07/redisPassword
mrnicegyu11 Jul 9, 2024
6f0f32a
make redis tests pass
mrnicegyu11 Jul 10, 2024
7c8f832
Merge remote-tracking branch 'upstream/master' into 2024/07/redisPass…
mrnicegyu11 Jul 10, 2024
e132b7e
Merge branch 'master' into 2024/07/redisPassword
mrnicegyu11 Jul 10, 2024
569bf06
🎨 [Frontend] TIP v3 Feedback from 10.07 (#6049)
odeimaiz Jul 11, 2024
4b490fc
🎨 Improve load test framework (yet again) (#6051)
bisgaard-itis Jul 11, 2024
82583e8
🎨 [Frontend] Do not change annotations' color when selected (#6048)
odeimaiz Jul 11, 2024
5c0c85f
🐛 Fix `install-ci` make target in `tests/performance` (#6053)
bisgaard-itis Jul 11, 2024
8f3dcaa
✨🚨Autoscaling: Prepare Warmed EBS-backed volumes to use as buffer for…
sanderegg Jul 11, 2024
8462789
🚑️ fixes issue with env vars being stored as dict or list (#6052)
GitHK Jul 12, 2024
fd3bd45
✨✅ catalog: service-layer for registry and increased test coverage (p…
pcrespov Jul 12, 2024
77b4ab3
🐛 fixes hanging servicelib tests (#5942)
GitHK Jul 15, 2024
4743aee
🎨 [Frontend] Patch study from Study Editor (#5916)
odeimaiz Jul 15, 2024
161c8d4
Bump actions/setup-node from 4.0.2 to 4.0.3 (#6065)
dependabot[bot] Jul 15, 2024
2aecc2e
🐛🎨 Fix backenderror name injection (#6064)
bisgaard-itis Jul 16, 2024
6c236d4
🎨 [Frontend] UX: Reuse ``Add collaborators`` widget in Publish templa…
odeimaiz Jul 16, 2024
12ec93d
🎨adding logs when sendig socketio messages (#6067)
GitHK Jul 16, 2024
50d318e
🎨 [Frontend] UX Cookie Expiration Date (#6066)
odeimaiz Jul 16, 2024
20d4f8b
🐛 Fix create soft link kwargs (#6069)
bisgaard-itis Jul 16, 2024
3912180
🎨 web-api `services` api response includes manifest info (part 5) (#…
pcrespov Jul 16, 2024
f1440ae
Merge branch 'master' into 2024/07/redisPassword
mrnicegyu11 Jul 17, 2024
09cd578
Fix some tests
mrnicegyu11 Jul 17, 2024
290dd22
Fix some tests
mrnicegyu11 Jul 17, 2024
6905089
Merge branch 'master' into 2024/07/redisPassword
mrnicegyu11 Jul 18, 2024
f7ed2e1
Fix some tests
mrnicegyu11 Jul 18, 2024
540f541
Merge branch 'master' into 2024/07/redisPassword
mrnicegyu11 Jul 18, 2024
d04d281
Fix some tests
mrnicegyu11 Jul 18, 2024
6d89aab
Increase timeout in exporter test - wont ever pass on local machine, …
mrnicegyu11 Jul 18, 2024
47892b7
Remove debug print statement
mrnicegyu11 Jul 18, 2024
60ebcfc
Fix failing test
mrnicegyu11 Jul 18, 2024
6f4d84e
Merge branch 'master' into 2024/07/redisPassword
mrnicegyu11 Jul 18, 2024
fa9bd5a
Merge branch 'master' into 2024/07/redisPassword
mrnicegyu11 Jul 19, 2024
5e800fc
Fix comment extra str() - @pcrewspov
mrnicegyu11 Jul 22, 2024
26d3c46
Revert extended integration test timeout @pcrespov @sanderegg
mrnicegyu11 Jul 22, 2024
6107b45
Merge branch 'master' into 2024/07/redisPassword
mrnicegyu11 Jul 22, 2024
9f730c4
WIP - Remove old deprecated tracing from webserver, add opentelemtry
mrnicegyu11 Jul 29, 2024
ad108e0
Merge remote-tracking branch 'upstream/master' into 2024/07/redisPass…
mrnicegyu11 Aug 2, 2024
a55c7e0
Fix redis-commander
mrnicegyu11 Aug 2, 2024
9ebf3e5
Merge remote-tracking branch 'upstream/master' into 2024/add/opentele…
mrnicegyu11 Aug 4, 2024
e3fd85f
wip
mrnicegyu11 Aug 4, 2024
d82fa3f
wip
mrnicegyu11 Aug 5, 2024
a11a93f
wip
mrnicegyu11 Aug 5, 2024
b38b4c1
Update services/web/server/tests/unit/with_dbs/docker-compose-devel.yml
mrnicegyu11 Aug 5, 2024
7659d75
Fix @githk commit suggestion
mrnicegyu11 Aug 5, 2024
cfc3b5b
Merge branch '2024/07/redisPassword' into 2024/add/opentelemetry
mrnicegyu11 Aug 5, 2024
315bd53
wip - bypass precommit pyupgrade&black for directorv0
mrnicegyu11 Aug 6, 2024
9ad9f8c
Merge remote-tracking branch 'upstream/master' into 2024/add/opentele…
mrnicegyu11 Aug 6, 2024
bb61296
WIP - Add FastAPI instrumentation
mrnicegyu11 Aug 6, 2024
3b58b7c
Merge remote-tracking branch 'upstream/master' into 2024/add/opentele…
mrnicegyu11 Aug 8, 2024
8874da0
wip - bump traefik
mrnicegyu11 Aug 9, 2024
1bde38c
Merge remote-tracking branch 'upstream/master' into 2024/add/opentele…
mrnicegyu11 Aug 9, 2024
ad9817f
Merge remote-tracking branch 'upstream/master' into 2024/add/opentele…
mrnicegyu11 Aug 12, 2024
76eaf8a
Remove zipkin references
mrnicegyu11 Aug 12, 2024
0a2e772
Remove accidental commit: pytest mark
mrnicegyu11 Aug 12, 2024
3c5d897
Improve Dev-mode error handling in catalog
mrnicegyu11 Aug 12, 2024
001e42e
fix otel yaml config
mrnicegyu11 Aug 12, 2024
ff02605
Merge remote-tracking branch 'upstream/master' into 2024/add/opentele…
mrnicegyu11 Aug 14, 2024
ace3a26
Ensure that tracing is optional
mrnicegyu11 Aug 14, 2024
93aeb11
Remove old zipkin endpoint
mrnicegyu11 Aug 14, 2024
3cd7090
Move otel collector to ops-stack
mrnicegyu11 Aug 14, 2024
d578133
Merge remote-tracking branch 'upstream/master' into 2024/add/opentele…
mrnicegyu11 Aug 19, 2024
e399b4f
Add aiohttp tracing pytests
mrnicegyu11 Aug 20, 2024
e1d5ead
Merge remote-tracking branch 'upstream/master' into 2024/add/opentele…
mrnicegyu11 Aug 20, 2024
ee3dae1
Add unitttests for tracing settings
mrnicegyu11 Aug 20, 2024
b0b63fa
Merge branch 'master' into 2024/add/opentelemetry
mrnicegyu11 Aug 20, 2024
e9b4327
Fix spelling
mrnicegyu11 Aug 20, 2024
52b8d59
Revert "Fix spelling"
mrnicegyu11 Aug 20, 2024
d10f947
Remove comment
mrnicegyu11 Aug 20, 2024
54a0d24
Revert requriements .txt files to upstream master
mrnicegyu11 Aug 20, 2024
988a2ad
install opentelemetry in servicelib
mrnicegyu11 Aug 20, 2024
3350c33
Install webserver opentelemetry-instrumentation-aiopg
mrnicegyu11 Aug 20, 2024
31b3833
Merge branch 'master' into 2024/add/opentelemetry
mrnicegyu11 Aug 20, 2024
7963a97
Fix typo
mrnicegyu11 Aug 20, 2024
3dabefc
Fix catalog tests
mrnicegyu11 Aug 20, 2024
b3b3739
Install requirements with opentelemtry in simcore services
mrnicegyu11 Aug 21, 2024
92fd208
Merge branch 'master' into 2024/add/opentelemetry
mrnicegyu11 Aug 21, 2024
e8150fe
Merge branch 'master' into 2024/add/opentelemetry
mrnicegyu11 Aug 21, 2024
2114676
mypy fixes
mrnicegyu11 Aug 21, 2024
03b3708
some fixes
mrnicegyu11 Aug 21, 2024
747bfc5
pylint fixes
mrnicegyu11 Aug 21, 2024
6130844
Merge branch 'master' into 2024/add/opentelemetry
mrnicegyu11 Aug 21, 2024
441aead
mypy fix
mrnicegyu11 Aug 21, 2024
52ffbfd
Fix pylint
mrnicegyu11 Aug 21, 2024
d75682d
Merge remote-tracking branch 'upstream/master' into 2024/add/opentele…
mrnicegyu11 Aug 23, 2024
8617296
more merged
mrnicegyu11 Aug 23, 2024
5ff0d0d
fix pylint
mrnicegyu11 Aug 23, 2024
877adf8
mypy fixes
mrnicegyu11 Aug 23, 2024
b5fe0cc
Merge remote-tracking branch 'upstream/master' into 2024/add/opentele…
mrnicegyu11 Aug 28, 2024
7607557
Merge remote-tracking branch 'upstream/master' into 2024/add/opentele…
mrnicegyu11 Aug 28, 2024
60012b8
mess with requirements
mrnicegyu11 Aug 28, 2024
741a38f
Revert githk changes
mrnicegyu11 Aug 28, 2024
35bd52c
reverted reqs
mrnicegyu11 Aug 28, 2024
2063786
opent reqs in servicelibrary
mrnicegyu11 Aug 28, 2024
6bb30c7
upgraded sericelib
mrnicegyu11 Aug 28, 2024
0c7ca25
upgraded downstream
mrnicegyu11 Aug 28, 2024
92111ec
gateway server missing dpendency
mrnicegyu11 Aug 28, 2024
97736e2
mypy fixes
mrnicegyu11 Aug 28, 2024
f7f2172
FIXME: mess with redis test for lock parallel acquistion
mrnicegyu11 Aug 28, 2024
d5f16fb
Merge remote-tracking branch 'upstream/master' into 2024/add/opentele…
mrnicegyu11 Aug 29, 2024
3d91103
Revert not needed change
mrnicegyu11 Aug 29, 2024
23835b5
Add clarifications
mrnicegyu11 Aug 29, 2024
1b42240
Add FIXME for @Githk
mrnicegyu11 Aug 29, 2024
6a7eb0a
Merge remote-tracking branch 'upstream/master' into 2024/add/opentele…
mrnicegyu11 Sep 2, 2024
3fb46df
Update packages/service-library/src/servicelib/aiohttp/tracing.py
mrnicegyu11 Sep 2, 2024
a400e03
Remove otel in favor of long opentelemetry spelling
mrnicegyu11 Sep 2, 2024
ba60f99
Adjustments comments @sanderegg
mrnicegyu11 Sep 2, 2024
8873d65
Removed line
mrnicegyu11 Sep 2, 2024
f01c7fe
revert alphabetical sorting @sanderegg
mrnicegyu11 Sep 2, 2024
3fcaae0
Add rudamentary option to instrumentaiopg or not @sanderegg
mrnicegyu11 Sep 2, 2024
c3fd0f5
Merge remote-tracking branch 'upstream/master' into 2024/add/opentele…
mrnicegyu11 Sep 3, 2024
16fb4e5
Update packages/service-library/tests/fastapi/test_tracing.py
mrnicegyu11 Sep 3, 2024
b9822e9
Update packages/service-library/tests/fastapi/test_tracing.py
mrnicegyu11 Sep 3, 2024
cfa91b2
@sanderegg pytest improvement suggestions [untested]
mrnicegyu11 Sep 3, 2024
f843d44
@pcrespov remove director-v0 tracing
mrnicegyu11 Sep 3, 2024
fbb7201
@sanderegg change appname for appname
mrnicegyu11 Sep 3, 2024
5575896
@sanderegg change app_name to app_name
mrnicegyu11 Sep 3, 2024
eed2c5d
@githk try to adress test_lock_acquired_in_parallel_to_update_same_re…
mrnicegyu11 Sep 3, 2024
a638cb8
Merge remote-tracking branch 'upstream/master' into 2024/add/opentele…
mrnicegyu11 Sep 3, 2024
2042b44
Update packages/service-library/src/servicelib/aiohttp/tracing.py
mrnicegyu11 Sep 3, 2024
0f03936
Update packages/service-library/src/servicelib/fastapi/tracing.py
mrnicegyu11 Sep 3, 2024
91afc17
Change loglevel (minor @githk)
mrnicegyu11 Sep 3, 2024
737d7c1
Change loglevel (minor @githk)
mrnicegyu11 Sep 3, 2024
80a2ffd
Refactoring setup_tracing functions of fastapi and aiohttp to be simi…
mrnicegyu11 Sep 3, 2024
1b56e07
Merge remote-tracking branch 'upstream/master' into 2024/add/opentele…
mrnicegyu11 Sep 3, 2024
7d297a7
Merge remote-tracking branch 'upstream/master' into 2024/add/opentele…
mrnicegyu11 Sep 4, 2024
3d29fc5
Fix director-v0
mrnicegyu11 Sep 4, 2024
c9a37ce
t push
mrnicegyu11 Sep 4, 2024
662c6a9
Merge branch 'master' into 2024/add/opentelemetry
mrnicegyu11 Sep 4, 2024
9466086
Various fixes
mrnicegyu11 Sep 4, 2024
95c64be
some fixes
mrnicegyu11 Sep 4, 2024
bb9bce0
various fixes
mrnicegyu11 Sep 4, 2024
b166f82
Fix
mrnicegyu11 Sep 4, 2024
3078a31
Fix director-v2
mrnicegyu11 Sep 4, 2024
0f27979
fix
mrnicegyu11 Sep 4, 2024
2e54abd
Merge remote-tracking branch 'upstream/master' into 2024/add/opentele…
mrnicegyu11 Sep 9, 2024
1967247
refactor aiohttp tracing tests
mrnicegyu11 Sep 9, 2024
e51ae5c
Merge branch 'master' into 2024/add/opentelemetry
mrnicegyu11 Sep 9, 2024
484f9be
Merge branch 'master' into 2024/add/opentelemetry
mrnicegyu11 Sep 9, 2024
80cea4d
Merge branch 'master' into 2024/add/opentelemetry
mrnicegyu11 Sep 10, 2024
83fd091
Fix pytest
mrnicegyu11 Sep 10, 2024
3016199
⬆️ upgrades guvicorn dependencies in webserver (#6336)
pcrespov Sep 10, 2024
b519cbb
🎨 [Frontend] Folder & Workspaces: Missing features I (#6317)
odeimaiz Sep 10, 2024
cbbabec
🐛 [Frontend] Fix: Unique session id (#6335)
odeimaiz Sep 10, 2024
fe0d8a8
Merge branch 'master' into 2024/add/opentelemetry
mrnicegyu11 Sep 10, 2024
af4a922
Merge branch 'master' into 2024/add/opentelemetry
mrnicegyu11 Sep 10, 2024
42707f1
Merge remote-tracking branch 'upstream/master' into 2024/add/opentele…
mrnicegyu11 Sep 16, 2024
95cf760
Minors @sanderegg suggestions
mrnicegyu11 Sep 16, 2024
8ef4a04
Minors @sanderegg suggestions - 2
mrnicegyu11 Sep 16, 2024
8d451b5
Minors @sanderegg suggestions - 3
mrnicegyu11 Sep 16, 2024
b58a5c6
Merge remote-tracking branch 'upstream/master' into 2024/add/opentele…
mrnicegyu11 Sep 16, 2024
95ea845
Minors @sanderegg suggestions - 4
mrnicegyu11 Sep 16, 2024
eb4ba86
Merge branch 'master' into 2024/add/opentelemetry
mrnicegyu11 Sep 16, 2024
20a8b6d
Merge branch 'master' into 2024/add/opentelemetry
mrnicegyu11 Sep 16, 2024
e5e0a72
pylint disable
mrnicegyu11 Sep 17, 2024
ac301b5
fix
mrnicegyu11 Sep 17, 2024
b8239ca
Remove no needed test @sanderegg
mrnicegyu11 Sep 17, 2024
4f8c061
Merge branch 'master' into 2024/add/opentelemetry
mrnicegyu11 Sep 17, 2024
ddb62a5
Fix pytest
mrnicegyu11 Sep 17, 2024
01fdb3e
Merge branch 'master' into 2024/add/opentelemetry
mrnicegyu11 Sep 17, 2024
d8c7846
Fix faulty filename
mrnicegyu11 Sep 17, 2024
19b9ad4
Merge remote-tracking branch 'upstream/master' into 2024/add/opentele…
mrnicegyu11 Sep 17, 2024
fd98657
Remove old file
mrnicegyu11 Sep 17, 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
0 services/otel-collector-config.yaml → services/opentelemetry-collector-config.yaml
View file
Open in desktop
File renamed without changes.
Loading