Skip to content

Commit d4490fa

Browse files
aabmassaabmass
authored
Merge branch 'main' into fix-batchlogprocessor-gc
2 parents d78bebb + 7090f38 commit d4490fa

File tree

10 files changed

+611
-934
lines changed

10 files changed

+611
-934
lines changed

‎.github/workflows/ossf-scorecard.yml

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: OSSF Scorecard
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
schedule:
8+
- cron: "16 11 * * 4" # once a week
9+
workflow_dispatch:
10+
11+
permissions: read-all
12+
13+
jobs:
14+
analysis:
15+
runs-on: ubuntu-latest
16+
permissions:
17+
# Needed for Code scanning upload
18+
security-events: write
19+
# Needed for GitHub OIDC token if publish_results is true
20+
id-token: write
21+
steps:
22+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
23+
with:
24+
persist-credentials: false
25+
26+
- uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
27+
with:
28+
results_file: results.sarif
29+
results_format: sarif
30+
publish_results: true
31+
32+
# Upload the results as artifacts (optional). Commenting out will disable
33+
# uploads of run results in SARIF format to the repository Actions tab.
34+
# https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
35+
- name: "Upload artifact"
36+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
37+
with:
38+
name: SARIF file
39+
path: results.sarif
40+
retention-days: 5
41+
42+
# Upload the results to GitHub's code scanning dashboard (optional).
43+
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
44+
- name: "Upload to code-scanning"
45+
uses: github/codeql-action/upload-sarif@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
46+
with:
47+
sarif_file: results.sarif

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1717
([#4494](https://github.com/open-telemetry/opentelemetry-python/pull/4494))
1818
- Improve CI by cancelling stale runs and setting timeouts
1919
([#4498](https://github.com/open-telemetry/opentelemetry-python/pull/4498))
20+
- Patch logging.basicConfig so OTel logs don't cause console logs to disappear
21+
([#4436](https://github.com/open-telemetry/opentelemetry-python/pull/4436))
22+
- Fix ExplicitBucketHistogramAggregation to handle multiple explicit bucket boundaries advisories
23+
([#4521](https://github.com/open-telemetry/opentelemetry-python/pull/4521))
2024

2125
## Version 1.31.0/0.52b0 (2025-03-12)
2226

‎exporter/opentelemetry-exporter-otlp-proto-grpc/tests/logs/test_otlp_logs_exporter.py

+1-210
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,20 @@
1515
# pylint: disable=too-many-lines
1616

1717
import time
18-
from concurrent.futures import ThreadPoolExecutor
1918
from os.path import dirname
2019
from unittest import TestCase
2120
from unittest.mock import patch
2221

23-
from google.protobuf.duration_pb2 import ( # pylint: disable=no-name-in-module
24-
Duration,
25-
)
2622
from google.protobuf.json_format import MessageToDict
27-
from google.rpc.error_details_pb2 import ( # pylint: disable=no-name-in-module
28-
RetryInfo,
29-
)
30-
from grpc import ChannelCredentials, Compression, StatusCode, server
23+
from grpc import ChannelCredentials, Compression
3124

3225
from opentelemetry._logs import SeverityNumber
3326
from opentelemetry.exporter.otlp.proto.common._internal import _encode_value
3427
from opentelemetry.exporter.otlp.proto.grpc._log_exporter import (
3528
OTLPLogExporter,
3629
)
37-
from opentelemetry.exporter.otlp.proto.grpc.version import __version__
3830
from opentelemetry.proto.collector.logs.v1.logs_service_pb2 import (
3931
ExportLogsServiceRequest,
40-
ExportLogsServiceResponse,
41-
)
42-
from opentelemetry.proto.collector.logs.v1.logs_service_pb2_grpc import (
43-
LogsServiceServicer,
44-
add_LogsServiceServicer_to_server,
4532
)
4633
from opentelemetry.proto.common.v1.common_pb2 import AnyValue, KeyValue
4734
from opentelemetry.proto.common.v1.common_pb2 import (
@@ -53,7 +40,6 @@
5340
Resource as OTLPResource,
5441
)
5542
from opentelemetry.sdk._logs import LogData, LogRecord
56-
from opentelemetry.sdk._logs.export import LogExportResult
5743
from opentelemetry.sdk.environment_variables import (
5844
OTEL_EXPORTER_OTLP_LOGS_CERTIFICATE,
5945
OTEL_EXPORTER_OTLP_LOGS_CLIENT_CERTIFICATE,
@@ -70,62 +56,9 @@
7056
THIS_DIR = dirname(__file__)
7157

7258

73-
class LogsServiceServicerUNAVAILABLEDelay(LogsServiceServicer):
74-
# pylint: disable=invalid-name,unused-argument,no-self-use
75-
def Export(self, request, context):
76-
context.set_code(StatusCode.UNAVAILABLE)
77-
78-
context.send_initial_metadata(
79-
(("google.rpc.retryinfo-bin", RetryInfo().SerializeToString()),)
80-
)
81-
context.set_trailing_metadata(
82-
(
83-
(
84-
"google.rpc.retryinfo-bin",
85-
RetryInfo(
86-
retry_delay=Duration(nanos=int(1e7))
87-
).SerializeToString(),
88-
),
89-
)
90-
)
91-
92-
return ExportLogsServiceResponse()
93-
94-
95-
class LogsServiceServicerUNAVAILABLE(LogsServiceServicer):
96-
# pylint: disable=invalid-name,unused-argument,no-self-use
97-
def Export(self, request, context):
98-
context.set_code(StatusCode.UNAVAILABLE)
99-
100-
return ExportLogsServiceResponse()
101-
102-
103-
class LogsServiceServicerSUCCESS(LogsServiceServicer):
104-
# pylint: disable=invalid-name,unused-argument,no-self-use
105-
def Export(self, request, context):
106-
context.set_code(StatusCode.OK)
107-
108-
return ExportLogsServiceResponse()
109-
110-
111-
class LogsServiceServicerALREADY_EXISTS(LogsServiceServicer):
112-
# pylint: disable=invalid-name,unused-argument,no-self-use
113-
def Export(self, request, context):
114-
context.set_code(StatusCode.ALREADY_EXISTS)
115-
116-
return ExportLogsServiceResponse()
117-
118-
11959
class TestOTLPLogExporter(TestCase):
12060
def setUp(self):
12161
self.exporter = OTLPLogExporter()
122-
123-
self.server = server(ThreadPoolExecutor(max_workers=10))
124-
125-
self.server.add_insecure_port("127.0.0.1:4317")
126-
127-
self.server.start()
128-
12962
self.log_data_1 = LogData(
13063
log_record=LogRecord(
13164
timestamp=int(time.time() * 1e9),
@@ -204,9 +137,6 @@ def setUp(self):
204137
),
205138
)
206139

207-
def tearDown(self):
208-
self.server.stop(None)
209-
210140
def test_exporting(self):
211141
# pylint: disable=protected-access
212142
self.assertEqual(self.exporter._exporting, "logs")
@@ -296,145 +226,6 @@ def test_env_variables_with_only_certificate(
296226

297227
mock_logger_error.assert_not_called()
298228

299-
@patch(
300-
"opentelemetry.exporter.otlp.proto.grpc.exporter.ssl_channel_credentials"
301-
)
302-
@patch("opentelemetry.exporter.otlp.proto.grpc.exporter.secure_channel")
303-
@patch(
304-
"opentelemetry.exporter.otlp.proto.grpc._log_exporter.OTLPLogExporter._stub"
305-
)
306-
# pylint: disable=unused-argument
307-
def test_no_credentials_error(
308-
self, mock_ssl_channel, mock_secure, mock_stub
309-
):
310-
OTLPLogExporter(insecure=False)
311-
self.assertTrue(mock_ssl_channel.called)
312-
313-
# pylint: disable=no-self-use
314-
@patch("opentelemetry.exporter.otlp.proto.grpc.exporter.insecure_channel")
315-
@patch("opentelemetry.exporter.otlp.proto.grpc.exporter.secure_channel")
316-
def test_otlp_exporter_endpoint(self, mock_secure, mock_insecure):
317-
expected_endpoint = "localhost:4317"
318-
endpoints = [
319-
(
320-
"http://localhost:4317",
321-
None,
322-
mock_insecure,
323-
),
324-
(
325-
"localhost:4317",
326-
None,
327-
mock_secure,
328-
),
329-
(
330-
"http://localhost:4317",
331-
True,
332-
mock_insecure,
333-
),
334-
(
335-
"localhost:4317",
336-
True,
337-
mock_insecure,
338-
),
339-
(
340-
"http://localhost:4317",
341-
False,
342-
mock_secure,
343-
),
344-
(
345-
"localhost:4317",
346-
False,
347-
mock_secure,
348-
),
349-
(
350-
"https://localhost:4317",
351-
False,
352-
mock_secure,
353-
),
354-
(
355-
"https://localhost:4317",
356-
None,
357-
mock_secure,
358-
),
359-
(
360-
"https://localhost:4317",
361-
True,
362-
mock_secure,
363-
),
364-
]
365-
366-
# pylint: disable=C0209
367-
for endpoint, insecure, mock_method in endpoints:
368-
OTLPLogExporter(endpoint=endpoint, insecure=insecure)
369-
self.assertEqual(
370-
1,
371-
mock_method.call_count,
372-
"expected {} to be called for {} {}".format(
373-
mock_method, endpoint, insecure
374-
),
375-
)
376-
self.assertEqual(
377-
expected_endpoint,
378-
mock_method.call_args[0][0],
379-
"expected {} got {} {}".format(
380-
expected_endpoint, mock_method.call_args[0][0], endpoint
381-
),
382-
)
383-
mock_method.reset_mock()
384-
385-
def test_otlp_headers_from_env(self):
386-
# pylint: disable=protected-access
387-
self.assertEqual(
388-
self.exporter._headers,
389-
(("user-agent", "OTel-OTLP-Exporter-Python/" + __version__),),
390-
)
391-
392-
@patch(
393-
"opentelemetry.exporter.otlp.proto.grpc.exporter._create_exp_backoff_generator"
394-
)
395-
@patch("opentelemetry.exporter.otlp.proto.grpc.exporter.sleep")
396-
def test_unavailable(self, mock_sleep, mock_expo):
397-
mock_expo.configure_mock(**{"return_value": [0.01]})
398-
399-
add_LogsServiceServicer_to_server(
400-
LogsServiceServicerUNAVAILABLE(), self.server
401-
)
402-
self.assertEqual(
403-
self.exporter.export([self.log_data_1]), LogExportResult.FAILURE
404-
)
405-
mock_sleep.assert_called_with(0.01)
406-
407-
@patch(
408-
"opentelemetry.exporter.otlp.proto.grpc.exporter._create_exp_backoff_generator"
409-
)
410-
@patch("opentelemetry.exporter.otlp.proto.grpc.exporter.sleep")
411-
def test_unavailable_delay(self, mock_sleep, mock_expo):
412-
mock_expo.configure_mock(**{"return_value": [1]})
413-
414-
add_LogsServiceServicer_to_server(
415-
LogsServiceServicerUNAVAILABLEDelay(), self.server
416-
)
417-
self.assertEqual(
418-
self.exporter.export([self.log_data_1]), LogExportResult.FAILURE
419-
)
420-
mock_sleep.assert_called_with(0.01)
421-
422-
def test_success(self):
423-
add_LogsServiceServicer_to_server(
424-
LogsServiceServicerSUCCESS(), self.server
425-
)
426-
self.assertEqual(
427-
self.exporter.export([self.log_data_1]), LogExportResult.SUCCESS
428-
)
429-
430-
def test_failure(self):
431-
add_LogsServiceServicer_to_server(
432-
LogsServiceServicerALREADY_EXISTS(), self.server
433-
)
434-
self.assertEqual(
435-
self.exporter.export([self.log_data_1]), LogExportResult.FAILURE
436-
)
437-
438229
def export_log_and_deserialize(self, log_data):
439230
# pylint: disable=protected-access
440231
translated_data = self.exporter._translate_data([log_data])

0 commit comments

Comments
 (0)