Skip to content

Commit 052bfb3

Browse files
committed
for 3.13, log sdk version
1 parent 470827b commit 052bfb3

File tree

5 files changed

+36
-5
lines changed

5 files changed

+36
-5
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,3 +132,8 @@ prof/
132132
tests/**/host.json
133133
tests/**/bin
134134
tests/**/extensions.csproj
135+
136+
# Azurite related files
137+
__blobstorage__/*
138+
__queuestorage__/*
139+
__azurite*

azure_functions_worker_v2/azure_functions_worker_v2/bindings/meta.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
HTTP,
1717
HTTP_TRIGGER,
1818
)
19+
from ..utils.helpers import set_sdk_version
1920

2021

2122
PB_TYPE = 'rpc_data'
@@ -59,13 +60,15 @@ def load_binding_registry() -> None:
5960
not found, it loads the builtin. If the BINDING_REGISTRY is None,
6061
azure-functions hasn't been loaded in properly.
6162
62-
Tries to load the base extension only for python 3.8+.
63+
Tries to load the base extension.
6364
"""
6465

6566
func = sys.modules.get('azure.functions')
6667

6768
if func is None:
6869
import azure.functions as func
70+
71+
set_sdk_version(func.__version__) # type: ignore
6972

7073
global BINDING_REGISTRY
7174
BINDING_REGISTRY = func.get_binding_registry() # type: ignore

azure_functions_worker_v2/azure_functions_worker_v2/handle_event.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
WORKER_OPEN_TELEMETRY_ENABLED,
4848
WORKER_STATUS)
4949
from .utils.executor import get_current_loop, execute_async, run_sync_func
50-
from .utils.helpers import change_cwd, get_worker_metadata
50+
from .utils.helpers import change_cwd, get_sdk_version, get_worker_metadata
5151
from .utils.tracing import serialize_exception, serialize_exception_as_str
5252
from .utils.validators import validate_script_file_name
5353

@@ -128,8 +128,9 @@ async def worker_init_request(request):
128128
async def functions_metadata_request(request):
129129
global protos, _metadata_result, _metadata_exception
130130
logger.debug("V2 Library Worker: received WorkerMetadataRequest."
131-
" Metadata Result: %s, Metadata Exception: %s",
132-
_metadata_result, _metadata_exception)
131+
" Metadata Result: %s, Metadata Exception: %s,"
132+
" azure-functions version: %s",
133+
_metadata_result, _metadata_exception, get_sdk_version())
133134

134135
if _metadata_exception:
135136
return protos.FunctionMetadataResponse(

azure_functions_worker_v2/azure_functions_worker_v2/utils/helpers.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,19 @@
99
from ..logging import logger
1010
from ..version import VERSION
1111

12+
sdk_version: str = "0.0.0"
13+
14+
15+
def set_sdk_version(version: str):
16+
"""Set the SDK version."""
17+
global sdk_version
18+
sdk_version = version
19+
20+
21+
def get_sdk_version() -> str:
22+
"""Get the SDK version."""
23+
return sdk_version
24+
1225

1326
def change_cwd(new_cwd: str):
1427
if os.path.exists(new_cwd):

azure_functions_worker_v2/tests/unittests/test_utilities.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
import unittest
77
from unittest.mock import patch
88

9-
from azure_functions_worker_v2.utils import app_setting_manager, validators, wrappers
9+
from azure_functions_worker_v2.utils import (app_setting_manager,
10+
helpers,
11+
validators,
12+
wrappers)
1013

1114
TEST_APP_SETTING_NAME = "TEST_APP_SETTING_NAME"
1215
TEST_FEATURE_FLAG = "APP_SETTING_FEATURE_FLAG"
@@ -319,6 +322,12 @@ def test_invalid_script_file_name(self):
319322
file_name = 'test'
320323
with self.assertRaises(validators.InvalidFileNameError):
321324
validators.validate_script_file_name(file_name)
325+
326+
def test_set_get_sdk_version(self):
327+
test_version = '1.2.3'
328+
helpers.set_sdk_version(test_version)
329+
self.assertEqual(helpers.get_sdk_version(), test_version)
330+
322331

323332
def _unset_feature_flag(self):
324333
try:

0 commit comments

Comments
 (0)