Skip to content

Commit 40faeea

Browse files
authored
fix: set_otel_libs_available() typo fix (#1773)
* otel typo fix * fix host PR template
1 parent a4c24b2 commit 40faeea

File tree

4 files changed

+63
-15
lines changed

4 files changed

+63
-15
lines changed

eng/templates/official/jobs/publish-release.yml

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ jobs:
151151
152152
**IMPORTANT**: Currently, changes must be backported to the `in-proc` branch to be included in Core Tools and non-Flex deployments.
153153
154-
* [ ] Backporting to the `in-proc` branch is not required
155-
* [x]Otherwise: Link to backporting PR
154+
* [x] Backporting to the `in-proc` branch is not required
155+
* [ ]Otherwise: Link to backporting PR
156156
* [x] My changes **do not** require documentation changes
157157
* [ ] Otherwise: Documentation issue linked to PR
158158
* [ ] My changes **should not** be added to the release notes for the next release
@@ -164,17 +164,30 @@ jobs:
164164
* [x] I have added all required tests (Unit tests, E2E tests)
165165
166166
"@
167-
168-
$body = (@{head="$newBranch";base="dev";body=$prTemplateContent;draft=$true;maintainer_can_modify=$true;title="Update Python Worker Version to $newWorkerVersion"} | ConvertTo-Json -Compress)$response = Invoke-WebRequest -Headers @{"Cache-Control"="no-cache";"Content-Type"="application/json";"Authorization"="Basic $credential";"Accept"="application/vnd.github.v3+json"} -Method Post -Body "$body" -Uri "https://api.github.com/repos/Azure/azure-functions-host/pulls"
169-
170-
# Return Value
171-
if ($response.StatusCode -ne 201) {
172-
Write-Host "Failed to create a PR in Azure Functions Host"
173-
exit -1
174-
}
175167
176-
$draftUrl = $response | ConvertFrom-Json | Select -expand url
177-
Write-Host "PR draft created in $draftUrl"
168+
# Create PR
169+
Write-Host "Creating PR draft in GitHub"
170+
$body = @{
171+
head = "$newBranch"
172+
base = "dev"
173+
title = "Update Python Worker Version to $newWorkerVersion"
174+
body = $prTemplateContent
175+
draft = $true
176+
maintainer_can_modify = $true
177+
} | ConvertTo-Json -Compress
178+
179+
$headers = @{
180+
"Authorization" = "Basic $credential"
181+
"Content-Type" = "application/json"
182+
"Accept" = "application/vnd.github.v3+json"
183+
"User-Agent" = "AzureDevOpsPipeline"
184+
"Cache-Control" = "no-cache"
185+
}
186+
187+
$response = Invoke-WebRequest -Headers $headers -Method Post -Body $body -Uri "https://api.github.com/repos/Azure/azure-functions-host/pulls"
188+
189+
$draftUrl = $response | ConvertFrom-Json | Select -expand url
190+
Write-Host "PR draft created in $draftUrl"
178191
displayName: 'Create Host PR for dev'
179192
180193
- job: "CheckHostPRs"

runtimes/v1/azure_functions_runtime_v1/otel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def get_azure_monitor_available(self):
2727
return self._azure_monitor_available
2828

2929
def set_otel_libs_available(self, otel_libs_available):
30-
self._aotel_libs_available = otel_libs_available
30+
self._otel_libs_available = otel_libs_available
3131

3232
def get_otel_libs_available(self):
3333
return self._otel_libs_available

runtimes/v2/azure_functions_runtime/otel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def get_azure_monitor_available(self):
2626
return self._azure_monitor_available
2727

2828
def set_otel_libs_available(self, otel_libs_available):
29-
self._aotel_libs_available = otel_libs_available
29+
self._otel_libs_available = otel_libs_available
3030

3131
def get_otel_libs_available(self):
3232
return self._otel_libs_available

runtimes/v2/tests/unittests/test_opentelemetry.py

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66

77
from azure_functions_runtime.handle_event import otel_manager, worker_init_request
88
from azure_functions_runtime.otel import (initialize_azure_monitor,
9-
update_opentelemetry_status)
9+
update_opentelemetry_status,
10+
OTelManager)
1011
from azure_functions_runtime.logging import logger
1112
from tests.utils.constants import UNIT_TESTS_FOLDER
1213
from tests.utils.mock_classes import FunctionRequest, Request, WorkerRequest
@@ -207,3 +208,37 @@ async def test_init_request_enable_azure_monitor_disabled_app_setting(
207208
# Verify that WorkerOpenTelemetryEnabled capability is not set
208209
capabilities = init_response.capabilities
209210
self.assertNotIn("WorkerOpenTelemetryEnabled", capabilities)
211+
212+
213+
class TestOTelManager(unittest.TestCase):
214+
215+
def setUp(self):
216+
self.manager = OTelManager()
217+
218+
def test_default_values(self):
219+
self.assertFalse(self.manager.get_azure_monitor_available())
220+
self.assertFalse(self.manager.get_otel_libs_available())
221+
self.assertIsNone(self.manager.get_context_api())
222+
self.assertIsNone(self.manager.get_trace_context_propagator())
223+
224+
def test_set_and_get_azure_monitor_available(self):
225+
self.manager.set_azure_monitor_available(True)
226+
self.assertTrue(self.manager.get_azure_monitor_available())
227+
self.manager.set_azure_monitor_available(False)
228+
self.assertFalse(self.manager.get_azure_monitor_available())
229+
230+
def test_set_and_get_otel_libs_available(self):
231+
self.manager.set_otel_libs_available(True)
232+
self.assertTrue(self.manager.get_otel_libs_available())
233+
self.manager.set_otel_libs_available(False)
234+
self.assertFalse(self.manager.get_otel_libs_available())
235+
236+
def test_set_and_get_context_api(self):
237+
dummy_api = object()
238+
self.manager.set_context_api(dummy_api)
239+
self.assertIs(self.manager.get_context_api(), dummy_api)
240+
241+
def test_set_and_get_trace_context_propagator(self):
242+
dummy_propagator = object()
243+
self.manager.set_trace_context_propagator(dummy_propagator)
244+
self.assertIs(self.manager.get_trace_context_propagator(), dummy_propagator)

0 commit comments

Comments
 (0)