File tree Expand file tree Collapse file tree 1 file changed +6
-8
lines changed
lib/solarwinds_apm/support Expand file tree Collapse file tree 1 file changed +6
-8
lines changed Original file line number Diff line number Diff line change @@ -76,7 +76,7 @@ def config_token(data_type)
76
76
# for case 10 and 11
77
77
agent_enable = !ENV [ 'SW_APM_API_TOKEN' ] . nil?
78
78
else
79
- token_type = if ENV [ "OTEL_EXPORTER_OTLP_#{ data_type_upper } _HEADERS" ]
79
+ token_source = if ENV [ "OTEL_EXPORTER_OTLP_#{ data_type_upper } _HEADERS" ]
80
80
"#{ data_type } _token"
81
81
elsif ENV [ 'OTEL_EXPORTER_OTLP_HEADERS' ]
82
82
'general_token'
@@ -86,22 +86,20 @@ def config_token(data_type)
86
86
'invalid'
87
87
end
88
88
89
- case token_type
90
- when "#{ data_type } _token" || 'general_token'
91
- # exporter header is ok, but still need extract it for sampler http get setting
92
- headers = token_type == 'general_token' ? ENV . fetch ( 'OTEL_EXPORTER_OTLP_HEADERS' , nil ) : ENV . fetch ( "OTEL_EXPORTER_OTLP_#{ data_type_upper } _HEADERS" , nil )
93
- @token = headers . gsub ( 'authorization=Bearer ' , '' )
94
- when 'service_key'
89
+ SolarWindsAPM . logger . debug { "[#{ self . class } /#{ __method__ } ] token source: #{ token_source } " }
90
+
91
+ if token_source == 'service_key'
95
92
if valid? ( ENV [ 'SW_APM_SERVICE_KEY' ] )
96
93
@token , @service_name = ENV [ 'SW_APM_SERVICE_KEY' ] . to_s . split ( ':' )
97
94
else
95
+ token_source = 'invalid'
98
96
SolarWindsAPM . logger . warn { "SW_APM_SERVICE_KEY is invalid: #{ mask_token ( ENV [ 'SW_APM_SERVICE_KEY' ] ) } " }
99
97
end
100
98
101
99
ENV [ 'OTEL_EXPORTER_OTLP_HEADERS' ] = "authorization=Bearer #{ @token } "
102
100
end
103
101
104
- agent_enable = token_type != 'invalid'
102
+ agent_enable = token_source != 'invalid'
105
103
end
106
104
107
105
@agent_enable = agent_enable
You can’t perform that action at this time.
0 commit comments