WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 77fbfb0

Browse files
committed
fix remaining tests
1 parent 18b680f commit 77fbfb0

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

lib/datadog/core/telemetry/event/app_started.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,13 @@ def configuration(settings, agent_settings)
162162
# OpenTelemetry configuration options (using environment variable names)
163163
list.push(
164164
conf_value('OTEL_EXPORTER_OTLP_ENDPOINT', settings.opentelemetry.exporter.endpoint, seq_id, get_telemetry_origin(settings, 'opentelemetry.exporter.endpoint')),
165-
conf_value('OTEL_EXPORTER_OTLP_HEADERS', to_value(settings.opentelemetry.exporter.headers), seq_id, get_telemetry_origin(settings, 'opentelemetry.exporter.headers')),
165+
conf_value('OTEL_EXPORTER_OTLP_HEADERS', DATADOG_ENV['OTEL_EXPORTER_OTLP_HEADERS'] || '', seq_id, get_telemetry_origin(settings, 'opentelemetry.exporter.headers')),
166166
conf_value('OTEL_EXPORTER_OTLP_PROTOCOL', settings.opentelemetry.exporter.protocol, seq_id, get_telemetry_origin(settings, 'opentelemetry.exporter.protocol')),
167167
conf_value('OTEL_EXPORTER_OTLP_TIMEOUT', settings.opentelemetry.exporter.timeout_millis, seq_id, get_telemetry_origin(settings, 'opentelemetry.exporter.timeout_millis')),
168168
conf_value('DD_METRICS_OTEL_ENABLED', settings.opentelemetry.metrics.enabled, seq_id, get_telemetry_origin(settings, 'opentelemetry.metrics.enabled')),
169169
conf_value('OTEL_METRICS_EXPORTER', settings.opentelemetry.metrics.exporter, seq_id, get_telemetry_origin(settings, 'opentelemetry.metrics.exporter')),
170170
conf_value('OTEL_EXPORTER_OTLP_METRICS_ENDPOINT', settings.opentelemetry.metrics.endpoint, seq_id, get_telemetry_origin(settings, 'opentelemetry.metrics.endpoint')),
171-
conf_value('OTEL_EXPORTER_OTLP_METRICS_HEADERS', to_value(settings.opentelemetry.metrics.headers), seq_id, get_telemetry_origin(settings, 'opentelemetry.metrics.headers')),
171+
conf_value('OTEL_EXPORTER_OTLP_METRICS_HEADERS', DATADOG_ENV['OTEL_EXPORTER_OTLP_METRICS_HEADERS'] || '', seq_id, get_telemetry_origin(settings, 'opentelemetry.metrics.headers')),
172172
conf_value('OTEL_EXPORTER_OTLP_METRICS_PROTOCOL', settings.opentelemetry.metrics.protocol, seq_id, get_telemetry_origin(settings, 'opentelemetry.metrics.protocol')),
173173
conf_value('OTEL_EXPORTER_OTLP_METRICS_TIMEOUT', settings.opentelemetry.metrics.timeout_millis, seq_id, get_telemetry_origin(settings, 'opentelemetry.metrics.timeout_millis')),
174174
conf_value('OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE', settings.opentelemetry.metrics.temporality_preference, seq_id, get_telemetry_origin(settings, 'opentelemetry.metrics.temporality_preference')),

lib/datadog/opentelemetry/configuration/settings.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def self.add_settings!(base)
140140
option :timeout_millis do |o|
141141
o.type :int, nilable: true
142142
o.env 'OTEL_EXPORTER_OTLP_METRICS_TIMEOUT'
143-
o.default nil
143+
o.default 10000
144144
end
145145

146146
option :protocol do |o|

lib/datadog/opentelemetry/sdk/metrics_exporter.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class MetricsExporter < ::OpenTelemetry::Exporter::OTLP::Metrics::MetricsExporte
1212

1313
def initialize(endpoint:, timeout:, headers:, protocol:)
1414
super(endpoint: endpoint, timeout: timeout, headers: headers)
15-
@telemetry_tags = {'protocol' => protocol, 'encoding' => 'protobuf'}
15+
@telemetry_tags = {'protocol' => "http", 'encoding' => 'protobuf'}
1616
end
1717

1818
def export(metrics, timeout: nil)

supported-configurations.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2184,8 +2184,8 @@
21842184
"OTEL_EXPORTER_OTLP_HEADERS": [
21852185
{
21862186
"version": "A",
2187-
"type": "map",
2188-
"default": ""
2187+
"type": "string",
2188+
"default": null
21892189
}
21902190
],
21912191
"OTEL_EXPORTER_OTLP_METRICS_ENDPOINT": [
@@ -2198,7 +2198,7 @@
21982198
"OTEL_EXPORTER_OTLP_METRICS_HEADERS": [
21992199
{
22002200
"version": "A",
2201-
"type": "map",
2201+
"type": "string",
22022202
"default": null
22032203
}
22042204
],
@@ -2220,7 +2220,7 @@
22202220
{
22212221
"version": "A",
22222222
"type": "int",
2223-
"default": null
2223+
"default": "10000"
22242224
}
22252225
],
22262226
"OTEL_EXPORTER_OTLP_PROTOCOL": [

0 commit comments

Comments
 (0)