Skip to content

move to userver v3.0 #1

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

Closed
botanegg wants to merge 1 commit into from
Closed

move to userver v3.0 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 3 additions & 7 deletions frameworks/userver/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
FROM ghcr.io/userver-framework/ubuntu-22.04-userver-pg AS builder

RUN apt update && \
apt install -y lsb-release wget software-properties-common gnupg && \
wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 16
FROM ghcr.io/userver-framework/ubuntu-24.04-userver-base AS builder

WORKDIR /src
RUN git clone https://github.com/userver-framework/userver.git && \
cd userver && git checkout bdd5e1e03921ff378b062f86a189c3cfa3d66332
cd userver && git checkout v3.0

COPY userver_benchmark/ ./
RUN mkdir build && cd build && \
Expand All @@ -15,7 +11,7 @@ RUN mkdir build && cd build && \
-DUSERVER_FEATURE_POSTGRESQL=1 \
-DUSERVER_FEATURE_ERASE_LOG_WITH_LEVEL=warning \
-DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-march=native" -DCMAKE_C_FLAGS="-march=native" \
-DCMAKE_CXX_COMPILER=clang++-16 -DCMAKE_C_COMPILER=clang-16 -DUSERVER_USE_LD=lld-16 \
-DCMAKE_CXX_COMPILER=clang++-17 -DCMAKE_C_COMPILER=clang-17 \
-DUSERVER_LTO=0 .. && \
make -j $(nproc)

Expand Down
2 changes: 1 addition & 1 deletion frameworks/userver/userver_benchmark/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.12)
project(userver_httparena CXX)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD 20)

file(GLOB_RECURSE SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/controllers/*.cpp
Expand Down
2 changes: 1 addition & 1 deletion frameworks/userver/userver_benchmark/userver_httparena.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class NoopTracingManager final

void FillRequestWithTracingContext(
const userver::tracing::Span&,
userver::clients::http::RequestTracingEditor) const final {}
userver::clients::http::MiddlewareRequest) const final {}

void FillResponseWithTracingContext(
const userver::tracing::Span&,
Expand Down
3 changes: 0 additions & 3 deletions frameworks/userver/userver_configs/static_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ components_manager:
level: ERROR
overflow_behavior: discard # Drop logs if the system is too busy to write them down.

tracer: # Component that helps to trace execution times and requests in logs.
service-name: userver-httparena # "You know. You all know exactly who I am. Say my name. " (c)

dns-client:
fs-task-processor: fs-task-processor

Expand Down