@@ -125,19 +125,19 @@ echo "::endgroup::"
125125echo " ::group::Build Collector Configuration and Reconfigure"
126126backup_otel_exporter_otlp_traces_endpoint=" ${OTEL_EXPORTER_OTLP_TRACES_ENDPOINT:- ${OTEL_EXPORTER_OTLP_ENDPOINT:- } } "
127127case " ${OTEL_LOGS_EXPORTER:- otlp} " in
128- otlp) if [ " ${OTEL_EXPORTER_OTLP_LOGS_PROTOCOL:- ${OTEL_EXPORTER_OTLP_PROTOCOL:- http/ protobuf} } " = http/protobuf ] || [ " ${OTEL_EXPORTER_OTLP_LOGS_PROTOCOL:- ${OTEL_EXPORTER_OTLP_PROTOCOL:- http/ protobuf} } " = http/json ]; then collector_logs_exporter=otlphttp /logs; else collector_logs_exporter=otlp/logs; fi ;;
128+ otlp) if [ " ${OTEL_EXPORTER_OTLP_LOGS_PROTOCOL:- ${OTEL_EXPORTER_OTLP_PROTOCOL:- http/ protobuf} } " = http/protobuf ] || [ " ${OTEL_EXPORTER_OTLP_LOGS_PROTOCOL:- ${OTEL_EXPORTER_OTLP_PROTOCOL:- http/ protobuf} } " = http/json ]; then collector_logs_exporter=otlp_http /logs; else collector_logs_exporter=otlp/logs; fi ;;
129129 console) collector_logs_exporter=debug;;
130130 none) collector_logs_exporter=nop;;
131131 * ) echo ::error::Unsupported logs exporter: " ${OTEL_LOGS_EXPORTER:- otlp} " && exit 1;;
132132esac
133133case " ${OTEL_METRICS_EXPORTER:- otlp} " in
134- otlp) if [ " ${OTEL_EXPORTER_OTLP_METRICS_PROTOCOL:- ${OTEL_EXPORTER_OTLP_PROTOCOL:- http/ protobuf} } " = http/protobuf ] || [ " ${OTEL_EXPORTER_OTLP_METRICS_PROTOCOL:- ${OTEL_EXPORTER_OTLP_PROTOCOL:- http/ protobuf} } " = http/json ]; then collector_metrics_exporter=otlphttp /metrics; else collector_metrics_exporter=otlp/metrics; fi ;;
134+ otlp) if [ " ${OTEL_EXPORTER_OTLP_METRICS_PROTOCOL:- ${OTEL_EXPORTER_OTLP_PROTOCOL:- http/ protobuf} } " = http/protobuf ] || [ " ${OTEL_EXPORTER_OTLP_METRICS_PROTOCOL:- ${OTEL_EXPORTER_OTLP_PROTOCOL:- http/ protobuf} } " = http/json ]; then collector_metrics_exporter=otlp_http /metrics; else collector_metrics_exporter=otlp/metrics; fi ;;
135135 console) collector_metrics_exporter=debug;;
136136 none) collector_metrics_exporter=nop;;
137137 * ) echo ::error::Unsupported metrics exporter: " ${OTEL_METRICS_EXPORTER:- otlp} " && exit 1;;
138138esac
139139case " ${OTEL_TRACES_EXPORTER:- otlp} " in
140- otlp) if [ " ${OTEL_EXPORTER_OTLP_TRACES_PROTOCOL:- ${OTEL_EXPORTER_OTLP_PROTOCOL:- http/ protobuf} } " = http/protobuf ] || [ " ${OTEL_EXPORTER_OTLP_TRACES_PROTOCOL:- ${OTEL_EXPORTER_OTLP_PROTOCOL:- http/ protobuf} } " = http/json ]; then collector_traces_exporter=otlphttp /traces; else collector_traces_exporter=otlp/traces; fi ;;
140+ otlp) if [ " ${OTEL_EXPORTER_OTLP_TRACES_PROTOCOL:- ${OTEL_EXPORTER_OTLP_PROTOCOL:- http/ protobuf} } " = http/protobuf ] || [ " ${OTEL_EXPORTER_OTLP_TRACES_PROTOCOL:- ${OTEL_EXPORTER_OTLP_PROTOCOL:- http/ protobuf} } " = http/json ]; then collector_traces_exporter=otlp_http /traces; else collector_traces_exporter=otlp/traces; fi ;;
141141 console) collector_traces_exporter=debug;;
142142 none) collector_traces_exporter=nop;;
143143 * ) echo ::error::Unsupported traces exporter: " ${OTEL_TRACES_EXPORTER:- otlp} " && exit 1;;
@@ -177,19 +177,19 @@ $(echo "$OTEL_EXPORTER_OTLP_HEADERS","$OTEL_EXPORTER_OTLP_METRICS_HEADERS" | tr
177177 endpoint: ${OTEL_EXPORTER_OTLP_ENDPOINT:- ${OTEL_EXPORTER_OTLP_TRACES_ENDPOINT%/ v1/ traces} }
178178 headers:
179179$( echo " $OTEL_EXPORTER_OTLP_HEADERS " ," $OTEL_EXPORTER_OTLP_TRACES_HEADERS " | tr ' ,' ' \n' | grep -v ' ^$' | sed ' s/=/: /g' | sed ' s/^/ /g' )
180- otlphttp /logs:
180+ otlp_http /logs:
181181 endpoint: ${OTEL_EXPORTER_OTLP_ENDPOINT:- ${OTEL_EXPORTER_OTLP_LOGS_ENDPOINT%/ v1/ logs} }
182182 $( [ -z " ${OTEL_EXPORTER_OTLP_LOGS_ENDPOINT:- } " ] || echo " logs_endpoint: $OTEL_EXPORTER_OTLP_LOGS_ENDPOINT " )
183183 headers:
184184$( echo " $OTEL_EXPORTER_OTLP_HEADERS " ," $OTEL_EXPORTER_OTLP_LOGS_HEADERS " | tr ' ,' ' \n' | grep -v ' ^$' | sed ' s/=/: /g' | sed ' s/^/ /g' )
185185 encoding: $( [ " ${OTEL_EXPORTER_OTLP_LOGS_PROTOCOL:- ${OTEL_EXPORTER_OTLP_PROTOCOL:- http/ protobuf} } " = http/json ] && echo json || echo proto)
186- otlphttp /metrics:
186+ otlp_http /metrics:
187187 endpoint: ${OTEL_EXPORTER_OTLP_ENDPOINT:- ${OTEL_EXPORTER_OTLP_METRICS_ENDPOINT%/ v1/ metrics} }
188188 $( [ -z " ${OTEL_EXPORTER_OTLP_METRICS_ENDPOINT:- } " ] || echo " metrics_endpoint: $OTEL_EXPORTER_OTLP_METRICS_ENDPOINT " )
189189 headers:
190190$( echo " $OTEL_EXPORTER_OTLP_HEADERS " ," $OTEL_EXPORTER_OTLP_METRICS_HEADERS " | tr ' ,' ' \n' | grep -v ' ^$' | sed ' s/=/: /g' | sed ' s/^/ /g' )
191191 encoding: $( [ " ${OTEL_EXPORTER_OTLP_METRICS_PROTOCOL:- ${OTEL_EXPORTER_OTLP_PROTOCOL:- http/ protobuf} } " = http/json ] && echo json || echo proto)
192- otlphttp /traces:
192+ otlp_http /traces:
193193 endpoint: ${OTEL_EXPORTER_OTLP_ENDPOINT:- ${OTEL_EXPORTER_OTLP_TRACES_ENDPOINT%/ v1/ traces} }
194194 $( [ -z " ${OTEL_EXPORTER_OTLP_TRACES_ENDPOINT:- } " ] || echo " traces_endpoint: $OTEL_EXPORTER_OTLP_TRACES_ENDPOINT " )
195195 headers:
0 commit comments