Merge branch 'main' into flagd-spike

Author: austinlparker

.github/workflows/run-integration-tests.yml

@@ -3,49 +3,18 @@
 name: Integration Tests
 
 on:
-  pull_request_target:
-    branches:
-      - main
-    types: [closed]
+  pull_request_review:
+    types:
+      - submitted
 
 jobs:
-  build_runner:
-    runs-on: ubuntu-latest
-    name: "Build Runner"
-    if: github.event.pull_request.merged == true
-    steps:
-      - name: metal-runner-action
-        uses: equinix-labs/[email protected]
-        with:
-          github_token: ${{ secrets.GH_CI_SECRET }}
-          metal_auth_token: ${{ secrets.METAL_AUTH_TOKEN }}
-          metal_project_id: ${{ secrets.METAL_PROJECT_ID }}
-          metro: "da"
-          plan: "c3.small.x86"
-          os: "ubuntu_20_04"
   run_tests:
-    needs: build_runner
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     name: "Run CI"
+    if: github.event.review.state == 'APPROVED'
     steps:
       - name: check out code
         uses: actions/checkout@v4
-      - name: install docker
-        run: |
-          curl -fsSL https://get.docker.com -o get-docker.sh
-          sudo sh get-docker.sh
       - name: run tracetesting
         run: |
           make build && make run-tracetesting
-  destroy:
-    needs: [build_runner, run_tests]
-    runs-on: ubuntu-latest
-    name: "Cleanup"
-    if: always()
-    steps:
-      - name: metal-sweeper-action
-        uses: equinix-labs/[email protected]
-        with:
-          authToken: ${{ secrets.METAL_AUTH_TOKEN }}
-          projectID: ${{ secrets.METAL_PROJECT_ID }}
-          keepProject: true

CHANGELOG.md

@@ -17,10 +17,14 @@ the release.
   ([#1397](https://github.com/open-telemetry/opentelemetry-demo/pull/1397))
 * [chore] add nightly releases
   ([#1398](https://github.com/open-telemetry/opentelemetry-demo/pull/1398))
-* [chore] remove unused integration test
-  ([#1406](https://github.com/open-telemetry/opentelemetry-demo/pull/1406))
+* [checkoutservice] add producer interceptor for tracing
+  ([#1400](https://github.com/open-telemetry/opentelemetry-demo/pull/1400))
 * [productcatalogservice] fix graceful shutdown issues
   ([#1402](https://github.com/open-telemetry/opentelemetry-demo/pull/1402))
+* [chore] remove unused integration test
+  ([#1406](https://github.com/open-telemetry/opentelemetry-demo/pull/1406))
+* [CartService] - Add Host Detector
+  ([#1415](https://github.com/open-telemetry/opentelemetry-demo/pull/1415))
 
 ## 1.8.0
 

README.md

@@ -56,16 +56,16 @@ keeping it up to date for you.
 
 |                                         |                             |                                                                |
 |-----------------------------------------|-----------------------------|----------------------------------------------------------------|
-| [AlibabaCloud LogService][AlibabaCloud] | [Google Cloud][GoogleCloud] | [Sentry][Sentry]                                               |
-| [AppDynamics][AppDynamics]              | [Grafana Labs][GrafanaLabs] | [ServiceNow Cloud Observability][ServiceNowCloudObservability] |
-| [Aspecto][Aspecto]                      | [Guance][Guance]            | [Splunk][Splunk]                                               |
-| [Axiom][Axiom]                          | [Helios][Helios]            | [Sumo Logic][SumoLogic]                                        |
-| [Axoflow][Axoflow]                      | [Honeycomb.io][Honeycombio] | [TelemetryHub][TelemetryHub]                                   |
-| [Azure Data Explorer][Azure]            | [Instana][Instana]          | [Teletrace][Teletrace]                                         |
-| [Coralogix][Coralogix]                  | [Kloudfuse][Kloudfuse]      | [Tracetest][Tracetest]                                         |
+| [AlibabaCloud LogService][AlibabaCloud] | [Elastic][Elastic]          | [OpenSearch][OpenSearch]                                       |
+| [AppDynamics][AppDynamics]              | [Google Cloud][GoogleCloud] | [Sentry][Sentry]                                               |
+| [Aspecto][Aspecto]                      | [Grafana Labs][GrafanaLabs] | [ServiceNow Cloud Observability][ServiceNowCloudObservability] |
+| [Axiom][Axiom]                          | [Guance][Guance]            | [Splunk][Splunk]                                               |
+| [Axoflow][Axoflow]                      | [Helios][Helios]            | [Sumo Logic][SumoLogic]                                        |
+| [Azure Data Explorer][Azure]            | [Honeycomb.io][Honeycombio] | [TelemetryHub][TelemetryHub]                                   |
+| [Coralogix][Coralogix]                  | [Instana][Instana]          | [Teletrace][Teletrace]                                         |
+| [Dash0][Dash0]                          | [Kloudfuse][Kloudfuse]      | [Tracetest][Tracetest]                                         |
 | [Datadog][Datadog]                      | [Logz.io][Logzio]           | [Uptrace][Uptrace]                                             |
 | [Dynatrace][Dynatrace]                  | [New Relic][NewRelic]       |                                                                |
-| [Elastic][Elastic]                      | [OpenSearch][OpenSearch]    |                                                                |
 
 ## Contributing
 
@@ -112,6 +112,7 @@ Emeritus:
 [Axoflow]: https://axoflow.com/opentelemetry-support-in-more-detail-in-axosyslog-and-syslog-ng/
 [Azure]: https://github.com/Azure/Azure-kusto-opentelemetry-demo
 [Coralogix]: https://coralogix.com/blog/configure-otel-demo-send-telemetry-data-coralogix
+[Dash0]: https://github.com/dash0hq/opentelemetry-demo
 [Datadog]: https://github.com/DataDog/opentelemetry-demo
 [Dynatrace]: https://www.dynatrace.com/news/blog/opentelemetry-demo-application-with-dynatrace/
 [Elastic]: https://github.com/elastic/opentelemetry-demo

src/cartservice/src/Program.cs

@@ -14,6 +14,7 @@
 using OpenTelemetry.Logs;
 using OpenTelemetry.Metrics;
 using OpenTelemetry.ResourceDetectors.Container;
+using OpenTelemetry.ResourceDetectors.Host;
 using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;
 using OpenFeature;
@@ -51,7 +52,8 @@
 
 Action<ResourceBuilder> appResourceBuilder =
     resource => resource
-        .AddDetector(new ContainerResourceDetector());
+        .AddDetector(new ContainerResourceDetector())
+        .AddDetector(new HostDetector());
 
 builder.Services.AddOpenTelemetry()
     .ConfigureResource(appResourceBuilder)

src/cartservice/src/cartservice.csproj

@@ -21,6 +21,7 @@
     <PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.13" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
     <PackageReference Include="OpenTelemetry.ResourceDetectors.Container" Version="1.0.0-beta.6" />
+    <PackageReference Include="OpenTelemetry.ResourceDetectors.Host" Version="0.1.0-alpha.2" />
     <PackageReference Include="StackExchange.Redis" Version="2.7.17" />
     <PackageReference Include="OpenFeature.Contrib.Providers.Flagd" Version="0.1.8" />
     <PackageReference Include="OpenFeature" Version="1.4.1" />