Fixing service_name testcase

Author: HeenaBansal20

.gitsplit.yml

@@ -11,7 +11,7 @@ splits:
   - prefix: "src/Aws"
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-aws.git"
   - prefix: "src/Exporter/Instana"
-    target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-instana-exporter.git"
+    target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-exporter-instana.git"
   - prefix: "src/Symfony"
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-sdk-bundle.git"
   - prefix: "src/Instrumentation/CodeIgniter"

src/Exporter/Instana/README.md

@@ -1,9 +1,9 @@
-[![Releases](https://img.shields.io/badge/releases-purple)](https://github.com/opentelemetry-php/contrib-instana-exporter/releases)
+[![Releases](https://img.shields.io/badge/releases-purple)](https://github.com/opentelemetry-php/contrib-exporter-instana/releases)
 [![Issues](https://img.shields.io/badge/issues-pink)](https://www.ibm.com/support/pages/instana-support)
 [![Source](https://img.shields.io/badge/source-contrib-green)](https://github.com/open-telemetry/opentelemetry-php-contrib/tree/main/src/Exporter/Instana)
-[![Mirror](https://img.shields.io/badge/mirror-opentelemetry--php--contrib-blue)](https://github.com/opentelemetry-php/contrib-instana-exporter)
-[![Latest Version](http://poser.pugx.org/open-telemetry/opentelemetry-instana-exporter/v/unstable)](https://packagist.org/packages/open-telemetry/opentelemetry-instana-exporter/)
-[![Stable](http://poser.pugx.org/open-telemetry/opentelemetry-instana-exporter/v/stable)](https://packagist.org/packages/open-telemetry/opentelemetry-instana-exporter/)
+[![Mirror](https://img.shields.io/badge/mirror-opentelemetry--php--contrib-blue)](https://github.com/opentelemetry-php/contrib-exporter-instana)
+[![Latest Version](http://poser.pugx.org/open-telemetry/opentelemetry-instana-exporter/v/unstable)](https://packagist.org/packages/open-telemetry/opentelemetry-exporter-instana/)
+[![Stable](http://poser.pugx.org/open-telemetry/opentelemetry-instana-exporter/v/stable)](https://packagist.org/packages/open-telemetry/opentelemetry-exporter-instana/)
 
 This is a read-only subtree split of https://github.com/open-telemetry/opentelemetry-php-contrib.
 
@@ -26,7 +26,7 @@ curl -s https://getcomposer.org/installer | php
 Install via Composer
 
 ```bash
-composer require instana/contrib-instana-exporter
+composer require instana/opentelemetry-exporter-instana
 ```
 
 ## Usage
@@ -44,7 +44,7 @@ INSTANA_AGENT_PORT=42699
 The service name that is visible in the Instana UI can be configured with the following environment variables. OpenTelemetry provides `OTEL_SERVICE_NAME` (see documentation [here](https://opentelemetry.io/docs/languages/sdk-configuration/general/#otel_service_name)) as a way to customize this within the SDK. We also provide `INSTANA_SERVICE_NAME` which will be taken as the highest precedence.
 
 ```bash
-INSTANA_SERVICE_NAME=custom-service-name
+export INSTANA_SERVICE_NAME=custom-service-name
 ```
 
 ## Example
@@ -71,6 +71,6 @@ $span->end();
 $tracerProvider->shutdown();
 ```
 
-## Contributions
+## Issues
 
-This repo is maintained by IBM Instana and is read-only. Issues and other contributions should be reported as part of standard [Instana product support](https://www.ibm.com/support/pages/instana-support).
+This repo is maintained by IBM Instana and is read-only. Issues should be reported as part of standard [Instana product support](https://www.ibm.com/support/pages/instana-support).

src/Exporter/Instana/composer.json

@@ -1,14 +1,6 @@
 {
-    "name": "instana/opentelemetry-php-exporter",
+    "name": "instana/opentelemetry-exporter-instana",
     "description": "Instana exporter for OpenTelemetry PHP.",
-    "keywords": [
-        "opentelemetry",
-        "otel",
-        "tracing",
-        "contrib",
-        "exporter",
-        "instana"
-    ],
     "type": "library",
     "support": {
         "issues": "https://www.ibm.com/support/pages/instana-support",

src/Exporter/Instana/src/InstanaTransport.php

@@ -55,7 +55,6 @@ public function __construct(
         }
 
         $this->client = new Client(['base_uri' => $endpoint]);
-
         $this->announce();
     }
 
@@ -233,8 +232,8 @@ private function performAnnounce(): bool
     }
 
     /**
-     * @psalm-suppress FalsableReturnStatement
-     */
+    * @psalm-suppress FalsableReturnStatement
+    */
     private function getAnnouncementPayload(): string
     {
         $cmdline_args = file_get_contents('/proc/self/cmdline');

src/Exporter/Instana/src/SpanConverter.php

@@ -28,7 +28,6 @@ class SpanConverter implements SpanConverterInterface
     const OTEL_KEY_DROPPED_ATTRIBUTES_COUNT = 'dropped_attributes_count';
     const OTEL_KEY_DROPPED_EVENTS_COUNT = 'dropped_events_count';
     const OTEL_KEY_DROPPED_LINKS_COUNT = 'dropped_links_count';
-
     private readonly string $defaultServiceName;
 
     public function __construct(
@@ -82,7 +81,10 @@ private function convertSpan(SpanDataInterface $span): array
         }
 
         $serviceName = $span->getResource()->getAttributes()->get(ResourceAttributes::SERVICE_NAME) ?? $this->defaultServiceName;
-        $instanaSpan['data']['service'] = $_SERVER['INSTANA_SERVICE_NAME'] ?? $serviceName;
+        if (Configuration::has('INSTANA_SERVICE_NAME')) {
+            $serviceName = Configuration::getString('INSTANA_SERVICE_NAME');
+        }
+        $instanaSpan['data']['service'] = $serviceName;
 
         $instanaSpan['data']['sdk']['name'] = $span->getName() ?: 'sdk';
         $instanaSpan['data']['sdk']['custom']['tags'] = [];

src/Exporter/Instana/src/SpanExporter.php

@@ -31,8 +31,8 @@ public function __construct(
     }
 
     /**
-     * @throws JsonException
-     */
+    * @throws JsonException
+    */
     protected function serializeTrace(iterable $spans): string
     {
         return json_encode(

src/Exporter/Instana/tests/Unit/SpanConverterTest.php

@@ -31,6 +31,7 @@ public function setUp(): void
 
     public function test_should_convert_a_span_to_a_payload_for_instana(): void
     {
+        putenv('INSTANA_SERVICE_NAME=instana/opentelemetry-exporter-instana');
         $span = (new SpanDataUtil())
             ->setName('converter.test')
             ->setKind(OtelSpanKind::KIND_CLIENT)
@@ -58,7 +59,7 @@ public function test_should_convert_a_span_to_a_payload_for_instana(): void
                 null,
                 Attributes::create([]),
             ))
-            ->addAttribute('service', ['name' => 'instana/opentelemetry-php-exporter', 'version' => 'dev-main'])
+            ->addAttribute('service', ['name' => 'instana/opentelemetry-exporter-instana', 'version' => 'dev-main'])
             ->addAttribute('net.peer.name', 'authorizationservice.com')
             ->addAttribute('peer.service', 'AuthService')
             ->setResource(
@@ -86,7 +87,7 @@ public function test_should_convert_a_span_to_a_payload_for_instana(): void
         $this->assertSame(2, $instanaSpan['k']);
 
         $this->assertCount(2, $instanaSpan['data']);
-        $this->assertSame('instana/opentelemetry-php-exporter', $instanaSpan['data']['service']);
+        $this->assertSame('instana/opentelemetry-exporter-instana', $instanaSpan['data']['service']);
         $this->assertSame($span->getName(), $instanaSpan['data']['sdk']['name']);
 
         $tags = $instanaSpan['data']['sdk']['custom']['tags'];
@@ -97,7 +98,7 @@ public function test_should_convert_a_span_to_a_payload_for_instana(): void
         $this->assertSame('test-a', $tags['instance']);
 
         $this->assertCount(3, $tags['attributes']);
-        $this->assertSame('unknown_service:php', $tags['attributes']['service']['name']);
+        $this->assertSame('instana/opentelemetry-exporter-instana', $tags['attributes']['service']['name']);
         $this->assertSame('dev-main', $tags['attributes']['service']['version']);
         $this->assertSame('authorizationservice.com', $tags['attributes']['net.peer.name']);
         $this->assertSame('AuthService', $tags['attributes']['peer.service']);
@@ -138,7 +139,7 @@ public function test_should_omit_empty_keys_from_instana_span(): void
 
         $this->assertArrayNotHasKey('p', $instanaSpan);
         $this->assertSame('php', $instanaSpan['n']);
-        $this->assertSame('instana/opentelemetry-php-exporter', $instanaSpan['data']['service']);
+        $this->assertSame('instana/opentelemetry-exporter-instana', $instanaSpan['data']['service']);
         $this->assertSame('test-span-data', $instanaSpan['data']['sdk']['name']);
         $this->assertCount(2, $instanaSpan['data']);
     }