Dont forcefully set service_name option on any exporter (#43)

cedricziel · web-flow · commit 5cbb37f62490 · 2022-02-21T21:22:17.000+01:00
Some exporters do not define this option (OTLP f.e.) and setting this option
breaks them.
diff --git a/src/Symfony/OtelSdkBundle/DependencyInjection/OtelSdkExtension.php b/src/Symfony/OtelSdkBundle/DependencyInjection/OtelSdkExtension.php
@@ -320,7 +320,7 @@ private function normalizeExporterOptions(array $config): array
         if (isset($config[Conf::URL_NODE])) {
             $options[Conf::URL_NODE] = $config[Conf::URL_NODE];
         }
-        if (!isset($options[Conf::SERVICE_NAME_NODE])) {
+        if (in_array(Conf::SERVICE_NAME_NODE, $definedOptions) && !isset($options[Conf::SERVICE_NAME_NODE])) {
             $options[Conf::SERVICE_NAME_NODE] = $this->serviceName;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ private function normalizeExporterOptions(array $config): array`
`320`	`320`	`if (isset($config[Conf::URL_NODE])) {`
`321`	`321`	`$options[Conf::URL_NODE] = $config[Conf::URL_NODE];`
`322`	`322`	`}`
`323`		`- if (!isset($options[Conf::SERVICE_NAME_NODE])) {`
	`323`	`+ if (in_array(Conf::SERVICE_NAME_NODE, $definedOptions) && !isset($options[Conf::SERVICE_NAME_NODE])) {`
`324`	`324`	`$options[Conf::SERVICE_NAME_NODE] = $this->serviceName;`
`325`	`325`	`}`
`326`	`326`