File tree Expand file tree Collapse file tree 4 files changed +20
-1
lines changed
exporter/opentelemetry-exporter-jaeger-proto-grpc
src/opentelemetry/exporter/jaeger/proto/grpc
opentelemetry-sdk/src/opentelemetry/sdk Expand file tree Collapse file tree 4 files changed +20
-1
lines changed Original file line number Diff line number Diff line change @@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
15
15
([ #2781 ] ( https://github.com/open-telemetry/opentelemetry-python/pull/2781 ) )
16
16
- Fix tracing decorator with late configuration
17
17
([ #2754 ] ( https://github.com/open-telemetry/opentelemetry-python/pull/2754 ) )
18
+ - Fix --insecure of CLI argument
19
+ ([ #2696 ] ( https://github.com/open-telemetry/opentelemetry-python/pull/2696 ) )
18
20
19
21
## [ 1.12.0rc2-0.32b0] ( https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.12.0rc2 ) - 2022-07-04
20
22
Original file line number Diff line number Diff line change 87
87
from opentelemetry .sdk .environment_variables import (
88
88
OTEL_EXPORTER_JAEGER_ENDPOINT ,
89
89
OTEL_EXPORTER_JAEGER_TIMEOUT ,
90
+ OTEL_EXPORTER_JAEGER_GRPC_INSECURE ,
90
91
)
91
92
from opentelemetry .sdk .resources import SERVICE_NAME , Resource
92
93
from opentelemetry .sdk .trace .export import SpanExporter , SpanExportResult
@@ -122,11 +123,17 @@ def __init__(
122
123
self .collector_endpoint = collector_endpoint or environ .get (
123
124
OTEL_EXPORTER_JAEGER_ENDPOINT , DEFAULT_GRPC_COLLECTOR_ENDPOINT
124
125
)
126
+ self .insecure = (
127
+ insecure
128
+ or environ .get (OTEL_EXPORTER_JAEGER_GRPC_INSECURE , "" )
129
+ .strip ()
130
+ .lower ()
131
+ == "true"
132
+ )
125
133
self ._timeout = timeout or int (
126
134
environ .get (OTEL_EXPORTER_JAEGER_TIMEOUT , DEFAULT_EXPORT_TIMEOUT )
127
135
)
128
136
self ._grpc_client = None
129
- self .insecure = insecure
130
137
self .credentials = util ._get_credentials (credentials )
131
138
tracer_provider = trace .get_tracer_provider ()
132
139
self .service_name = (
Original file line number Diff line number Diff line change 35
35
from opentelemetry .sdk .environment_variables import (
36
36
OTEL_EXPORTER_JAEGER_CERTIFICATE ,
37
37
OTEL_EXPORTER_JAEGER_ENDPOINT ,
38
+ OTEL_EXPORTER_JAEGER_GRPC_INSECURE ,
38
39
OTEL_EXPORTER_JAEGER_TIMEOUT ,
39
40
OTEL_RESOURCE_ATTRIBUTES ,
40
41
)
@@ -87,6 +88,7 @@ def test_constructor_by_environment_variables(self):
87
88
+ "/certs/cred.cert" ,
88
89
OTEL_RESOURCE_ATTRIBUTES : "service.name=my-opentelemetry-jaeger" ,
89
90
OTEL_EXPORTER_JAEGER_TIMEOUT : "5" ,
91
+ OTEL_EXPORTER_JAEGER_GRPC_INSECURE : "False" ,
90
92
},
91
93
)
92
94
@@ -99,6 +101,7 @@ def test_constructor_by_environment_variables(self):
99
101
self .assertEqual (exporter .collector_endpoint , collector_endpoint )
100
102
self .assertEqual (exporter ._timeout , 5 )
101
103
self .assertIsNotNone (exporter .credentials )
104
+ self .assertEqual (exporter .insecure , False )
102
105
env_patch .stop ()
103
106
104
107
# pylint: disable=too-many-locals,too-many-statements
Original file line number Diff line number Diff line change 435
435
``DELTA``: Choose ``DELTA`` aggregation temporality for ``Counter``, ``Asynchronous Counter`` and ``Histogram``.
436
436
Choose ``CUMULATIVE`` aggregation temporality for ``UpDownCounter`` and ``Asynchronous UpDownCounter``.
437
437
"""
438
+
439
+ OTEL_EXPORTER_JAEGER_GRPC_INSECURE = "OTEL_EXPORTER_JAEGER_GRPC_INSECURE"
440
+ """
441
+ .. envvar:: OTEL_EXPORTER_JAEGER_GRPC_INSECURE
442
+
443
+ The :envvar:`OTEL_EXPORTER_JAEGER_GRPC_INSECURE` is a boolean flag to True if collector has no encryption or authentication.
444
+ """
You can’t perform that action at this time.
0 commit comments