diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 258b487aaf..a5f7e52996 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -129,10 +129,19 @@ build-ci-image-kafka:
     DOCKERFILE: src/kafka/Dockerfile
     IMAGE_TAG_SUFFIX: kafka
     CONTEXT: .
+build-ci-image-orderproducer:
+  !!merge <<: *build-ci-image
+  variables:
+    DOCKERFILE: src/orderproducerservice/Dockerfile
+    IMAGE_TAG_SUFFIX: orderproducer
+    CONTEXT: .
 .prod-deploy: &prod-deploy
   stage: prod-deploy
   tags: ["runner:docker", "size:large"]
   image: $CI_IMAGE
+  rules:
+    - if: '$CI_COMMIT_REF_NAME == "prod"'
+    - if: '$CI_COMMIT_REF_NAME =~ /-staging$/'
   script:
     # # For debugging
     #- aws sts get-caller-identity
diff --git a/ci/datadog-agent-values.yaml b/ci/datadog-agent-values.yaml
index 39fb464fdf..06b63dbdfa 100644
--- a/ci/datadog-agent-values.yaml
+++ b/ci/datadog-agent-values.yaml
@@ -1,4 +1,11 @@
+agents:
+  image:
+    tagSuffix: jmx
 datadog:
+  logs:
+    enabled: true
+  tags:
+    - "env:otel-ingest"
   otlp:
     receiver:
       protocols:
diff --git a/ci/scripts/ci-deploy-demo.sh b/ci/scripts/ci-deploy-demo.sh
index 674d1a7cdb..70351d5948 100644
--- a/ci/scripts/ci-deploy-demo.sh
+++ b/ci/scripts/ci-deploy-demo.sh
@@ -18,6 +18,9 @@ install_demo() {
   # Set the namespace and release name
   release_name="opentelemetry-demo"
 
+  # Deploy zookeeper which is not a default component.
+  kubectl apply -f ./src/zookeeperservice/deployment.yaml -n "${namespace}"
+
   # if repo already exists, helm 3+ will skip
   helm --debug repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts
 
@@ -25,7 +28,10 @@ install_demo() {
   helm --debug upgrade "${release_name}" -n "${namespace}" open-telemetry/opentelemetry-demo --install \
     -f ./ci/values.yaml \
     --set-string default.image.tag="v$CI_COMMIT_SHORT_SHA"
-
+  
+  # Deploy java order producer which is not a default component.
+  sed -i "s/PLACEHOLDER_COMMIT_SHA/v$CI_COMMIT_SHORT_SHA/g" ./src/orderproducerservice/deployment.yaml
+  kubectl apply -f ./src/orderproducerservice/deployment.yaml -n "${namespace}"
 }
 
 ###########################################################################################################
diff --git a/ci/values.yaml b/ci/values.yaml
index 7fc04dd65e..782836acbd 100644
--- a/ci/values.yaml
+++ b/ci/values.yaml
@@ -43,7 +43,7 @@ default:
       value: >-
         service.name=$(OTEL_SERVICE_NAME),
         service.instance.id=$(OTEL_K8S_POD_UID),
-        ervice.namespace=opentelemetry-demo,
+        service.namespace=opentelemetry-demo,
         k8s.namespace.name=$(OTEL_K8S_NAMESPACE),
         k8s.node.name=$(OTEL_K8S_NODE_NAME),
         k8s.pod.name=$(OTEL_K8S_POD_NAME),
@@ -81,6 +81,43 @@ components:
     resources:
       limits:
         memory: 200Mi
+    ports:
+      - name: jmx-consumer
+        value: 1098
+    env: 
+      - name: KAFKA_SERVICE_ADDR
+        value: 'opentelemetry-demo-kafka:9092'
+      - name: OTEL_RESOURCE_ATTRIBUTES
+        value: >-
+          service.name=$(OTEL_SERVICE_NAME),
+          service.instance.id=$(OTEL_K8S_POD_UID),
+          service.namespace=opentelemetry-demo,
+          k8s.namespace.name=$(OTEL_K8S_NAMESPACE),
+          k8s.node.name=$(OTEL_K8S_NODE_NAME),
+          k8s.pod.name=$(OTEL_K8S_POD_NAME),
+          deployment.environment=$(OTEL_K8S_NAMESPACE),
+          k8s.pod.ip=$(POD_IP),
+          kafka_source=javainstrumentation
+    podAnnotations:
+      ad.datadoghq.com/frauddetectionservice.logs: '[{"source":"kafka","service":"frauddetectionservice"}]'
+      ad.datadoghq.com/frauddetectionservice.checks: |
+        {
+          "kafka": {
+            "init_config": {
+              "is_jmx": true,
+              "collect_default_metrics": true
+            },
+            "instances": [
+              {
+                "host": "opentelemetry-demo-frauddetectionservice",
+                "port": "1098",
+                "tags": [
+                  "kafka_source:agent_consumer"
+                ]
+              }
+            ]
+          }
+        }
   frontend:
     resources:
       limits:
@@ -129,6 +166,37 @@ components:
     resources:
       limits:
         memory: 1Gi
+    ports:
+      - name: jmx
+        value: 1099
+      - name: plaintext
+        value: 9092
+      - name: controller
+        value: 9093
+    initContainers:
+      - name: wait-for-zookeeper
+        image: busybox:latest
+        command: ['sh', '-c', 'until nc -z -v -w30 opentelemetry-demo-zookeeper 2181; do echo waiting for zookeeper; sleep 2; done;']
+    podAnnotations:
+      ad.datadoghq.com/kafka.logs: '[{"source":"kafka","service":"kafka"}]'
+      ad.datadoghq.com/kafka.checks: |
+        {
+          "kafka": {
+            "init_config": {
+              "is_jmx": true,
+              "collect_default_metrics": true
+            },
+            "instances": [
+              {
+                "host": "opentelemetry-demo-kafka",
+                "port": "1099",
+                "tags": [
+                  "kafka_source:agent"
+                ]
+              }
+            ]
+          }
+        }
 serviceAccount:
   create: false
 opentelemetry-collector:
diff --git a/src/frauddetectionservice/Dockerfile b/src/frauddetectionservice/Dockerfile
index 0e7e05ed63..fed0f96f13 100644
--- a/src/frauddetectionservice/Dockerfile
+++ b/src/frauddetectionservice/Dockerfile
@@ -20,6 +20,7 @@ WORKDIR /usr/src/app/
 COPY --from=builder /usr/src/app/build/libs/frauddetectionservice-1.0-all.jar ./
 ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$version/opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
 # RUN chmod 644 /app/opentelemetry-javaagent.jar
-ENV JAVA_TOOL_OPTIONS=-javaagent:/app/opentelemetry-javaagent.jar
+ENV JAVA_TOOL_OPTIONS="-javaagent:/app/opentelemetry-javaagent.jar -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=opentelemetry-demo-frauddetectionservice -Dcom.sun.management.jmxremote.port=1098 -Dcom.sun.management.jmxremote.rmi.port=1098"
+ENV JMX_PORT=1098
 
 ENTRYPOINT [ "java", "-jar", "frauddetectionservice-1.0-all.jar" ]
diff --git a/src/kafka/Dockerfile b/src/kafka/Dockerfile
index 1c7cac5f4e..64ee8b5f84 100644
--- a/src/kafka/Dockerfile
+++ b/src/kafka/Dockerfile
@@ -6,23 +6,18 @@ FROM registry.ddbuild.io/images/mirror/confluentinc/cp-kafka:7.4.0
 
 USER root
 ARG version=1.23.0
-ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$version/opentelemetry-javaagent.jar /tmp/opentelemetry-javaagent.jar
-RUN chmod go+r /tmp/opentelemetry-javaagent.jar
 
 USER appuser
 
 ENV KAFKA_LISTENERS=PLAINTEXT://0.0.0.0:9092,CONTROLLER://0.0.0.0:9093
-ENV KAFKA_CONTROLLER_QUORUM_VOTERS='1@0.0.0.0:9093'
-ENV KAFKA_CONTROLLER_LISTENER_NAMES=CONTROLLER
+ENV KAFKA_BROKER_ID=1
+ENV KAFKA_ZOOKEEPER_CONNECT='opentelemetry-demo-zookeeper:2181'
 ENV KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
-ENV KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS=0
-ENV KAFKA_PROCESS_ROLES=controller,broker
-ENV KAFKA_NODE_ID=1
-ENV KAFKA_METADATA_LOG_SEGMENT_MS=15000
-ENV KAFKA_METADATA_MAX_RETENTION_MS=60000
-ENV KAFKA_METADATA_LOG_MAX_RECORD_BYTES_BETWEEN_SNAPSHOTS=2800
-ENV KAFKA_AUTO_CREATE_TOPICS_ENABLE=true
+ENV KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://:9092,PLAINTEXT_INTERNAL://:29092
 ENV KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1
+ENV KAFKA_TRANSACTION_STATE_LOG_MIN_ISR=1
 ENV KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR=1
-ENV KAFKA_OPTS="-javaagent:/tmp/opentelemetry-javaagent.jar -Dotel.jmx.target.system=kafka-broker"
-ENV CLUSTER_ID=ckjPoprWQzOf0-FuNkGfFQ
+ENV KAFKA_AUTO_CREATE_TOPICS_ENABLE=true
+
+ENV KAFKA_JMX_OPTS="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=opentelemetry-demo-kafka -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.rmi.port=1099"
+ENV JMX_PORT=1099
\ No newline at end of file
diff --git a/src/orderproducerservice/.gitattributes b/src/orderproducerservice/.gitattributes
new file mode 100644
index 0000000000..097f9f98d9
--- /dev/null
+++ b/src/orderproducerservice/.gitattributes
@@ -0,0 +1,9 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# Linux start script should use lf
+/gradlew        text eol=lf
+
+# These are Windows script files and should use crlf
+*.bat           text eol=crlf
+
diff --git a/src/orderproducerservice/.gitignore b/src/orderproducerservice/.gitignore
new file mode 100644
index 0000000000..1b6985c009
--- /dev/null
+++ b/src/orderproducerservice/.gitignore
@@ -0,0 +1,5 @@
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build
diff --git a/src/orderproducerservice/Dockerfile b/src/orderproducerservice/Dockerfile
new file mode 100644
index 0000000000..c12d36d667
--- /dev/null
+++ b/src/orderproducerservice/Dockerfile
@@ -0,0 +1,15 @@
+FROM openjdk:17-buster
+
+RUN apt-get update -y; apt-get install curl -y
+
+WORKDIR /home/otel
+RUN curl -Lo opentelemetry-javaagent.jar https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar
+COPY ./src/orderproducerservice/ orderproducerservice/
+WORKDIR /home/otel/orderproducerservice
+COPY ./pb/ ./app/src/main/proto/
+RUN ./gradlew shadowJar
+
+ENV JAVA_TOOL_OPTIONS="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=opentelemetry-demo-orderproducer -Dcom.sun.management.jmxremote.port=1097 -Dcom.sun.management.jmxremote.rmi.port=1097"
+ENV JMX_PORT=1097
+
+ENTRYPOINT ["java","-javaagent:../opentelemetry-javaagent.jar",  "-jar" , "app/build/libs/app-all.jar"]
diff --git a/src/orderproducerservice/app/build.gradle b/src/orderproducerservice/app/build.gradle
new file mode 100644
index 0000000000..b99dda42da
--- /dev/null
+++ b/src/orderproducerservice/app/build.gradle
@@ -0,0 +1,90 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * This generated file contains a sample Java application project to get you started.
+ * For more details on building Java & JVM projects, please refer to https://docs.gradle.org/8.2.1/userguide/building_java_projects.html in the Gradle documentation.
+ */
+
+plugins {
+    // Apply the application plugin to add support for building a CLI application in Java.
+    id 'application'
+    id 'com.github.johnrengelman.shadow' version '7.0.0'
+    id "com.google.protobuf" version "0.9.4"
+}
+
+repositories {
+    // Use Maven Central for resolving dependencies.
+    mavenCentral()
+}
+
+shadowJar {
+    mergeServiceFiles()
+}
+
+ext {
+    grpcVersion = "1.56.1"
+    protobufVersion = "3.23.4"
+}
+
+dependencies {
+    // Use JUnit test framework.
+    testImplementation 'junit:junit:4.13.2'
+
+    // This dependency is used by the application.
+    implementation 'com.google.guava:guava:31.1-jre'
+
+    implementation 'org.apache.kafka:kafka_2.13:3.5.1'
+
+    implementation 'org.apache.kafka:kafka-clients:2.3.0'
+
+    implementation("com.google.api.grpc:proto-google-common-protos:2.22.1")
+    
+    implementation("io.grpc:grpc-protobuf:${grpcVersion}")
+
+    implementation "com.google.protobuf:protobuf-java:${protobufVersion}"
+
+    implementation "io.grpc:grpc-stub:${grpcVersion}" // Add this line
+
+    implementation("javax.annotation:javax.annotation-api:1.3.2")
+
+    implementation 'org.slf4j:slf4j-api:2.0.7'
+
+    implementation 'org.slf4j:slf4j-simple:2.0.7'
+}
+
+// Apply a specific Java toolchain to ease working on different environments.
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
+application {
+    // Define the main class for the application.
+    mainClass = 'orderproducerservice.App'
+}
+
+jar {
+    manifest {
+        attributes 'Main-Class': 'orderproducerservice.App'
+    }
+}
+
+protobuf {
+    protoc {
+        artifact = "com.google.protobuf:protoc:${protobufVersion}"
+    }
+    plugins {
+        grpc {
+            artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}"
+        }
+    }
+    generateProtoTasks {
+        ofSourceSet("main").forEach {
+            it.plugins {
+                grpc {}
+            }
+        }
+    }
+
+}
diff --git a/src/orderproducerservice/app/src/main/java/orderproducerservice/App.java b/src/orderproducerservice/app/src/main/java/orderproducerservice/App.java
new file mode 100644
index 0000000000..dec27577de
--- /dev/null
+++ b/src/orderproducerservice/app/src/main/java/orderproducerservice/App.java
@@ -0,0 +1,81 @@
+/*
+ * This Java source file was generated by the Gradle 'init' task.
+ */
+package orderproducerservice;
+
+import java.util.Properties;
+import java.util.Random;
+import java.lang.Thread;
+import java.lang.InterruptedException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.apache.kafka.common.serialization.ByteArraySerializer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.clients.producer.Producer;
+
+import oteldemo.Demo.*;
+
+public class App {
+    private static Logger logger = LoggerFactory.getLogger(App.class);
+
+    public static void main(String[] args) {
+
+        String kafkaAddr = System.getenv("KAFKA_SERVICE_ADDR");
+        if (kafkaAddr != null) {
+            logger.info("Using Kafka Broker Address: " + kafkaAddr);
+        } else {
+            throw new RuntimeException("Environment variable KAFKA_SERVICE_ADDR is not set.");
+        }
+
+        Properties props = new Properties();
+        props.put("bootstrap.servers", kafkaAddr);
+        props.put("acks", "all");
+        props.setProperty(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+        props.setProperty(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, ByteArraySerializer.class.getName());
+
+        Producer<String, byte[]> producer = new KafkaProducer<>(props);
+
+        while (true) {
+            Random random = new Random();
+            try {
+                String orderId = "ORDER-" + random.nextInt(1000);
+                String shippingTrackingId = "TRACK-" + random.nextInt(1000);
+                double shippingCost = 10 + random.nextDouble() * 90;
+                OrderResult orderResult = OrderResult.newBuilder()
+                        .setOrderId(orderId)
+                        .setShippingTrackingId(shippingTrackingId)
+                        .setShippingCost(Money.newBuilder()
+                                .setCurrencyCode("EUR")
+                                .setUnits((long) shippingCost)
+                                .setNanos((int) ((shippingCost - (long) shippingCost) * 1e9))
+                                .build())
+                        .setShippingAddress(Address.newBuilder()
+                                .setStreetAddress("21 rue Chateaudun")
+                                .setCity("Paris")
+                                .setState("Paris")
+                                .setCountry("France")
+                                .setZipCode("75009")
+                                .build())
+                        .build();
+                ProducerRecord<String, byte[]> record = new ProducerRecord<>("orders", null, orderResult.toByteArray());
+                producer.send(record);
+            } catch (Exception e) {
+                logger.error("Unable to send record: ", e);
+            } finally {
+                logger.info("Message sent successfully!");
+            }
+            try {
+                Thread.sleep(4000);
+            } catch (InterruptedException e) {
+                logger.error("Unable to sleep: ", e);
+            }
+            // producer is never closed because of while loop above. Leaving in case the code changes, to not forget to close producer.
+            // producer.close();
+        }
+    }
+}
diff --git a/src/orderproducerservice/deployment.yaml b/src/orderproducerservice/deployment.yaml
new file mode 100644
index 0000000000..405491d02e
--- /dev/null
+++ b/src/orderproducerservice/deployment.yaml
@@ -0,0 +1,133 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: opentelemetry-demo-orderproducer
+  labels:
+    app.kubernetes.io/component: orderproducer
+    app.kubernetes.io/instance: opentelemetry-demo
+    app.kubernetes.io/name: opentelemetry-demo-orderproducer
+    app.kubernetes.io/part-of: opentelemetry-demo
+    app.kubernetes.io/version: "1.4.0"
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: opentelemetry-demo-orderproducer
+  template:
+    metadata:
+      annotations:
+        ad.datadoghq.com/orderproducer.logs: '[{"source":"kafka","service":"orderproducer"}]'
+        ad.datadoghq.com/orderproducer.checks: |
+          {
+            "kafka": {
+              "init_config": {
+                "is_jmx": true,
+                "collect_default_metrics": true
+              },
+              "instances": [
+                {
+                  "host": "opentelemetry-demo-orderproducer",
+                  "port": "1097",
+                  "tags": [
+                    "kafka_source:agent"
+                  ]
+                }
+              ]
+            }
+          }
+      labels:
+        app.kubernetes.io/component: orderproducer
+        app.kubernetes.io/instance: opentelemetry-demo
+        app.kubernetes.io/name: opentelemetry-demo-orderproducer
+    spec:
+      initContainers:
+        - command:
+          - sh
+          - -c
+          - until nc -z -v -w30 opentelemetry-demo-kafka 9092; do echo waiting
+            for kafka; sleep 2; done;
+          image: busybox:latest
+          name: wait-for-kafka
+      containers:
+        - name: orderproducer
+          image: 172597598159.dkr.ecr.us-east-1.amazonaws.com/otel-demo:PLACEHOLDER_COMMIT_SHA-orderproducer
+          imagePullPolicy: IfNotPresent
+          ports:
+          - containerPort: 1097
+            name: producerjmx
+            protocol: TCP
+          env:
+          - name: KAFKA_SERVICE_ADDR
+            value: "opentelemetry-demo-kafka:9092"
+          - name: HOST_IP
+            valueFrom:
+              fieldRef:
+                fieldPath: status.hostIP
+          - name: OTEL_SERVICE_NAME
+            valueFrom:
+              fieldRef:
+                apiVersion: v1
+                fieldPath: "metadata.labels['app.kubernetes.io/component']"
+          - name: OTEL_K8S_NAMESPACE
+            valueFrom:
+              fieldRef:
+                apiVersion: v1
+                fieldPath: metadata.namespace
+          - name: OTEL_K8S_NODE_NAME
+            valueFrom:
+              fieldRef:
+                apiVersion: v1
+                fieldPath: spec.nodeName
+          - name: OTEL_K8S_POD_NAME
+            valueFrom:
+              fieldRef:
+                apiVersion: v1
+                fieldPath: metadata.name
+          - name: OTEL_K8S_POD_UID
+            valueFrom:
+              fieldRef:
+                apiVersion: v1
+                fieldPath: metadata.uid
+          - name: POD_IP
+            valueFrom:
+              fieldRef:
+                fieldPath: status.podIP
+          - name: HOST_IP
+            valueFrom:
+              fieldRef:
+                fieldPath: status.hostIP
+          - name: OTEL_COLLECTOR_NAME
+            value: $(HOST_IP)
+          - name: OTEL_EXPORTER_OTLP_ENDPOINT
+            value: http://$(OTEL_COLLECTOR_NAME):4317
+          - name: OTEL_RESOURCE_ATTRIBUTES
+            value: >-
+              service.name=$(OTEL_SERVICE_NAME),
+              service.instance.id=$(OTEL_K8S_POD_UID),
+              service.namespace=opentelemetry-demo,
+              k8s.namespace.name=$(OTEL_K8S_NAMESPACE),
+              k8s.node.name=$(OTEL_K8S_NODE_NAME),
+              k8s.pod.name=$(OTEL_K8S_POD_NAME),
+              deployment.environment=$(OTEL_K8S_NAMESPACE),
+              k8s.pod.ip=$(POD_IP)
+          resources:
+            limits:
+              memory: 1Gi
+          securityContext:
+            runAsGroup: 1000
+            runAsNonRoot: true
+            runAsUser: 1000
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: opentelemetry-demo-orderproducer
+spec:
+  selector:
+    app.kubernetes.io/name: opentelemetry-demo-orderproducer
+  ports:
+  - name: orderproducer
+    port: 1097
+    protocol: TCP
+    targetPort: 1097
\ No newline at end of file
diff --git a/src/orderproducerservice/gradle/wrapper/gradle-wrapper.jar b/src/orderproducerservice/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000..033e24c4cd
Binary files /dev/null and b/src/orderproducerservice/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/src/orderproducerservice/gradle/wrapper/gradle-wrapper.properties b/src/orderproducerservice/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000..9f4197d5f4
--- /dev/null
+++ b/src/orderproducerservice/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/src/orderproducerservice/gradlew b/src/orderproducerservice/gradlew
new file mode 100755
index 0000000000..fcb6fca147
--- /dev/null
+++ b/src/orderproducerservice/gradlew
@@ -0,0 +1,248 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/src/orderproducerservice/gradlew.bat b/src/orderproducerservice/gradlew.bat
new file mode 100644
index 0000000000..93e3f59f13
--- /dev/null
+++ b/src/orderproducerservice/gradlew.bat
@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/src/orderproducerservice/settings.gradle b/src/orderproducerservice/settings.gradle
new file mode 100644
index 0000000000..6983579ddc
--- /dev/null
+++ b/src/orderproducerservice/settings.gradle
@@ -0,0 +1,14 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * The settings file is used to specify which projects to include in your build.
+ * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.2.1/userguide/building_swift_projects.html in the Gradle documentation.
+ */
+
+plugins {
+    // Apply the foojay-resolver plugin to allow automatic download of JDKs
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0'
+}
+
+rootProject.name = 'orderproducerservice'
+include('app')
diff --git a/src/zookeeperservice/deployment.yaml b/src/zookeeperservice/deployment.yaml
new file mode 100644
index 0000000000..856441ac6d
--- /dev/null
+++ b/src/zookeeperservice/deployment.yaml
@@ -0,0 +1,75 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: opentelemetry-demo-zookeeper
+  labels:
+    app.kubernetes.io/component: zookeeper
+    app.kubernetes.io/instance: opentelemetry-demo
+    app.kubernetes.io/name: opentelemetry-demo-zookeeper
+    app.kubernetes.io/part-of: opentelemetry-demo
+    app.kubernetes.io/version: "1.4.0"
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: opentelemetry-demo-zookeeper
+  template:
+    metadata:
+      annotations:
+        ad.datadoghq.com/zookeeper.logs: '[{"source":"zookeeper","service":"zookeeper"}]'
+        ad.datadoghq.com/zookeeper.checks: |
+          {
+            "zk": {
+              "instances": [
+                {
+                  "host": "opentelemetry-demo-zookeeper",
+                  "port": "2181",
+                  "tags": [
+                    "zookeeper_source:agent"
+                  ]
+                }
+              ]
+            }
+          }
+      labels:
+        app.kubernetes.io/component: zookeeper
+        app.kubernetes.io/instance: opentelemetry-demo
+        app.kubernetes.io/name: opentelemetry-demo-zookeeper
+    spec:
+      containers:
+        - name: zookeeper
+          image: confluentinc/cp-zookeeper:7.2.2
+          imagePullPolicy: IfNotPresent
+          ports:
+          - containerPort: 2181
+            name: zookeeper
+            protocol: TCP
+          env:
+          - name: ZOOKEEPER_TICK_TIME
+            value: "2000"
+          - name: ZOOKEEPER_CLIENT_PORT
+            value: "2181"
+          - name: KAFKA_OPTS
+            value: "-Dzookeeper.4lw.commands.whitelist=*" 
+          resources:
+            limits:
+              memory: 1Gi
+          securityContext:
+            runAsGroup: 1000
+            runAsNonRoot: true
+            runAsUser: 1000
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: opentelemetry-demo-zookeeper
+spec:
+  selector:
+    app.kubernetes.io/name: opentelemetry-demo-zookeeper
+  ports:
+  - name: zookeeper
+    port: 2181
+    protocol: TCP
+    targetPort: 2181
\ No newline at end of file